memgraph
diff --git a/‎.github/CODEOWNERS‎
Lines changed: 1 addition & 1 deletion b/‎.github/CODEOWNERS‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/build-and-test.yml‎
Lines changed: 62 additions & 13 deletions b/‎.github/workflows/build-and-test.yml‎
Lines changed: 62 additions & 13 deletions
diff --git a/‎README.md‎
Lines changed: 4 additions & 3 deletions b/‎README.md‎
Lines changed: 4 additions & 3 deletions
diff --git a/‎docs/reference/gqlalchemy/graph_algorithms/integrated_algorithms.md‎
Lines changed: 166 additions & 0 deletions b/‎docs/reference/gqlalchemy/graph_algorithms/integrated_algorithms.md‎
Lines changed: 166 additions & 0 deletions
diff --git a/‎docs/reference/gqlalchemy/graph_algorithms/query_builder.md‎
Lines changed: 25 additions & 0 deletions b/‎docs/reference/gqlalchemy/graph_algorithms/query_builder.md‎
Lines changed: 25 additions & 0 deletions
@@ -1 +1 @@
-* @g-despot @Josipmrden @BorisTasevski @katarinasupe @brunos252
+* @g-despot @Josipmrden @BorisTasevski @katarinasupe @brunos252 @niko4299
@@ -1,7 +1,7 @@
 name: Build and Test
 
 env:
-  MG_VERSION: "2.1.1"
+  MG_VERSION: "2.3.0"
   POETRY_VERSION: "1.1.4"
 
 on:
@@ -23,25 +23,39 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.py-version }}
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Set up pip and install packages
+        run: |
+          python -m pip install -U pip
+          sudo -H pip install networkx numpy scipy
       - name: Setup poetry
         uses: abatilo/actions-poetry@v2.0.0
         with:
           poetry-version: ${{ env.POETRY_VERSION }}
-      - name: Run memgraph instance
-        run: |
-          docker run -d -p 7687:7687 memgraph/memgraph --telemetry-enabled=False
       - name: Install Memgraph
         run: |
-          curl -O https://download.memgraph.com/memgraph/v2.2.1/ubuntu-20.04/memgraph_2.2.1-1_amd64.deb
-          sudo dpkg -i memgraph_2.2.1-1_amd64.deb
+          mkdir /home/runner/memgraph
+          curl -L https://download.memgraph.com/memgraph/v${{env.MG_VERSION}}/ubuntu-20.04/memgraph_${{env.MG_VERSION}}-1_amd64.deb --output /home/runner/memgraph/memgraph-community.deb
+          sudo dpkg -i /home/runner/memgraph/memgraph-community.deb
+          sudo systemctl stop memgraph
+          sudo runuser -l memgraph -c '/usr/lib/memgraph/memgraph --bolt-port 7687 --bolt-session-inactivity-timeout=300 --data-directory="/var/lib/memgraph/data" --storage-properties-on-edges=true --storage-snapshot-interval-sec=0 --storage-wal-enabled=false --storage-recover-on-startup=false --storage-snapshot-on-exit=false --telemetry-enabled=false --log-level=TRACE --also-log-to-stderr=true --log-file=/var/log/memgraph/memgraph-ubuntu-${{ matrix.python-version }}.log' &
+          sleep 1 # Wait for Memgraph a bit.
+      - name: Install Neo4j
+        run: |
+          docker run -p 7474:7474 -p 7688:7687 -d -v $HOME/neo4j/data:/data -v $HOME/neo4j/logs:/logs -v $HOME/neo4j/import:/var/lib/neo4j/import -v $HOME/neo4j/plugins:/plugins --env NEO4J_AUTH=neo4j/test neo4j:4.4.7
       - name: Test project
         run: |
           poetry install
-          poetry run pytest -vvv -m "not slow"
+          poetry run pytest -vvv -m "not slow and not ubuntu and not docker"
+      - name: Use the Upload Artifact GitHub Action
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: assets-for-download
+          path: /var/log/memgraph
 
   build_and_test_windows:
     if: github.event.pull_request.draft == false
@@ -53,21 +67,44 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
-      - name: Set up Python ${{ matrix.py-version }}
+      - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Set up pip and install packages
+        run: |
+          python -m pip install -U pip
+          python -m pip install networkx numpy scipy
       - uses: Vampire/setup-wsl@v1
         with:
           distribution: Ubuntu-20.04
       - name: Download, install and run Memgraph under WSL
         shell: wsl-bash {0} # root shell
         run: |
-          mkdir ~/memgraph
-          curl -L https://download.memgraph.com/memgraph/v${{env.MG_VERSION}}/ubuntu-20.04/memgraph_${{env.MG_VERSION}}-1_amd64.deb --output ~/memgraph/memgraph-community.deb
-          dpkg -i ~/memgraph/memgraph-community.deb
-          nohup /usr/lib/memgraph/memgraph --bolt-port 7687 --data-directory="~/memgraph/data" --storage-properties-on-edges=true --storage-snapshot-interval-sec=0 --storage-wal-enabled=false --storage-recover-on-startup=false --storage-snapshot-on-exit=false --telemetry-enabled=false --log-file='' &
+          sudo apt-get update
+          sudo apt-get -y install python3 python3-pip ipython3
+          pip3 install networkx numpy scipy
+          mkdir /memgraph
+          curl -L https://download.memgraph.com/memgraph/v${{env.MG_VERSION}}/ubuntu-20.04/memgraph_${{env.MG_VERSION}}-1_amd64.deb --output /memgraph/memgraph-community.deb
+          dpkg -i /memgraph/memgraph-community.deb
+          mkdir /mnt/c/memgraph
+          runuser -l memgraph -c '/usr/lib/memgraph/memgraph --bolt-port 7687 --bolt-session-inactivity-timeout=300 --data-directory="/mnt/c/memgraph/data" --storage-properties-on-edges=true --storage-snapshot-interval-sec=0 --storage-wal-enabled=false --storage-recover-on-startup=false --storage-snapshot-on-exit=false --telemetry-enabled=false --log-level=TRACE --also-log-to-stderr=true --log-file=/mnt/c/memgraph/memgraph-windows-${{ matrix.python-version }}.log' &
           sleep 1 # Wait for Memgraph a bit.
+      - name: Download, install and run Neo4j under WSL
+        shell: wsl-bash {0} # root shell
+        run: |
+          curl -fsSL https://debian.neo4j.com/neotechnology.gpg.key | apt-key add -
+          add-apt-repository "deb https://debian.neo4j.com stable 4.2"
+          sudo apt-get -y install neo4j=1:4.2.1
+          neo4j-admin set-initial-password test
+          mkdir -p /mnt/c/neo4j/${{ matrix.python-version }}
+          sed -i 's/#dbms.connector.bolt.listen_address=:7687/dbms.connector.bolt.listen_address=:7688/g' /etc/neo4j/neo4j.conf
+          sed -i 's/#dbms.connector.bolt.advertised_address=:7687/dbms.connector.bolt.advertised_address=:7688/g' /etc/neo4j/neo4j.conf
+          sed -i 's/#dbms.default_listen_address=0.0.0.0/dbms.default_listen_address=0.0.0.0/g' /etc/neo4j/neo4j.conf
+          sed -i 's/dbms.directories.logs=\/var\/log\/neo4j/dbms.directories.logs=\/mnt\/c\/neo4j\/${{ matrix.python-version }}/g' /etc/neo4j/neo4j.conf
+          cp /etc/neo4j/neo4j.conf /mnt/c/neo4j/${{ matrix.python-version }}/neo4j.conf
+          sudo service neo4j start
+          sleep 10 # Wait for Neo4j a bit.
       - name: Setup poetry
         uses: abatilo/actions-poetry@v2.0.0
         with:
@@ -76,3 +113,15 @@ jobs:
         run: |
           poetry install
           poetry run pytest -vvv -m "not slow and not ubuntu and not docker"
+      - name: Save Memgraph Logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: memgraph-log
+          path: C:\memgraph
+      - name: Save Neo4j Logs
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: neo4j-log
+          path: C:\neo4j
@@ -91,19 +91,20 @@ When building a Cypher query, you can use a set of methods that are wrappers aro
 
 ```python
 from gqlalchemy import create, match
+from gqlalchemy.query_builder import Operator
 
 query_create = create()
         .node(labels="Person", name="Leslie")
-        .to(edge_label="FRIENDS_WITH")
+        .to(relationship_type="FRIENDS_WITH")
         .node(labels="Person", name="Ron")
         .execute()
 
 query_match = match()
         .node(labels="Person", variable="p1")
         .to()
         .node(labels="Person", variable="p2")
-        .where(item="p1.name", operator="=", literal="Leslie")
-        .return_({"p1":"p1"})
+        .where(item="p1.name", operator=Operator.EQUAL, literal="Leslie")
+        .return_(results=["p1", ("p2", "second")])
         .execute()
 ```
 </details>
 
@@ -0,0 +1,166 @@
+---
+sidebar_label: integrated_algorithms
+title: gqlalchemy.graph_algorithms.integrated_algorithms
+---
+
+## IntegratedAlgorithm Objects
+
+```python
+class IntegratedAlgorithm(ABC)
+```
+
+Abstract class modeling Memgraph&#x27;s built-in graph algorithms.
+
+These algorithms are integrated into Memgraph&#x27;s codebase and are called
+within a relationship part of a query. For instance:
+MATCH p = (:City {name: &quot;Paris&quot;})
+      -[:Road * bfs (r, n | r.length &lt;= 200 AND n.name != &quot;Metz&quot;)]-&gt;
+      (:City {name: &quot;Berlin&quot;})
+
+#### \_\_str\_\_
+
+```python
+@abstractmethod
+def __str__() -> str
+```
+
+Instance of IntegratedAlgorithm subclass is used as a string
+
+#### to\_cypher\_lambda
+
+```python
+@staticmethod
+def to_cypher_lambda(expression: str) -> str
+```
+
+Method for creating a general lambda expression.
+
+Variables `r` and `n` stand for relationship and node. The expression is
+used e.g. for a filter lambda, to use only relationships of length less
+than 200:
+expression=&quot;r.length &lt; 200&quot;
+with the filter lambda being:
+(r, n | r.length &lt; 200)
+
+**Arguments**:
+
+- `expression` - Lambda conditions or statements.
+
+## BreadthFirstSearch Objects
+
+```python
+class BreadthFirstSearch(IntegratedAlgorithm)
+```
+
+Build a BFS call for a Cypher query.
+
+The Breadth-first search can be called in Memgraph with Cypher queries such
+as: `MATCH (a {id: 723})-[*BFS ..10 (r, n | r.x &gt; 12 AND n.y &lt; 3)]-() RETURN *;`
+It is called inside the relationship clause, `*BFS` naming the algorithm,
+`..10` specifying depth bounds, and `(r, n | &lt;expression&gt;)` is a filter
+lambda.
+
+#### \_\_init\_\_
+
+```python
+def __init__(lower_bound: int = None, upper_bound: int = None, condition: str = None) -> None
+```
+
+**Arguments**:
+
+- `lower_bound` - Lower bound for path depth. Defaults to `None`.
+- `upper_bound` - Upper bound for path depth. Defaults to `None`.
+- `condition` - Filter through nodes and relationships that pass this
+  condition. Defaults to `None`.
+
+#### \_\_str\_\_
+
+```python
+def __str__() -> str
+```
+
+Get a Cypher query string for this algorithm.
+
+#### to\_cypher\_bounds
+
+```python
+def to_cypher_bounds() -> str
+```
+
+If bounds are specified, returns them in grammar-defined form.
+
+## DepthFirstSearch Objects
+
+```python
+class DepthFirstSearch(IntegratedAlgorithm)
+```
+
+Build a DFS call for a Cypher query.
+The Depth-First Search can be called in Memgraph with Cypher queries
+such as:
+MATCH (a {id: 723})-[* ..10 (r, n | r.x &gt; 12 AND n.y &lt; 3)]-() RETURN *;
+It is called inside the relationship clause, &quot;*&quot; naming the algorithm
+(&quot;*&quot; without &quot;DFS&quot; because it is defined like such in openCypher),
+&quot;..10&quot; specifying depth bounds, and &quot;(r, n | &lt;expression&gt;)&quot; is a filter
+lambda.
+
+#### \_\_init\_\_
+
+```python
+def __init__(lower_bound: int = None, upper_bound: int = None, condition: str = None) -> None
+```
+
+**Arguments**:
+
+- `lower_bound` - Lower bound for path depth. Defaults to None.
+- `upper_bound` - Upper bound for path depth. Defaults to None.
+- `condition` - Filter through nodes and relationships that pass this
+  condition. Defaults to None.
+
+#### \_\_str\_\_
+
+```python
+def __str__() -> str
+```
+
+get Cypher query string for this algorithm.
+
+#### to\_cypher\_bounds
+
+```python
+def to_cypher_bounds() -> str
+```
+
+If bounds are specified, returns them in grammar-defined form.
+
+## WeightedShortestPath Objects
+
+```python
+class WeightedShortestPath(IntegratedAlgorithm)
+```
+
+Build a Djikstra shortest path call for a Cypher query
+The weighted shortest path algorithm can be called in Memgraph with Cypher
+queries such as:
+&quot; MATCH (a {id: 723})-[r *WSHORTEST 10 (r, n | r.weight) weight_sum
+        (r, n | r.x &gt; 12 AND r.y &lt; 3)]-(b {id: 882}) RETURN * &quot;
+It is called inside the relationship clause, &quot;*WSHORTEST&quot; naming the
+algorithm, &quot;10&quot; specifying search depth bounds, and &quot;(r, n | &lt;expression&gt;)&quot;
+is a filter lambda, used to filter which relationships and nodes to use.
+
+#### \_\_init\_\_
+
+```python
+def __init__(upper_bound: int = None, condition: str = None, total_weight_var: str = DEFAULT_TOTAL_WEIGHT, weight_property: str = DEFAULT_WEIGHT_PROPERTY) -> None
+```
+
+**Arguments**:
+
+- `upper_bound` - Upper bound for path depth. Defaults to None.
+- `condition` - Filter through nodes and relationships that pass this
+  condition. Defaults to None.
+- `total_weight_var` - Variable defined as the sum of all weights on
+  path being returned. Defaults to &quot;total_weight&quot;.
+- `weight_property` - property being used as weight. Defaults to
+  &quot;r.weight&quot;.
+
@@ -0,0 +1,25 @@
+---
+sidebar_label: query_builder
+title: gqlalchemy.graph_algorithms.query_builder
+---
+
+## MemgraphQueryBuilder Objects
+
+```python
+class MemgraphQueryBuilder(QueryBuilder)
+```
+
+This query builder extends the usual Cypher query builder capabilities with Memgraph&#x27;s query modules.
+User gets with this module autocomplete features of graph algorithms.
+Documentation on the methods can be found on Memgraph&#x27;s web page.
+
+## MageQueryBuilder Objects
+
+```python
+class MageQueryBuilder(MemgraphQueryBuilder)
+```
+
+This query builder extends the Memgraph query builder with Memgraph MAGE graph algorithm Cypher options.
+User gets with this module autocomplete features of graph algorithms written in MAGE library.
+Documentation on the methods can be found on Memgraph&#x27;s web page.
+
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @g-despot @Josipmrden @BorisTasevski @katarinasupe @brunos252`
	`1`	`+* @g-despot @Josipmrden @BorisTasevski @katarinasupe @brunos252 @niko4299`