Merge pull request #697 from FlorentinD/catch-400-on-list-instances

Catch invalid db tier on list-session

Author: FlorentinD

graphdatascience/session/aura_api.py

@@ -28,6 +28,7 @@ class AuraApiError(Exception):
     def __init__(self, message: str, status_code: int):
         super().__init__(self, message)
         self.status_code = status_code
+        self.message = message
 
 
 class AuraApi:

graphdatascience/session/dedicated_sessions.py

@@ -97,9 +97,10 @@ def list(self) -> List[SessionInfo]:
                 sessions.extend(self._aura_api.list_sessions(db.id))
             except AuraApiError as e:
                 # ignore 404 errors when listing sessions
-                # it could mean paused sessions or deleted sessions (or an invalid instance type)
-                if e.status_code != 404:
-                    raise e
+                # it could mean paused/deleted instance or an invalid db type
+                if e.status_code == 404 or (e.status_code == 400 and "of tier" in e.message):
+                    continue
+                raise e
 
         return [SessionInfo.from_session_details(i) for i in sessions]
 
@@ -109,9 +110,10 @@ def _find_existing_session(self, session_name: str, dbid: str) -> Optional[Sessi
             matched_sessions = [s for s in self._aura_api.list_sessions(dbid) if s.name == session_name]
         except AuraApiError as e:
             # ignore 404 errors when listing sessions
-            # it could mean paused sessions or deleted sessions (or an invalid instance type)
-            if e.status_code != 404:
-                raise e
+            # it could mean paused/deleted instance or an invalid db type
+            if e.status_code == 404 or (e.status_code == 400 and "of tier" in e.message):
+                return None
+            raise e
 
         if len(matched_sessions) == 0:
             return None

graphdatascience/tests/unit/test_dedicated_sessions.py

@@ -75,6 +75,12 @@ def _mimic_paused_db_behaviour(self, dbid: str) -> None:
         if db and db.status == "paused":
             raise AuraApiError(message="Database not found", status_code=404)
 
+        if db and db.type == "gds":
+            raise AuraApiError(
+                message=f"Database with id `{db.id}` of tier `{db.type}`, which is not supported by sessions.",
+                status_code=400,
+            )
+
     def create_instance(
         self, name: str, memory: SessionMemoryValue, cloud_provider: str, region: str
     ) -> InstanceCreateDetails:
@@ -221,6 +227,35 @@ def test_list_session_paused_instance(aura_api: AuraApi) -> None:
     assert sessions.list() == [SessionInfo.from_session_details(session)]
 
 
+def test_list_session_gds_instance(aura_api: AuraApi) -> None:
+    db = aura_api.create_instance("test", SessionMemory.m_8GB.value, "aws", "leipzig-1")
+    fake_aura_api = cast(FakeAuraApi, aura_api)
+
+    fake_aura_api.id_counter += 1
+    gds_instance = InstanceSpecificDetails(
+        id="4242",
+        status="Creating",
+        connection_url="foo.bar",
+        memory=SessionMemory.m_16GB.value,
+        type="gds",
+        region="dresden",
+        name="ds instance",
+        tenant_id=fake_aura_api._tenant_id,
+        cloud_provider="aws",
+    )
+    fake_aura_api._instances[gds_instance.id] = gds_instance
+
+    session = aura_api.create_session(
+        name="gds-session-my-session-name",
+        dbid=db.id,
+        pwd="some_pwd",
+        memory=SessionMemory.m_8GB.value,
+    )
+    sessions = DedicatedSessions(aura_api)
+
+    assert sessions.list() == [SessionInfo.from_session_details(session)]
+
+
 def test_create_session(mocker: MockerFixture, aura_api: AuraApi) -> None:
     _setup_db_instance(aura_api)