graphdatascience 1.11a3__tar.gz → 1.12a1__tar.gz

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/MANIFEST.in

@@ -1,6 +1,7 @@
 include requirements/base/base.txt
 include requirements/base/ogb.txt
 include requirements/base/networkx.txt
+include requirements/base/rust-ext.txt
 include LICENSE
 prune graphdatascience/tests
 prune graphdatascience/resources/cora/serialize_cora.py

{graphdatascience-1.11a3/graphdatascience.egg-info → graphdatascience-1.12a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: graphdatascience
-Version: 1.11a3
+Version: 1.12a1
 Summary: A Python client for the Neo4j Graph Data Science (GDS) library
 Home-page: https://neo4j.com/product/graph-data-science/
 Author: Neo4j
@@ -29,7 +29,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: multimethod<2.0,>=1.0
-Requires-Dist: neo4j<6.0,>=4.4.2
+Requires-Dist: neo4j<6.0,>=4.4.12
 Requires-Dist: numpy<2.0
 Requires-Dist: pandas<3.0,>=1.0
 Requires-Dist: pyarrow<17.0,>=14.0.1
@@ -41,6 +41,8 @@ Provides-Extra: ogb
 Requires-Dist: ogb<2.0,>=1.0; extra == "ogb"
 Provides-Extra: networkx
 Requires-Dist: networkx<4.0,>=2.0; extra == "networkx"
+Provides-Extra: rust-ext
+Requires-Dist: neo4j-rust-ext<6.0,>=4.4.2; extra == "rust-ext"
 
 # Neo4j Graph Data Science Client
 
@@ -142,8 +144,6 @@ The manual is versioned to cover all GDS Python Client versions, so make sure to
 Operations known to not yet work with `graphdatascience`:
 
 * [Numeric utility functions](https://neo4j.com/docs/graph-data-science/current/management-ops/utility-functions/#utility-functions-numeric) (will never be supported)
-* [Cypher on GDS](https://neo4j.com/docs/graph-data-science/current/management-ops/create-cypher-db/) (might be supported in the future)
-* [Projecting graphs using Cypher Aggregation](https://neo4j.com/docs/graph-data-science/current/management-ops/projections/graph-project-cypher-aggregation/) (might be supported in the future)
 
 
 ## License

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/README.md

@@ -98,8 +98,6 @@ The manual is versioned to cover all GDS Python Client versions, so make sure to
 Operations known to not yet work with `graphdatascience`:
 
 * [Numeric utility functions](https://neo4j.com/docs/graph-data-science/current/management-ops/utility-functions/#utility-functions-numeric) (will never be supported)
-* [Cypher on GDS](https://neo4j.com/docs/graph-data-science/current/management-ops/create-cypher-db/) (might be supported in the future)
-* [Projecting graphs using Cypher Aggregation](https://neo4j.com/docs/graph-data-science/current/management-ops/projections/graph-project-cypher-aggregation/) (might be supported in the future)
 
 
 ## License

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/algo/algo_proc_runner.py

@@ -3,11 +3,11 @@ from typing import Any, Dict, Tuple
 
 from pandas import DataFrame, Series
 
+from ..call_parameters import CallParameters
 from ..error.illegal_attr_checker import IllegalAttrChecker
 from ..graph.graph_object import Graph
 from ..graph.graph_type_check import graph_type_check
 from ..model.graphsage_model import GraphSageModel
-from graphdatascience.call_parameters import CallParameters
 
 
 class AlgoProcRunner(IllegalAttrChecker, ABC):

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/call_builder.py

@@ -1,6 +1,6 @@
 from .algo.algo_endpoints import AlgoEndpoints
 from .error.uncallable_namespace import UncallableNamespace
-from .utils.util_endpoints import IndirectUtilAlphaEndpoints
+from .utils.direct_util_endpoints import IndirectUtilAlphaEndpoints
 
 
 class IndirectCallBuilder(AlgoEndpoints, UncallableNamespace):

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/endpoints.py

@@ -23,7 +23,7 @@ from .system.system_endpoints import (
     SystemBetaEndpoints,
 )
 from .topological_lp.topological_lp_endpoints import TopologicalLPAlphaEndpoints
-from .utils.util_endpoints import DirectUtilEndpoints
+from .utils.direct_util_endpoints import DirectUtilEndpoints
 
 """
 This class should inherit endpoint classes that only contain endpoints that can be called directly from
@@ -44,7 +44,7 @@ class DirectEndpoints(
 
 
 """
-This class should inherit endpoint classes that only expose calls of the `gds.beta` namespace.
+This class should inherit endpoint classes that only expose calls of the `gds.alpha` namespace.
 Example of such endpoints: "gds.alpha.listProgress".
 """
 
@@ -65,6 +65,21 @@ class AlphaEndpoints(
         return IndirectAlphaCallBuilder(self._query_runner, f"{self._namespace}.{attr}", self._server_version)
 
 
+class AlphaRemoteEndpoints(
+    GraphAlphaEndpoints,
+    PipelineAlphaEndpoints,
+    ModelAlphaEndpoints,
+    SingleModeAlphaAlgoEndpoints,
+    SystemAlphaEndpoints,
+    AlphaConfigEndpoints,
+):
+    def __init__(self, query_runner: QueryRunner, namespace: str, server_version: ServerVersion):
+        super().__init__(query_runner, namespace, server_version)
+
+    def __getattr__(self, attr: str) -> IndirectAlphaCallBuilder:
+        return IndirectAlphaCallBuilder(self._query_runner, f"{self._namespace}.{attr}", self._server_version)
+
+
 """
 This class should inherit endpoint classes that only expose calls of the `gds.beta` namespace.
 Example of such endpoints:  "gds.beta.listProgress".

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/base_graph_proc_runner.py

@@ -9,11 +9,13 @@ from multimethod import multimethod
 from neo4j import __version__ as neo4j_driver_version
 from pandas import DataFrame, Series, read_parquet
 
+from ..call_parameters import CallParameters
 from ..error.client_only_endpoint import client_only_endpoint
 from ..error.illegal_attr_checker import IllegalAttrChecker
 from ..error.uncallable_namespace import UncallableNamespace
 from ..server_version.compatible_with import compatible_with
 from ..server_version.server_version import ServerVersion
+from .graph_create_result import GraphCreateResult
 from .graph_entity_ops_runner import (
     GraphLabelRunner,
     GraphNodePropertiesRunner,
@@ -33,8 +35,6 @@ from .graph_type_check import (
     graph_type_check_optional,
 )
 from .ogb_loader import OGBLLoader, OGBNLoader
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.graph.graph_create_result import GraphCreateResult
 
 Strings = Union[str, List[str]]
 
@@ -120,7 +120,7 @@ class BaseGraphProcRunner(UncallableNamespace, IllegalAttrChecker):
         )
         constructor.run(nodes, relationships)
 
-        return Graph(graph_name, self._query_runner, self._server_version)
+        return Graph(graph_name, self._query_runner)
 
     @client_only_endpoint("gds.graph")
     def load_cora(self, graph_name: str = "cora", undirected: bool = False) -> Graph:
@@ -250,7 +250,7 @@ class BaseGraphProcRunner(UncallableNamespace, IllegalAttrChecker):
             params=params,
         ).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)
 
     @from_graph_type_check
     @compatible_with("filter", min_inclusive=ServerVersion(2, 5, 0))
@@ -276,7 +276,7 @@ class BaseGraphProcRunner(UncallableNamespace, IllegalAttrChecker):
             params=params,
         ).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)
 
     @property
     def export(self) -> GraphExportRunner:
@@ -357,7 +357,7 @@ class BaseGraphProcRunner(UncallableNamespace, IllegalAttrChecker):
                 f"No projected graph named '{graph_name}' exists in current database '{self._query_runner.database()}'"
             )
 
-        return Graph(graph_name, self._query_runner, self._server_version)
+        return Graph(graph_name, self._query_runner)
 
     @graph_type_check
     def _handle_properties(

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_alpha_proc_runner.py

@@ -79,4 +79,4 @@ class GraphAlphaProcRunner(UncallableNamespace, IllegalAttrChecker):
         )
         constructor.run(nodes, relationships)
 
-        return Graph(graph_name, self._query_runner, self._server_version)
+        return Graph(graph_name, self._query_runner)

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_beta_proc_runner.py

@@ -1,13 +1,13 @@
 from typing import Any, List, Union
 
+from ..call_parameters import CallParameters
 from ..error.illegal_attr_checker import IllegalAttrChecker
 from ..error.uncallable_namespace import UncallableNamespace
+from .graph_create_result import GraphCreateResult
+from .graph_entity_ops_runner import GraphRelationshipsBetaRunner
 from .graph_export_runner import GraphExportCsvEndpoints
 from .graph_object import Graph
 from .graph_project_runner import GraphProjectBetaRunner
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.graph.graph_create_result import GraphCreateResult
-from graphdatascience.graph.graph_entity_ops_runner import GraphRelationshipsBetaRunner
 
 Strings = Union[str, List[str]]
 
@@ -40,4 +40,4 @@ class GraphBetaProcRunner(UncallableNamespace, IllegalAttrChecker):
 
         result = self._query_runner.call_procedure(endpoint=self._namespace, params=params).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_cypher_runner.py

@@ -1,6 +1,10 @@
+from __future__ import annotations
+
 import re
 from itertools import chain, zip_longest
-from typing import Any, Optional
+from typing import Any, Dict, Optional
+
+from pandas import Series
 
 from ..caller_base import CallerBase
 from ..query_runner.query_runner import QueryRunner
@@ -41,7 +45,10 @@ class GraphCypherRunner(CallerBase):
 
         GraphCypherRunner._verify_query_ends_with_return_clause(self._namespace, query)
 
-        result = self._query_runner.run_cypher(query, params, database, False).squeeze()
+        result: Optional[Dict[str, Any]] = self._query_runner.run_cypher(query, params, database, False).squeeze()
+
+        if not result:
+            raise ValueError("Projected graph cannot be empty.")
 
         try:
             graph_name = str(result["graphName"])
@@ -50,7 +57,7 @@ class GraphCypherRunner(CallerBase):
                 f"Invalid query, the query must end with the `RETURN {self._namespace}(...)` call: {query}"
             )
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), Series(data=result))
 
     __separators = re.compile(r"[,(.]")
 

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_entity_ops_runner.py

@@ -5,6 +5,10 @@ from warnings import filterwarnings
 import pandas as pd
 from pandas import DataFrame, Series
 
+from ..call_parameters import CallParameters
+from ..error.cypher_warning_handler import (
+    filter_id_func_deprecation_warning,
+)
 from ..error.illegal_attr_checker import IllegalAttrChecker
 from ..error.uncallable_namespace import UncallableNamespace
 from ..query_runner.query_runner import QueryRunner
@@ -13,10 +17,6 @@ from ..server_version.server_version import ServerVersion
 from ..utils.util_proc_runner import UtilProcRunner
 from .graph_object import Graph
 from .graph_type_check import graph_type_check
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.error.cypher_warning_handler import (
-    filter_id_func_deprecation_warning,
-)
 
 Strings = Union[str, List[str]]
 

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_object.py

@@ -5,9 +5,8 @@ from typing import Any, List, Optional, Type, Union
 
 from pandas import Series
 
+from ..call_parameters import CallParameters
 from ..query_runner.query_runner import QueryRunner
-from ..server_version.server_version import ServerVersion
-from graphdatascience.call_parameters import CallParameters
 
 
 class Graph:
@@ -17,11 +16,10 @@ class Graph:
     It contains summary information about the graph.
     """
 
-    def __init__(self, name: str, query_runner: QueryRunner, server_version: ServerVersion):
+    def __init__(self, name: str, query_runner: QueryRunner):
         self._name = name
         self._query_runner = query_runner
         self._db = query_runner.database()
-        self._server_version = server_version
 
     def __enter__(self: Graph) -> Graph:
         return self

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_proc_runner.py

@@ -1,6 +1,6 @@
+from .base_graph_proc_runner import BaseGraphProcRunner
+from .graph_cypher_runner import GraphCypherRunner
 from .graph_project_runner import GraphProjectRunner
-from graphdatascience.graph.base_graph_proc_runner import BaseGraphProcRunner
-from graphdatascience.graph.graph_cypher_runner import GraphCypherRunner
 
 
 class GraphProcRunner(BaseGraphProcRunner):

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_project_runner.py

@@ -4,11 +4,11 @@ from typing import Any
 
 from pandas import Series
 
+from ..call_parameters import CallParameters
 from ..error.illegal_attr_checker import IllegalAttrChecker
+from .graph_create_result import GraphCreateResult
 from .graph_object import Graph
 from .graph_type_check import from_graph_type_check
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.graph.graph_create_result import GraphCreateResult
 
 
 class GraphProjectRunner(IllegalAttrChecker):
@@ -25,7 +25,7 @@ class GraphProjectRunner(IllegalAttrChecker):
             logging=True,
         ).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)
 
     def estimate(self, node_projection: Any, relationship_projection: Any, **config: Any) -> "Series[Any]":
         self._namespace += ".estimate"
@@ -69,4 +69,4 @@ class GraphProjectBetaRunner(IllegalAttrChecker):
             logging=True,
         ).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_remote_project_runner.py

@@ -2,13 +2,13 @@ from __future__ import annotations
 
 from typing import List, Optional
 
+from ..call_parameters import CallParameters
 from ..error.illegal_attr_checker import IllegalAttrChecker
-from ..query_runner.aura_db_query_runner import AuraDbQueryRunner
+from ..query_runner.session_query_runner import SessionQueryRunner
 from ..server_version.compatible_with import compatible_with
+from ..server_version.server_version import ServerVersion
+from .graph_create_result import GraphCreateResult
 from .graph_object import Graph
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.graph.graph_create_result import GraphCreateResult
-from graphdatascience.server_version.server_version import ServerVersion
 
 
 class GraphProjectRemoteRunner(IllegalAttrChecker):
@@ -41,7 +41,7 @@ class GraphProjectRemoteRunner(IllegalAttrChecker):
         )
 
         result = self._query_runner.call_procedure(
-            endpoint=AuraDbQueryRunner.GDS_REMOTE_PROJECTION_PROC_NAME,
+            endpoint=SessionQueryRunner.GDS_REMOTE_PROJECTION_PROC_NAME,
             params=params,
         ).squeeze()
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/graph_sample_runner.py

@@ -2,13 +2,13 @@ from typing import Any
 
 from pandas import Series
 
+from ..call_parameters import CallParameters
 from ..error.illegal_attr_checker import IllegalAttrChecker
 from ..server_version.compatible_with import compatible_with
 from ..server_version.server_version import ServerVersion
+from .graph_create_result import GraphCreateResult
 from .graph_object import Graph
 from .graph_type_check import from_graph_type_check
-from graphdatascience.call_parameters import CallParameters
-from graphdatascience.graph.graph_create_result import GraphCreateResult
 
 
 class GraphAlphaSampleRunner(IllegalAttrChecker):
@@ -41,7 +41,7 @@ class RWRRunner(IllegalAttrChecker):
 
         result = self._query_runner.call_procedure(endpoint=self._namespace, params=params, logging=True).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)
 
 
 class CNARWRunner(IllegalAttrChecker):
@@ -55,7 +55,7 @@ class CNARWRunner(IllegalAttrChecker):
         )
         result = self._query_runner.call_procedure(endpoint=self._namespace, params=params, logging=True).squeeze()
 
-        return GraphCreateResult(Graph(graph_name, self._query_runner, self._server_version), result)
+        return GraphCreateResult(Graph(graph_name, self._query_runner), result)
 
     def estimate(self, from_G: Graph, **config: Any) -> "Series[Any]":
         self._namespace += ".estimate"

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/nx_loader.py

@@ -25,7 +25,7 @@ class NXLoader(UncallableNamespace, IllegalAttrChecker):
         constructor = self._query_runner.create_graph_constructor(graph_name, concurrency, undirected_rel_types)
         constructor.run(nodes, rels)
 
-        return Graph(graph_name, self._query_runner, self._server_version)
+        return Graph(graph_name, self._query_runner)
 
     @staticmethod
     def _attr_to_labels_key(labels_attr: Any, node_id: Any, no_node_labels: Optional[bool]) -> Tuple[str, ...]:

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph/ogb_loader.py

@@ -96,7 +96,7 @@ class OGBLoader(UncallableNamespace, IllegalAttrChecker, ABC):
         constructor = self._query_runner.create_graph_constructor(graph_name, concurrency, [])
         constructor.run(nodes, rels)
 
-        return Graph(graph_name, self._query_runner, self._server_version)
+        return Graph(graph_name, self._query_runner)
 
 
 class OGBNLoader(OGBLoader):

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/graph_data_science.py

@@ -8,11 +8,12 @@ from pandas import DataFrame
 from .call_builder import IndirectCallBuilder
 from .endpoints import AlphaEndpoints, BetaEndpoints, DirectEndpoints
 from .error.uncallable_namespace import UncallableNamespace
+from .graph.graph_proc_runner import GraphProcRunner
 from .query_runner.arrow_query_runner import ArrowQueryRunner
 from .query_runner.neo4j_query_runner import Neo4jQueryRunner
 from .query_runner.query_runner import QueryRunner
 from .server_version.server_version import ServerVersion
-from graphdatascience.graph.graph_proc_runner import GraphProcRunner
+from .utils.util_proc_runner import UtilProcRunner
 
 
 class GraphDataScience(DirectEndpoints, UncallableNamespace):
@@ -48,11 +49,12 @@ class GraphDataScience(DirectEndpoints, UncallableNamespace):
         database: Optional[str], default None
             The Neo4j database to query against.
         arrow : Union[str, bool], default True
-            Arrow connection information. This is either a bool or a string.
-            If it is a string, it will be interpreted as a connection URL to a GDS Arrow Server.
-            If it is a bool,
-                True will make the client discover the connection URI to the GDS Arrow server via the Neo4j endpoint,
-                while False will make the client use Bolt for all operations.
+            Arrow connection information. This is either a string or a bool.
+
+            - If it is a string, it will be interpreted as a connection URL to a GDS Arrow Server.
+            - If it is a bool:
+                - True will make the client discover the connection URI to the GDS Arrow server via the Neo4j endpoint.
+                - False will make the client use Bolt for all operations.
         arrow_disable_server_verification : bool, default True
             A flag that overrides other TLS settings and disables server verification for TLS connections.
         arrow_tls_root_certs : Optional[bytes], default None
@@ -81,12 +83,16 @@ class GraphDataScience(DirectEndpoints, UncallableNamespace):
                 None if arrow is True else arrow,
             )
 
-        super().__init__(self._query_runner, "gds", self._server_version)
+        super().__init__(self._query_runner, namespace="gds", server_version=self._server_version)
 
     @property
     def graph(self) -> GraphProcRunner:
         return GraphProcRunner(self._query_runner, f"{self._namespace}.graph", self._server_version)
 
+    @property
+    def util(self) -> UtilProcRunner:
+        return UtilProcRunner(self._query_runner, f"{self._namespace}.util", self._server_version)
+
     @property
     def alpha(self) -> AlphaEndpoints:
         return AlphaEndpoints(self._query_runner, "gds.alpha", self._server_version)

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/model/graphsage_model.py

@@ -2,10 +2,10 @@ from typing import Any
 
 from pandas import Series
 
+from ..call_parameters import CallParameters
 from ..graph.graph_object import Graph
 from ..graph.graph_type_check import graph_type_check
 from .model import Model
-from graphdatascience.call_parameters import CallParameters
 
 
 class GraphSageModel(Model):

{graphdatascience-1.11a3 → graphdatascience-1.12a1}/graphdatascience/model/link_prediction_model.py

@@ -41,5 +41,5 @@ class LPModel(PipelineModel):
             A list of LinkFeatures of the pipeline.
 
         """
-        steps: List[Dict[str, Any]] = self._list_info()["modelInfo"][0]["pipeline"]["featureSteps"]
+        steps: List[Dict[str, Any]] = self._list_info()["modelInfo"]["pipeline"]["featureSteps"]
         return [LinkFeature(s["name"], s["config"]) for s in steps]