fix: Add missing status_history GQL field

lablup · Dec 9, 2024 · 8b3fe90 · 8b3fe90
1 parent 4e361b7
commit 8b3fe90
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/ai/backend/manager/models/gql_models/session.py b/src/ai/backend/manager/models/gql_models/session.py
@@ -56,7 +56,7 @@
     get_permission_ctx,
 )
 from ..user import UserRole
-from ..utils import execute_with_txn_retry
+from ..utils import execute_with_txn_retry, get_lastest_timestamp_for_status
 from .kernel import KernelConnection, KernelNode
 
 if TYPE_CHECKING:
@@ -174,7 +174,7 @@ class Meta:
     # status_changed = GQLDateTime()  # FIXME: generated attribute
     status_info = graphene.String()
     status_data = graphene.JSONString()
-    status_history = graphene.JSONString()
+    status_history = graphene.JSONString(description="Added in 24.12.0.")
     created_at = GQLDateTime()
     terminated_at = GQLDateTime()
     starts_at = GQLDateTime()
@@ -225,7 +225,11 @@ def from_row(
         permissions: Optional[Iterable[ComputeSessionPermission]] = None,
     ) -> Self:
         status_history = row.status_history or {}
-        raw_scheduled_at = status_history.get(SessionStatus.SCHEDULED.name)
+        timestamp = get_lastest_timestamp_for_status(
+            cast(list[dict[str, str]], status_history), SessionStatus.SCHEDULED
+        )
+        scheduled_at = str(timestamp) if timestamp is not None else None
+
         result = cls(
             # identity
             id=row.id,  # auto-converted to Relay global ID
@@ -251,9 +255,7 @@ def from_row(
             created_at=row.created_at,
             starts_at=row.starts_at,
             terminated_at=row.terminated_at,
-            scheduled_at=datetime.fromisoformat(raw_scheduled_at)
-            if raw_scheduled_at is not None
-            else None,
+            scheduled_at=scheduled_at,
             startup_command=row.startup_command,
             result=row.result.name,
             # resources

diff --git a/src/ai/backend/manager/models/kernel.py b/src/ai/backend/manager/models/kernel.py
@@ -880,6 +880,7 @@ class Meta:
     # status
     status = graphene.String()
     status_changed = GQLDateTime()
+    status_history = graphene.JSONString(description="Added in 24.12.0.")
     status_info = graphene.String()
     status_data = graphene.JSONString()
     created_at = GQLDateTime()
@@ -931,6 +932,7 @@ def parse_row(cls, ctx: GraphQueryContext, row: KernelRow) -> Mapping[str, Any]:
             # status
             "status": row.status.name,
             "status_changed": row.status_changed,
+            "status_history": row.status_history,
             "status_info": row.status_info,
             "status_data": row.status_data,
             "created_at": row.created_at,