Avoid top level imports in source code

easy to get into circular dependencies this way.
lets instead import from the definition.

Author: FlorentinD

graphdatascience/arrow_client/v2/remote_write_back_client.py

@@ -3,11 +3,11 @@
 import time
 from typing import Any
 
-from graphdatascience import QueryRunner
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.call_parameters import CallParameters
 from graphdatascience.procedure_surface.api.base_result import BaseResult
 from graphdatascience.query_runner.protocol.write_protocols import WriteProtocol
+from graphdatascience.query_runner.query_runner import QueryRunner
 from graphdatascience.query_runner.termination_flag import TerminationFlag
 from graphdatascience.session.dbms.protocol_resolver import ProtocolVersionResolver
 

graphdatascience/plugin_v2_endpoints.py

@@ -1,3 +1,4 @@
+from graphdatascience.arrow_client.v1.gds_arrow_client import GdsArrowClient
 from graphdatascience.procedure_surface.api.catalog.scale_properties_endpoints import ScalePropertiesEndpoints
 from graphdatascience.procedure_surface.api.centrality.articlerank_endpoints import ArticleRankEndpoints
 from graphdatascience.procedure_surface.api.centrality.articulationpoints_endpoints import ArticulationPointsEndpoints
@@ -124,7 +125,6 @@
     NodeSimilarityCypherEndpoints,
 )
 from graphdatascience.procedure_surface.cypher.system_cypher_endpoints import SystemCypherEndpoints
-from graphdatascience.query_runner.gds_arrow_client import GdsArrowClient
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 
 

graphdatascience/procedure_surface/arrow/catalog/node_properties_arrow_endpoints.py

@@ -1,6 +1,5 @@
 from pandas import DataFrame
 
-from graphdatascience import QueryRunner
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.arrow_client.v2.data_mapper_utils import deserialize_single
 from graphdatascience.arrow_client.v2.job_client import JobClient
@@ -16,6 +15,7 @@
 from graphdatascience.procedure_surface.arrow.node_property_endpoints import NodePropertyEndpointsHelper
 from graphdatascience.procedure_surface.utils.config_converter import ConfigConverter
 from graphdatascience.procedure_surface.utils.result_utils import join_db_node_properties
+from graphdatascience.query_runner.query_runner import QueryRunner
 
 
 class NodePropertiesArrowEndpoints(NodePropertiesEndpoints):

graphdatascience/procedure_surface/cypher/catalog/relationship_cypher_endpoints.py

@@ -1,6 +1,5 @@
 from pandas import DataFrame
 
-from graphdatascience import QueryRunner
 from graphdatascience.arrow_client.v1.gds_arrow_client import GdsArrowClient
 from graphdatascience.call_parameters import CallParameters
 from graphdatascience.procedure_surface.api.catalog.graph_api import GraphV2
@@ -15,6 +14,7 @@
 )
 from graphdatascience.procedure_surface.api.default_values import ALL_TYPES
 from graphdatascience.procedure_surface.utils.config_converter import ConfigConverter
+from graphdatascience.query_runner.query_runner import QueryRunner
 
 
 class RelationshipCypherEndpoints(RelationshipsEndpoints):

graphdatascience/procedure_surface/cypher/catalog_cypher_endpoints.py

@@ -4,6 +4,7 @@
 from types import TracebackType
 from typing import Any, NamedTuple, Type
 
+from graphdatascience.arrow_client.v1.gds_arrow_client import GdsArrowClient
 from graphdatascience.procedure_surface.api.catalog.catalog_endpoints import (
     CatalogEndpoints,
     GraphFilterResult,
@@ -16,7 +17,6 @@
 from graphdatascience.procedure_surface.api.catalog.graph_info import GraphInfo, GraphInfoWithDegrees
 from graphdatascience.procedure_surface.api.catalog.graph_sampling_endpoints import GraphSamplingEndpoints
 from graphdatascience.procedure_surface.cypher.catalog.graph_backend_cypher import get_graph
-from graphdatascience.query_runner.gds_arrow_client import GdsArrowClient
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 
 from ...call_parameters import CallParameters

graphdatascience/query_runner/protocol/project_protocols.py

@@ -5,9 +5,9 @@
 from pandas import DataFrame
 from tenacity import retry, retry_if_result, wait_incrementing
 
-from graphdatascience import QueryRunner
 from graphdatascience.call_parameters import CallParameters
 from graphdatascience.query_runner.protocol.status import Status
+from graphdatascience.query_runner.query_runner import QueryRunner
 from graphdatascience.query_runner.termination_flag import TerminationFlag
 from graphdatascience.retry_utils.retry_utils import before_log
 from graphdatascience.session.dbms.protocol_version import ProtocolVersion

graphdatascience/query_runner/standalone_session_query_runner.py

@@ -4,10 +4,11 @@
 
 from pandas import DataFrame
 
-from graphdatascience import QueryRunner, ServerVersion
 from graphdatascience.call_parameters import CallParameters
 from graphdatascience.query_runner.graph_constructor import GraphConstructor
 from graphdatascience.query_runner.query_mode import QueryMode
+from graphdatascience.query_runner.query_runner import QueryRunner
+from graphdatascience.server_version.server_version import ServerVersion
 
 
 class StandaloneSessionQueryRunner(QueryRunner):

graphdatascience/session/aura_graph_data_science.py

@@ -4,7 +4,6 @@
 
 from pandas import DataFrame
 
-from graphdatascience import QueryRunner, ServerVersion
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.arrow_client.v1.gds_arrow_client import GdsArrowClient
 from graphdatascience.call_builder import IndirectCallBuilder
@@ -20,8 +19,10 @@
 from graphdatascience.query_runner.arrow_query_runner import ArrowQueryRunner
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.query_runner.query_mode import QueryMode
+from graphdatascience.query_runner.query_runner import QueryRunner
 from graphdatascience.query_runner.session_query_runner import SessionQueryRunner
 from graphdatascience.query_runner.standalone_session_query_runner import StandaloneSessionQueryRunner
+from graphdatascience.server_version.server_version import ServerVersion
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.session.session_v2_endpoints import SessionV2Endpoints
 from graphdatascience.utils.util_remote_proc_runner import UtilRemoteProcRunner

graphdatascience/session/dbms/protocol_resolver.py

@@ -1,7 +1,7 @@
 from neo4j.exceptions import Neo4jError
 
-from graphdatascience import QueryRunner
 from graphdatascience.query_runner.query_mode import QueryMode
+from graphdatascience.query_runner.query_runner import QueryRunner
 from graphdatascience.session.dbms.protocol_version import ProtocolVersion
 
 

graphdatascience/tests/integrationV2/procedure_surface/arrow/graph_creation_helper.py

@@ -1,13 +1,13 @@
 from contextlib import contextmanager
 from typing import Any, Generator
 
-from graphdatascience import QueryRunner
 from graphdatascience.arrow_client.authenticated_flight_client import AuthenticatedArrowClient
 from graphdatascience.arrow_client.v2.data_mapper_utils import deserialize_single
 from graphdatascience.arrow_client.v2.job_client import JobClient
 from graphdatascience.procedure_surface.api.catalog.graph_api import GraphV2
 from graphdatascience.procedure_surface.arrow.catalog.catalog_arrow_endpoints import CatalogArrowEndpoints
 from graphdatascience.procedure_surface.arrow.catalog.graph_backend_arrow import get_graph
+from graphdatascience.query_runner.query_runner import QueryRunner
 
 
 @contextmanager