Fix circular import by moving aura api authentication to session module

Author: soerenreichardt

graphdatascience/graph_data_science.py

@@ -7,6 +7,8 @@
 from neo4j import Driver
 from pandas import DataFrame
 
+from graphdatascience.query_runner.arrow_authentication import UsernamePasswordAuthentication
+
 from .call_builder import IndirectCallBuilder
 from .endpoints import AlphaEndpoints, BetaEndpoints, DirectEndpoints
 from .error.uncallable_namespace import UncallableNamespace
@@ -16,7 +18,6 @@
 from .query_runner.neo4j_query_runner import Neo4jQueryRunner
 from .query_runner.query_runner import QueryRunner
 from .server_version.server_version import ServerVersion
-from .session.arrow_authentication import UsernamePasswordAuthentication
 from .utils.util_proc_runner import UtilProcRunner
 from .version import __min_server_version__
 

graphdatascience/session/arrow_authentication.py renamed to graphdatascience/query_runner/arrow_authentication.py

@@ -1,8 +1,6 @@
 from abc import ABC, abstractmethod
 from typing import Callable
 
-from graphdatascience.session.aura_api import AuraApi
-
 
 class ArrowAuthentication(ABC):
     type AuthTokenFn = Callable[[], str]
@@ -20,11 +18,3 @@ def __init__(self, username: str, password: str):
 
     def auth_pair(self) -> tuple[str, str]:
         return self._username, self._password
-
-
-class AuraApiTokenAuthentication(ArrowAuthentication):
-    def __init__(self, aura_api: AuraApi):
-        self._aura_api = aura_api
-
-    def auth_pair(self) -> tuple[str, str]:
-        return "", self._aura_api._auth._auth_token()

graphdatascience/query_runner/arrow_query_runner.py

@@ -5,6 +5,7 @@
 
 from pandas import DataFrame
 
+from graphdatascience.query_runner.arrow_authentication import ArrowAuthentication
 from graphdatascience.retry_utils.retry_config import RetryConfig
 
 from ..call_parameters import CallParameters
@@ -14,7 +15,6 @@
 from .gds_arrow_client import GdsArrowClient
 from .graph_constructor import GraphConstructor
 from .query_runner import QueryRunner
-from ..session.arrow_authentication import ArrowAuthentication
 
 
 class ArrowQueryRunner(QueryRunner):

graphdatascience/query_runner/gds_arrow_client.py

@@ -35,11 +35,11 @@
     wait_exponential,
 )
 
+from graphdatascience.query_runner.arrow_authentication import ArrowAuthentication
 from graphdatascience.retry_utils.retry_config import RetryConfig
 from graphdatascience.retry_utils.retry_utils import before_log
 
 from ..semantic_version.semantic_version import SemanticVersion
-from ..session.arrow_authentication import ArrowAuthentication
 from ..version import __version__
 from .arrow_endpoint_version import ArrowEndpointVersion
 from .arrow_info import ArrowInfo

graphdatascience/session/aura_api_token_authentication.py

@@ -0,0 +1,10 @@
+from graphdatascience.query_runner.arrow_authentication import ArrowAuthentication
+from graphdatascience.session.aura_api import AuraApi
+
+
+class AuraApiTokenAuthentication(ArrowAuthentication):
+    def __init__(self, aura_api: AuraApi):
+        self._aura_api = aura_api
+
+    def auth_pair(self) -> tuple[str, str]:
+        return "", self._aura_api._auth._auth_token()

graphdatascience/session/aura_graph_data_science.py

@@ -13,13 +13,13 @@
 )
 from graphdatascience.error.uncallable_namespace import UncallableNamespace
 from graphdatascience.graph.graph_remote_proc_runner import GraphRemoteProcRunner
+from graphdatascience.query_runner.arrow_authentication import ArrowAuthentication
 from graphdatascience.query_runner.arrow_info import ArrowInfo
 from graphdatascience.query_runner.arrow_query_runner import ArrowQueryRunner
 from graphdatascience.query_runner.gds_arrow_client import GdsArrowClient
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.query_runner.session_query_runner import SessionQueryRunner
 from graphdatascience.query_runner.standalone_session_query_runner import StandaloneSessionQueryRunner
-from graphdatascience.session.arrow_authentication import ArrowAuthentication
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.utils.util_remote_proc_runner import UtilRemoteProcRunner
 

graphdatascience/session/dedicated_sessions.py

@@ -5,11 +5,12 @@
 from datetime import datetime, timedelta, timezone
 from typing import Optional
 
+from graphdatascience.query_runner.arrow_authentication import ArrowAuthentication
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.session.algorithm_category import AlgorithmCategory
-from graphdatascience.session.arrow_authentication import AuraApiTokenAuthentication, ArrowAuthentication
 from graphdatascience.session.aura_api import AuraApi
 from graphdatascience.session.aura_api_responses import SessionDetails
+from graphdatascience.session.aura_api_token_authentication import AuraApiTokenAuthentication
 from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
 from graphdatascience.session.cloud_location import CloudLocation
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo

graphdatascience/tests/integration/conftest.py

@@ -7,9 +7,9 @@
 from neo4j import Driver, GraphDatabase
 
 from graphdatascience.graph_data_science import GraphDataScience
+from graphdatascience.query_runner.arrow_authentication import UsernamePasswordAuthentication
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.server_version.server_version import ServerVersion
-from graphdatascience.session.arrow_authentication import UsernamePasswordAuthentication
 from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 

graphdatascience/tests/unit/conftest.py

@@ -10,13 +10,13 @@
 from graphdatascience import QueryRunner
 from graphdatascience.call_parameters import CallParameters
 from graphdatascience.graph_data_science import GraphDataScience
+from graphdatascience.query_runner.arrow_authentication import UsernamePasswordAuthentication
 from graphdatascience.query_runner.arrow_info import ArrowInfo
 from graphdatascience.query_runner.cypher_graph_constructor import (
     CypherGraphConstructor,
 )
 from graphdatascience.query_runner.graph_constructor import GraphConstructor
 from graphdatascience.server_version.server_version import ServerVersion
-from graphdatascience.session.arrow_authentication import UsernamePasswordAuthentication
 from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 

graphdatascience/tests/unit/test_gds_arrow_client.py

@@ -14,9 +14,9 @@
     Ticket,
 )
 
+from graphdatascience.query_runner.arrow_authentication import UsernamePasswordAuthentication
 from graphdatascience.query_runner.arrow_info import ArrowInfo
 from graphdatascience.query_runner.gds_arrow_client import AuthMiddleware, GdsArrowClient
-from graphdatascience.session.session_connection_info import UsernamePasswordAuthentication
 
 ActionParam = Union[str, tuple[str, Any], Action]