Clarify positional parameters

Author: FlorentinD

graphdatascience/graph/graph_cypher_runner.py

@@ -46,7 +46,7 @@ def project(
         GraphCypherRunner._verify_query_ends_with_return_clause(self._namespace, query)
 
         result: Optional[dict[str, Any]] = self._query_runner.run_retryable_cypher(
-            query, params, database, False
+            query, params, database, custom_error=False
         ).squeeze()
 
         if not result:

graphdatascience/graph/graph_entity_ops_runner.py

@@ -164,7 +164,7 @@ def _process_result(
             unique_node_ids = result["nodeId"].drop_duplicates().tolist()
 
             db_properties_df = query_runner.run_retryable_cypher(
-                GraphNodePropertiesRunner._build_query(db_node_properties), {"ids": unique_node_ids}
+                GraphNodePropertiesRunner._build_query(db_node_properties), params={"ids": unique_node_ids}
             )
 
             if "propertyValue" not in result.keys():

graphdatascience/query_runner/cypher_graph_constructor.py

@@ -104,8 +104,7 @@ def graph_construct_error_multidf(element: str) -> str:
 
     def _should_warn_about_arrow_missing(self) -> bool:
         try:
-            # TOOD use execute_query
-            license: str = self._query_runner.run_cypher(
+            license: str = self._query_runner.run_retryable_cypher(
                 "CALL gds.debug.sysInfo() YIELD key, value WHERE key = 'gdsEdition' RETURN value", custom_error=False
             ).squeeze()
             should_warn = license == "Licensed"

graphdatascience/query_runner/neo4j_query_runner.py

@@ -150,7 +150,7 @@ def __init__(
     def __run_cypher_simplified_for_query_progress_logger(self, query: str, database: Optional[str]) -> DataFrame:
         # progress logging should not retry a lot as it perodically fetches the latest progress anyway
         connectivity_retry_config = Neo4jQueryRunner.ConnectivityRetriesConfig(max_retries=2)
-        # not using execute_query as failing is okay
+        # not using retryable cypher as failing is okay
         return self.run_cypher(query=query, database=database, connectivity_retry_config=connectivity_retry_config)
 
     # only use for user defined queries
@@ -355,15 +355,15 @@ def clone(self, host: str, port: int) -> QueryRunner:
         driver = neo4j.GraphDatabase.driver(endpoint, auth=self._auth, **self.driver_config())
 
         return Neo4jQueryRunner(
-            driver,
-            self._protocol,
-            self._auth,
-            self._config,
-            self._database,
-            self._auto_close,
-            self._bookmarks,
-            self._show_progress,
-            self._instance_description,
+            driver=driver,
+            protocol=self._protocol,
+            auth=self._auth,
+            config=self._config,
+            database=self._database,
+            auto_close=self._auto_close,
+            bookmarks=self._bookmarks,
+            show_progress=self._show_progress,
+            instance_description=self._instance_description,
         )
 
     @staticmethod

graphdatascience/query_runner/protocol/write_protocols.py

@@ -160,7 +160,6 @@ def write_fn() -> DataFrame:
                 parameters,
                 yields,
                 retryable=True,
-                database=None,
                 logging=False,
                 custom_error=False,
             )