pyneoinstance 4.0.2__tar.gz → 4.0.3__tar.gz

{pyneoinstance-4.0.2/pyneoinstance.egg-info → pyneoinstance-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyneoinstance
-Version: 4.0.2
+Version: 4.0.3
 Summary: Handle Neo4j read and write transactions and provide methods for performing graph EDA
 Author-email: "Jose A. Alvarado-Guzman" <jose.alvarado-guzman@neo4j.com>
 License: GNU GENERAL PUBLIC LICENSE

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3}/pyneoinstance/__init__.py

@@ -1,5 +1,5 @@
 from .database.neo4jdbms import Neo4jInstance
 from .fileload.loadyaml import load_yaml_file
 
-__version__ = '4.0.2'
+__version__ = '4.0.3'
 __all__ = ['Neo4jInstance', 'load_yaml_file']

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3}/pyneoinstance/database/neo4jdbms.py

@@ -28,7 +28,11 @@ from .context import get_logger, get_batches, get_columns_diff
 
 _NODE_LABEL_RE = re.compile(r"\(:?(\w*)\)")
 _REL_TYPE_RE = re.compile(r"\[:?(\w*)\]")
-_IMPLICIT_TX_RE = re.compile(r"\bIN\s+TRANSACTIONS\b", re.IGNORECASE)
+_IMPLICIT_TX_RE = re.compile(
+    r"\bIN\s+(?:\d+\s+)?CONCURRENT\s+TRANSACTIONS\b"
+    r"|\bIN\s+TRANSACTIONS\b",
+    re.IGNORECASE,
+)
 
 def _get_driver(neo_info : Dict[str, str]):
     try:
@@ -197,8 +201,14 @@ class Neo4jInstance:
         params = parameters or {}
         with _get_session(self._driver, database) as session:
             try:
-                result = session.execute_read(
-                    _read_transaction_function,query=query,**params)
+                if _IMPLICIT_TX_RE.search(query):
+                    # 'CALL { ... } IN TRANSACTIONS' is only valid in an implicit
+                    # (auto-commit) transaction, so it can't go through execute_read.
+                    read_result = session.run(query, **params)
+                    result = DataFrame(read_result.values(), columns=read_result.keys())
+                else:
+                    result = session.execute_read(
+                        _read_transaction_function,query=query,**params)
             except ServiceUnavailable as exception:
                 raise ServiceUnavailable() from exception
             except ClientError as exception:
@@ -243,8 +253,15 @@ class Neo4jInstance:
         params = parameters or {}
         with _get_session(self._driver, database) as session:
             try:
-                graph = session.execute_read(
-                    _graph_transaction_function, query=query, **params)
+                if _IMPLICIT_TX_RE.search(query):
+                    # 'CALL { ... } IN TRANSACTIONS' is only valid in an implicit
+                    # (auto-commit) transaction, so it can't go through execute_read.
+                    graph_result = session.run(query, **params)
+                    list(graph_result)  # consume all records so .graph() is populated
+                    graph = graph_result.graph()
+                else:
+                    graph = session.execute_read(
+                        _graph_transaction_function, query=query, **params)
             except ServiceUnavailable as exception:
                 raise ServiceUnavailable() from exception
             except ClientError as exception:

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3/pyneoinstance.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyneoinstance
-Version: 4.0.2
+Version: 4.0.3
 Summary: Handle Neo4j read and write transactions and provide methods for performing graph EDA
 Author-email: "Jose A. Alvarado-Guzman" <jose.alvarado-guzman@neo4j.com>
 License: GNU GENERAL PUBLIC LICENSE

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3}/pyneoinstance.egg-info/SOURCES.txt

@@ -18,9 +18,7 @@ pyneoinstance/fileload/helpers.py
 pyneoinstance/fileload/loadyaml.py
 pyneoinstance/util/__init__.py
 pyneoinstance/util/functions.py
-test/__init__.py
 test/age_data.csv
-test/context.py
 test/cypher_queries.yaml
 test/load_files.yaml
 test/movies.csv

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyneoinstance"
-version = "4.0.2"
+version = "4.0.3"
 description = "Handle Neo4j read and write transactions and provide methods for performing graph EDA"
 readme = "README.md"
 authors = [{ name = "Jose A. Alvarado-Guzman",email = "jose.alvarado-guzman@neo4j.com" }]

{pyneoinstance-4.0.2 → pyneoinstance-4.0.3}/test/test_neo4jdb.py

@@ -111,6 +111,20 @@ class TestWriteMethods(unittest.TestCase):
         self.assertEqual(
             {'nodes_created': 3, 'labels_added': 3, 'properties_set': 3}, result)
 
+    def test_execute_write_query_in_concurrent_transactions(self):
+        """Test a query with 'CALL { ... } IN CONCURRENT TRANSACTIONS', which
+        also requires an implicit transaction rather than the managed
+        transaction used by execute_write_query for regular queries."""
+        query = """
+            UNWIND range(1, 3) AS i
+            CALL (i) {
+                CREATE (:Actor {id: i})
+            } IN 2 CONCURRENT TRANSACTIONS OF 1 ROWS
+        """
+        result = self.graph.execute_write_query(query, self.db)
+        self.assertEqual(
+            {'nodes_created': 3, 'labels_added': 3, 'properties_set': 3}, result)
+
 
 class TestReadAndEdaMethods(unittest.TestCase):
     """Test read and EDA methods. Data is loaded once for the entire class."""
@@ -173,6 +187,22 @@ class TestReadAndEdaMethods(unittest.TestCase):
             query, self.db, {'movie_name': movie})
         self.assertEqual(movie, result['movie'][0])
 
+    def test_execute_read_query_in_transactions(self):
+        """Test a read query with 'CALL { ... } IN TRANSACTIONS', which requires
+        an implicit transaction rather than the managed transaction used by
+        execute_read_query for regular queries."""
+        plain_count = self.graph.execute_read_query(
+            "MATCH (p:Person) RETURN count(p) AS row_num", self.db)['row_num'][0]
+        query = """
+            MATCH (p:Person)
+            CALL (p) {
+                RETURN p AS person
+            } IN TRANSACTIONS OF 1000 ROWS
+            RETURN count(person) AS row_num
+        """
+        result = self.graph.execute_read_query(query, self.db)
+        self.assertEqual(plain_count, result['row_num'][0])
+
     def test_get_node_label_freq(self):
         """Test node label frequency EDA."""
         result = self.graph.get_node_label_freq(self.db)

pyneoinstance-4.0.2/test/__init__.py

@@ -1,3 +0,0 @@
-import os
-
-test_dir = os.path.abspath(os.path.dirname(__file__))

pyneoinstance-4.0.2/test/context.py

@@ -1,8 +0,0 @@
-"""Re-exports package modules for use by the test suite."""
-import os
-import sys
-sys.path.insert(0, os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '..')))
-from pyneoinstance import fileload
-from pyneoinstance import util
-from pyneoinstance import database