Shorten gds_session package into session

FlorentinD · Mats-SX · FlorentinD · commit 1d58ecb17dfd · 2024-02-23T17:08:41.000+01:00
gds is redundant

Co-authored-by: Mats Rydberg &lt;mats@neo4j.org&gt;
diff --git a/examples/dev/gds-sessions.ipynb b/examples/dev/gds-sessions.ipynb
@@ -70,7 +70,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from graphdatascience.gds_session import DbmsConnectionInfo\n",
+    "from graphdatascience.session import DbmsConnectionInfo\n",
     "import os\n",
     "\n",
     "from neo4j import GraphDatabase\n",
@@ -251,7 +251,7 @@
    "outputs": [],
    "source": [
     "# The new stuff!\n",
-    "from graphdatascience.gds_session import GdsSessions, AuraAPICredentials\n",
+    "from graphdatascience.session import GdsSessions, AuraAPICredentials\n",
     "\n",
     "# Create a new AuraSessions object\n",
     "sessions = GdsSessions(ds_connection=AuraAPICredentials(CLIENT_ID, CLIENT_SECRET))"
@@ -311,7 +311,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from graphdatascience.gds_session.session_sizes import SessionSizes\n",
+    "from graphdatascience.session import SessionSizes\n",
     "\n",
     "# let's create a GDS session!\n",
     "gds = sessions.get_or_create(\n",
@@ -361,7 +361,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from graphdatascience.gds_session.schema import GdsPropertyTypes\n",
+    "from graphdatascience.session import GdsPropertyTypes\n",
     "\n",
     "G, result = gds.graph.project(\n",
     "    \"pagerank-graph\",\n",
diff --git a/graphdatascience/__init__.py b/graphdatascience/__init__.py
@@ -1,4 +1,3 @@
-from .gds_session.gds_sessions import GdsSessions
 from .graph.graph_create_result import GraphCreateResult
 from .graph.graph_object import Graph
 from .graph_data_science import GraphDataScience
@@ -13,6 +12,7 @@
 from .pipeline.nr_training_pipeline import NRTrainingPipeline
 from .query_runner.query_runner import QueryRunner
 from .server_version.server_version import ServerVersion
+from .session.gds_sessions import GdsSessions
 from .version import __version__
 
 __all__ = [
diff --git a/graphdatascience/graph/graph_project_runner.py b/graphdatascience/graph/graph_project_runner.py
@@ -5,7 +5,7 @@
 from pandas import Series
 
 from ..error.illegal_attr_checker import IllegalAttrChecker
-from ..gds_session.schema import NODE_PROPERTY_SCHEMA, RELATIONSHIP_PROPERTY_SCHEMA
+from ..session.schema import NODE_PROPERTY_SCHEMA, RELATIONSHIP_PROPERTY_SCHEMA
 from .graph_object import Graph
 from .graph_type_check import from_graph_type_check
 from graphdatascience.call_parameters import CallParameters
diff --git a/graphdatascience/query_runner/aura_db_arrow_query_runner.py b/graphdatascience/query_runner/aura_db_arrow_query_runner.py
@@ -5,7 +5,7 @@
 from pyarrow.flight import ClientMiddleware, ClientMiddlewareFactory
 
 from ..call_parameters import CallParameters
-from ..gds_session.dbms_connection_info import DbmsConnectionInfo
+from ..session.dbms_connection_info import DbmsConnectionInfo
 from .query_runner import QueryRunner
 from graphdatascience.query_runner.graph_constructor import GraphConstructor
 from graphdatascience.server_version.server_version import ServerVersion
diff --git a/graphdatascience/session/__init__.py b/graphdatascience/session/__init__.py
@@ -1,5 +1,6 @@
 from .dbms_connection_info import DbmsConnectionInfo
 from .gds_sessions import AuraAPICredentials, GdsSessions, SessionInfo
+from .schema import GdsPropertyTypes
 from .session_sizes import SessionSizes
 
 __all__ = [
@@ -8,4 +9,5 @@
     "DbmsConnectionInfo",
     "AuraAPICredentials",
     "SessionSizes",
+    "GdsPropertyTypes",
 ]
diff --git a/graphdatascience/session/aura_api.py b/graphdatascience/session/aura_api.py
diff --git a/graphdatascience/session/aura_graph_data_science.py b/graphdatascience/session/aura_graph_data_science.py
@@ -5,14 +5,14 @@
 from graphdatascience.call_builder import IndirectCallBuilder
 from graphdatascience.endpoints import AlphaEndpoints, BetaEndpoints, DirectEndpoints
 from graphdatascience.error.uncallable_namespace import UncallableNamespace
-from graphdatascience.gds_session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.graph.graph_proc_runner import GraphRemoteProcRunner
 from graphdatascience.query_runner.arrow_query_runner import ArrowQueryRunner
 from graphdatascience.query_runner.aura_db_arrow_query_runner import (
     AuraDbArrowQueryRunner,
 )
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.server_version.server_version import ServerVersion
+from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 
 
 class AuraGraphDataScience(DirectEndpoints, UncallableNamespace):
diff --git a/graphdatascience/session/dbms_connection_info.py b/graphdatascience/session/dbms_connection_info.py
diff --git a/graphdatascience/session/gds_sessions.py b/graphdatascience/session/gds_sessions.py
@@ -5,15 +5,15 @@
 
 from neo4j import GraphDatabase
 
-from graphdatascience.gds_session.aura_api import (
+from graphdatascience.session.aura_api import (
     AuraApi,
     InstanceDetails,
     InstanceSpecificDetails,
 )
-from graphdatascience.gds_session.aura_graph_data_science import AuraGraphDataScience
-from graphdatascience.gds_session.dbms_connection_info import DbmsConnectionInfo
-from graphdatascience.gds_session.region_suggester import closest_match
-from graphdatascience.gds_session.session_sizes import SessionSizeByMemory
+from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
+from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
+from graphdatascience.session.region_suggester import closest_match
+from graphdatascience.session.session_sizes import SessionSizeByMemory
 
 
 @dataclass
diff --git a/graphdatascience/session/region_suggester.py b/graphdatascience/session/region_suggester.py
diff --git a/graphdatascience/session/schema.py b/graphdatascience/session/schema.py
diff --git a/graphdatascience/session/session_sizes.py b/graphdatascience/session/session_sizes.py
diff --git a/graphdatascience/tests/integration/conftest.py b/graphdatascience/tests/integration/conftest.py
@@ -5,11 +5,11 @@
 import pytest
 from neo4j import Driver, GraphDatabase
 
-from graphdatascience.gds_session.aura_graph_data_science import AuraGraphDataScience
-from graphdatascience.gds_session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.graph_data_science import GraphDataScience
 from graphdatascience.query_runner.neo4j_query_runner import Neo4jQueryRunner
 from graphdatascience.server_version.server_version import ServerVersion
+from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
+from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 
 URI = os.environ.get("NEO4J_URI", "bolt://localhost:7687")
 URI_TLS = os.environ.get("NEO4J_URI", "bolt+ssc://localhost:7687")
diff --git a/graphdatascience/tests/integration/test_remote_graph_ops.py b/graphdatascience/tests/integration/test_remote_graph_ops.py
@@ -2,8 +2,8 @@
 
 import pytest
 
-from graphdatascience.gds_session.aura_graph_data_science import AuraGraphDataScience
 from graphdatascience.server_version.server_version import ServerVersion
+from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
 
 GRAPH_NAME = "g"
 
diff --git a/graphdatascience/tests/unit/conftest.py b/graphdatascience/tests/unit/conftest.py
@@ -6,14 +6,14 @@
 
 from graphdatascience import QueryRunner
 from graphdatascience.call_parameters import CallParameters
-from graphdatascience.gds_session.aura_graph_data_science import AuraGraphDataScience
-from graphdatascience.gds_session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.graph_data_science import GraphDataScience
 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.aura_graph_data_science import AuraGraphDataScience
+from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 
 # Should mirror the latest GDS server version under development.
 DEFAULT_SERVER_VERSION = ServerVersion(2, 6, 0)
diff --git a/graphdatascience/tests/unit/test_aura_api.py b/graphdatascience/tests/unit/test_aura_api.py
@@ -5,7 +5,7 @@
 from requests import HTTPError
 from requests_mock import Mocker
 
-from graphdatascience.gds_session.aura_api import (
+from graphdatascience.session.aura_api import (
     AuraApi,
     InstanceCreateDetails,
     InstanceSpecificDetails,
diff --git a/graphdatascience/tests/unit/test_gds_sessions.py b/graphdatascience/tests/unit/test_gds_sessions.py
@@ -7,21 +7,21 @@
 from pytest_mock import MockerFixture
 from requests_mock import Mocker
 
-from graphdatascience.gds_session.aura_api import (
+from graphdatascience.session.aura_api import (
     AuraApi,
     InstanceCreateDetails,
     InstanceDetails,
     InstanceSpecificDetails,
     TenantDetails,
     WaitResult,
 )
-from graphdatascience.gds_session.dbms_connection_info import DbmsConnectionInfo
-from graphdatascience.gds_session.gds_sessions import (
+from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
+from graphdatascience.session.gds_sessions import (
     AuraAPICredentials,
     GdsSessions,
     SessionInfo,
 )
-from graphdatascience.gds_session.session_sizes import SessionSizeByMemory, SessionSizes
+from graphdatascience.session.session_sizes import SessionSizeByMemory, SessionSizes
 
 
 class FakeAuraApi(AuraApi):
diff --git a/graphdatascience/tests/unit/test_graph_ops.py b/graphdatascience/tests/unit/test_graph_ops.py
@@ -1,11 +1,11 @@
 import pytest
 from pandas import DataFrame
 
-from ...gds_session.schema import GdsPropertyTypes
+from ...session.schema import GdsPropertyTypes
 from .conftest import CollectingQueryRunner
-from graphdatascience.gds_session.aura_graph_data_science import AuraGraphDataScience
 from graphdatascience.graph_data_science import GraphDataScience
 from graphdatascience.server_version.server_version import ServerVersion
+from graphdatascience.session.aura_graph_data_science import AuraGraphDataScience
 
 
 def test_project_graph_native(runner: CollectingQueryRunner, gds: GraphDataScience) -> None:
diff --git a/graphdatascience/tests/unit/test_region_suggester.py b/graphdatascience/tests/unit/test_region_suggester.py
@@ -1,4 +1,4 @@
-from graphdatascience.gds_session import region_suggester
+from graphdatascience.session import region_suggester
 
 
 def test_picks_the_only_option() -> None:
