Merge pull request #675 from FlorentinD/handle-empty-memory-field

Handle empty memory on GET instance details

Author: Mats-SX

graphdatascience/session/aura_api_responses.py

@@ -82,7 +82,7 @@ def fromJson(cls, json: Dict[str, Any]) -> InstanceSpecificDetails:
             cloud_provider=json["cloud_provider"],
             status=json["status"],
             connection_url=json.get("connection_url", ""),
-            memory=SessionMemoryValue.fromApiResponse(json.get("memory", "")),
+            memory=SessionMemoryValue.fromInstanceSize(json.get("memory")),
             type=json["type"],
             region=json["region"],
         )

graphdatascience/session/aurads_sessions.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import warnings
 from typing import List, Optional
 
@@ -16,7 +17,11 @@
 from graphdatascience.session.dbms_connection_info import DbmsConnectionInfo
 from graphdatascience.session.region_suggester import closest_match
 from graphdatascience.session.session_info import SessionInfo
-from graphdatascience.session.session_sizes import SessionMemory, SessionMemoryValue
+from graphdatascience.session.session_sizes import (
+    SESSION_MEMORY_VALUE_UNKNOWN,
+    SessionMemory,
+    SessionMemoryValue,
+)
 
 
 class AuraDsSessions:
@@ -25,6 +30,7 @@ class AuraDsSessions:
 
     def __init__(self, aura_api: AuraApi) -> None:
         self._aura_api = aura_api
+        self._logger = logging.getLogger()
 
     def estimate(
         self, node_count: int, relationship_count: int, algorithm_categories: Optional[List[AlgorithmCategory]] = None
@@ -53,8 +59,12 @@ def get_or_create(
 
         if existing_session:
             session_id = existing_session.id
-            # 0MB is AuraAPI default value for memory if none can be retrieved
-            if existing_session.memory.value != "0MB" and existing_session.memory != memory.value:
+            # AuraAPI default value for memory if none can be retrieved
+            if existing_session.memory == SESSION_MEMORY_VALUE_UNKNOWN:
+                self._logger.debug(
+                    f"Reusing existing session with id `{session_id}` as size for session is unknown during creation."
+                )
+            elif existing_session.memory != memory.value:
                 raise ValueError(
                     f"Session `{session_name}` already exists with memory `{existing_session.memory.value}`. "
                     f"Requested memory `{memory.value}` does not match."

graphdatascience/session/session_sizes.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from dataclasses import dataclass
 from enum import Enum
-from typing import List
+from typing import List, Optional
 
 
 @dataclass(frozen=True)
@@ -11,7 +13,7 @@ def __str__(self) -> str:
         return self.value
 
     @staticmethod
-    def fromApiResponse(value: str) -> "SessionMemoryValue":
+    def fromApiResponse(value: str) -> SessionMemoryValue:
         """
         Converts the string value from an API response to a SessionMemory enumeration value.
 
@@ -27,6 +29,16 @@ def fromApiResponse(value: str) -> "SessionMemoryValue":
 
         return SessionMemoryValue(value.replace("Gi", "GB"))
 
+    @staticmethod
+    def fromInstanceSize(value: Optional[str]) -> SessionMemoryValue:
+        if not value:
+            return SESSION_MEMORY_VALUE_UNKNOWN
+
+        return SessionMemoryValue(value.replace("Gi", "GB"))
+
+
+SESSION_MEMORY_VALUE_UNKNOWN = SessionMemoryValue("")
+
 
 class SessionMemory(Enum):
     """

graphdatascience/tests/unit/test_aura_api.py

@@ -18,6 +18,7 @@
     TimeParser,
     WaitResult,
 )
+from graphdatascience.session.session_sizes import SESSION_MEMORY_VALUE_UNKNOWN
 
 
 def test_create_session(requests_mock: Mocker) -> None:
@@ -438,15 +439,15 @@ def test_list_instance_missing_memory_field(requests_mock: Mocker) -> None:
                 "status": "creating",
                 "tenant_id": "046046d1-6996-53e4-8880-5b822766e1f9",
                 "type": "enterprise-ds",
-                "memory": "16Gi",
+                "memory": "",
             }
         },
     )
 
     result = api.list_instance("id0")
 
     assert result and result.id == "a10fb995"
-    assert result.memory == SessionMemory.m_16GB.value
+    assert result.memory == SESSION_MEMORY_VALUE_UNKNOWN
 
 
 def test_list_missing_instance(requests_mock: Mocker) -> None: