Check version compatibility of manager

lablup · Dec 23, 2024 · 9f88a1a · 9f88a1a
1 parent 1f2fd23
commit 9f88a1a
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 25 deletions.
diff --git a/react/src/components/ComputeSessionNodeItems/SessionActionButtons.tsx b/react/src/components/ComputeSessionNodeItems/SessionActionButtons.tsx
@@ -34,6 +34,7 @@ const isActive = (session: SessionActionButtonsFragment$data) => {
 //     'RESTARTING',
 //     'TERMINATING',
 //     'PENDING',
+//     'PREPARING',
 //     'CREATING',
 //     'PULLING',
 //   ].includes(session?.status || '');

diff --git a/react/src/components/ComputeSessionNodeItems/SessionStatusTag.tsx b/react/src/components/ComputeSessionNodeItems/SessionStatusTag.tsx
@@ -16,6 +16,7 @@ interface SessionStatusTagProps {
 const statusTagColor = {
   //prepare
   RESTARTING: 'blue',
+  PREPARING: 'blue',
   PREPARED: 'blue',
   CREATING: 'blue',
   PULLING: 'blue',
@@ -33,6 +34,7 @@ const isTransitional = (session: SessionStatusTagFragment$data) => {
     'RESTARTING',
     'TERMINATING',
     'PENDING',
+    `PREPARING`,
     'CREATING',
     'PULLING',
   ].includes(session?.status || '');

diff --git a/react/src/components/SessionList.tsx b/react/src/components/SessionList.tsx
@@ -115,6 +115,7 @@ const SessionList: React.FC<SessionListProps> = ({
   const statusTagColor = {
     //prepare
     RESTARTING: 'blue',
+    PREPARING: 'blue',
     PREPARED: 'blue',
     CREATING: 'blue',
     PULLING: 'blue',

diff --git a/react/src/components/SessionListColums/SessionInfoCell.tsx b/react/src/components/SessionListColums/SessionInfoCell.tsx
@@ -20,14 +20,21 @@ const isRunningStatus = (status: string = '') => {
     'TERMINATING',
     'PENDING',
     'SCHEDULED',
+    'PREPARING',
     'PREPARED',
     'CREATING',
     'PULLING',
   ].includes(status);
 };
 
 const isPreparing = (status: string = '') => {
-  return ['RESTARTING', 'PREPARED', 'CREATING', 'PULLING'].includes(status);
+  return [
+    'RESTARTING',
+    'PREPARING',
+    'PREPARED',
+    'CREATING',
+    'PULLING',
+  ].includes(status);
 };
 
 const SessionInfoCell: React.FC<{

diff --git a/react/src/pages/SessionListPage.tsx b/react/src/pages/SessionListPage.tsx
@@ -15,6 +15,7 @@ const RUNNINGS = [
   'TERMINATING',
   'PENDING',
   'SCHEDULED',
+  'PREPARING',
   'PREPARED',
   'CREATING',
   'PULLING',

diff --git a/src/components/backend-ai-edu-applauncher.ts b/src/components/backend-ai-edu-applauncher.ts
@@ -261,7 +261,10 @@ export default class BackendAiEduApplauncher extends BackendAIPage {
         globalThis.backendaiclient.supports('prepared-session-status')
           ? 'PREPARED'
           : undefined,
-        'CREATING',
+        globalThis.backendaiclient.supports('creating-session-status')
+          ? 'CREATING'
+          : undefined,
+        'PREPARING',
         'PULLING',
       ]
         .filter((v) => !!v)
@@ -275,7 +278,10 @@ export default class BackendAiEduApplauncher extends BackendAIPage {
         globalThis.backendaiclient.supports('prepared-session-status')
           ? 'PREPARED'
           : undefined,
-        'CREATING',
+        globalThis.backendaiclient.supports('creating-session-status')
+          ? 'CREATING'
+          : undefined,
+        'PREPARING',
         'PULLING',
       ]
         .filter((v) => !!v)

diff --git a/src/components/backend-ai-session-list.ts b/src/components/backend-ai-session-list.ts
@@ -578,7 +578,13 @@ export default class BackendAISessionList extends BackendAIPage {
   }
 
   _isPreparing(status) {
-    const preparingStatuses = ['RESTARTING', 'PREPARED', 'CREATING', 'PULLING'];
+    const preparingStatuses = [
+      'RESTARTING',
+      'PREPARING',
+      'PREPARED',
+      'CREATING',
+      'PULLING',
+    ];
     if (preparingStatuses.indexOf(status) === -1) {
       return false;
     }
@@ -760,14 +766,16 @@ export default class BackendAISessionList extends BackendAIPage {
           'TERMINATING',
           'PENDING',
           'SCHEDULED',
-          'PREPARED',
-          'CREATING',
+          'PREPARING',
           'PULLING',
           'ERROR',
         ];
         if (globalThis.backendaiclient.supports('prepared-session-status')) {
           status.push('PREPARED');
         }
+        if (globalThis.backendaiclient.supports('creating-session-status')) {
+          status.push('CREATING');
+        }
         break;
       case 'finished':
         status = ['TERMINATED', 'CANCELLED']; // TERMINATED, CANCELLED
@@ -779,17 +787,15 @@ export default class BackendAISessionList extends BackendAIPage {
           'TERMINATING',
           'PENDING',
           'SCHEDULED',
-<<<<<<< HEAD
           'PREPARING',
-=======
-          'PREPARED',
-          'CREATING',
->>>>>>> 035be307 (feat: Replace PREPARING status to CREATING)
           'PULLING',
         ];
         if (globalThis.backendaiclient.supports('prepared-session-status')) {
           status.push('PREPARED');
         }
+        if (globalThis.backendaiclient.supports('creating-session-status')) {
+          status.push('CREATING');
+        }
     }
     if (
       !globalThis.backendaiclient.supports('avoid-hol-blocking') &&

diff --git a/src/components/backend-ai-session-view.ts b/src/components/backend-ai-session-view.ts
@@ -334,8 +334,7 @@ export default class BackendAISessionView extends BackendAIPage {
         'TERMINATING',
         'PENDING',
         'SCHEDULED',
-        'PREPARED',
-        'CREATING',
+        'PREPARING',
         'PULLING',
         'TERMINATED',
         'CANCELLED',
@@ -347,8 +346,7 @@ export default class BackendAISessionView extends BackendAIPage {
         'RESTARTING',
         'TERMINATING',
         'PENDING',
-        'PREPARED',
-        'CREATING',
+        'PREPARING',
         'PULLING',
         'TERMINATED',
         'CANCELLED',
@@ -358,6 +356,9 @@ export default class BackendAISessionView extends BackendAIPage {
     if (globalThis.backendaiclient.supports('prepared-session-status')) {
       status.push('PREPARED');
     }
+    if (globalThis.backendaiclient.supports('creating-session-status')) {
+      status.push('CREATING');
+    }
     if (globalThis.backendaiclient.supports('detailed-session-states')) {
       status = status.join(',');
     }

diff --git a/src/lib/backend.ai-client-esm.ts b/src/lib/backend.ai-client-esm.ts
@@ -725,6 +725,7 @@ class Client {
       this._features['extended-image-info'] = true;
       this._features['batch-timeout'] = true;
       this._features['prepared-session-status'] = true;
+      this._features['creating-session-status'] = true;
     }
   }
 
@@ -2808,7 +2809,7 @@ class Agent {
   /**
    * List computation agents.
    *
-   * @param {string} status - Status to query. Should be one of 'ALIVE', 'CREATING', 'TERMINATING' and 'TERMINATED'.
+   * @param {string} status - Status to query. Should be one of 'ALIVE', 'PREPARING', 'TERMINATING' and 'TERMINATED'.
    * @param {array} fields - Fields to query. Queryable fields are:  'id', 'status', 'region', 'first_contact', 'cpu_cur_pct', 'mem_cur_bytes', 'available_slots', 'occupied_slots'.
    * @param {number} timeout - timeout for the request. Default uses SDK default. (5 sec.)
    */
@@ -2882,7 +2883,7 @@ class AgentSummary {
   /**
    * List of agent summary.
    *
-   * @param {string} status - Status to query. Should be one of 'ALIVE', 'CREATING', 'TERMINATING' and 'TERMINATED'.
+   * @param {string} status - Status to query. Should be one of 'ALIVE', 'PREPARING', 'TERMINATING' and 'TERMINATED'.
    * @param {array} fields - Fields to query. Queryable fields are:  id, status, scaling_group, schedulable, schedulable, available_slots, occupied_slots.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.
@@ -3612,7 +3613,7 @@ class ComputeSession {
    * Get the number of compute sessions with specific conditions.
    *
    * @param {string or array} status - status to query. Default is 'RUNNING'.
-   *        Available statuses are: `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
+   *        Available statuses are: `PREPARING`, `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
    * @param {string} accessKey - access key that is used to start compute sessions.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.
@@ -3650,7 +3651,7 @@ class ComputeSession {
    *
    * @param {array} fields - fields to query. Default fields are: ["id", "name", "image", "created_at", "terminated_at", "status", "status_info", "occupied_slots", "cpu_used", "io_read_bytes", "io_write_bytes"].
    * @param {string or array} status - status to query. Default is 'RUNNING'.
-   *        Available statuses are: `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
+   *        Available statuses are:`PREPARING`, `PREPARED`, `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
    * @param {string} accessKey - access key that is used to start compute sessions.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.
@@ -3722,7 +3723,7 @@ class ComputeSession {
       'occupied_slots',
       'containers {live_stat last_stat}',
     ],
-    status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
+    status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PREPARED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
     accessKey = '',
     limit = 100,
     offset = 0,

diff --git a/src/lib/backend.ai-client-node.js b/src/lib/backend.ai-client-node.js
@@ -2148,7 +2148,7 @@ class Agent {
   /**
    * List computation agents.
    *
-   * @param {string} status - Status to query. Should be one of 'ALIVE', 'CREATING', 'TERMINATING' and 'TERMINATED'.
+   * @param {string} status - Status to query. Should be one of 'ALIVE', 'PREPARING', 'TERMINATING' and 'TERMINATED'.
    * @param {array} fields - Fields to query. Queryable fields are:  'id', 'status', 'region', 'first_contact', 'cpu_cur_pct', 'mem_cur_bytes', 'available_slots', 'occupied_slots'.
    * @param {number} timeout - timeout for the request. Default uses SDK default. (5 sec.)
    */
@@ -2824,7 +2824,7 @@ class ComputeSession {
    * Get the number of compute sessions with specific conditions.
    *
    * @param {string or array} status - status to query. Default is 'RUNNING'.
-   *        Available statuses are: `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
+   *        Available statuses are: `PREPARING`, `PREPARED`, `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
    * @param {string} accessKey - access key that is used to start compute sessions.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.
@@ -2861,7 +2861,7 @@ class ComputeSession {
    *
    * @param {array} fields - fields to query. Default fields are: ["id", "name", "image", "created_at", "terminated_at", "status", "status_info", "occupied_slots", "cpu_used", "io_read_bytes", "io_write_bytes"].
    * @param {string or array} status - status to query. Default is 'RUNNING'.
-   *        Available statuses are: `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
+   *        Available statuses are: `PREPARING`, `PREPARED`, `CREATING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
    * @param {string} accessKey - access key that is used to start compute sessions.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.
@@ -2932,7 +2932,7 @@ class ComputeSession {
       'occupied_slots',
       'containers {live_stat last_stat}',
     ],
-    status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
+    status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PREPARED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
     accessKey = '',
     limit = 100,
     offset = 0,
@@ -3039,7 +3039,7 @@ class SessionTemplate {
    *
    * @param {array} fields - fields to query. Default fields are: ["id", "name", "image", "created_at", "terminated_at", "status", "status_info", "occupied_slots", "cpu_used", "io_read_bytes", "io_write_bytes"].
    * @param {string or array} status - status to query. Default is 'RUNNING'.
-   *        Available statuses are: `CREATING`, `BUILDING`,`PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
+   *        Available statuses are: `PREPARING`, `BUILDING`,`PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
    * @param {string} accessKey - access key that is used to start compute sessions.
    * @param {number} limit - limit number of query items.
    * @param {number} offset - offset for item query. Useful for pagination.