Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add CREATING session status #2849

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const isActive = (session: SessionActionButtonsFragment$data) => {
// 'TERMINATING',
// 'PENDING',
// 'PREPARING',
// 'CREATING',
// 'PULLING',
// ].includes(session?.status || '');
// };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ interface SessionStatusTagProps {
const statusTagColor = {
//prepare
RESTARTING: 'blue',
PREPARED: 'blue',
PREPARING: 'blue',
PREPARED: 'blue',
CREATING: 'blue',
PULLING: 'blue',
//running
RUNNING: 'green',
Expand All @@ -33,7 +34,8 @@ const isTransitional = (session: SessionStatusTagFragment$data) => {
'RESTARTING',
'TERMINATING',
'PENDING',
'PREPARING',
`PREPARING`,
'CREATING',
'PULLING',
].includes(session?.status || '');
};
Expand Down
3 changes: 2 additions & 1 deletion react/src/components/SessionList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ const SessionList: React.FC<SessionListProps> = ({
const statusTagColor = {
//prepare
RESTARTING: 'blue',
PREPARED: 'blue',
PREPARING: 'blue',
PREPARED: 'blue',
CREATING: 'blue',
PULLING: 'blue',
//running
RUNNING: 'green',
Expand Down
11 changes: 9 additions & 2 deletions react/src/components/SessionListColums/SessionInfoCell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,21 @@ const isRunningStatus = (status: string = '') => {
'TERMINATING',
'PENDING',
'SCHEDULED',
'PREPARED',
'PREPARING',
'PREPARED',
'CREATING',
'PULLING',
].includes(status);
};

const isPreparing = (status: string = '') => {
return ['RESTARTING', 'PREPARED', 'PREPARING', 'PULLING'].includes(status);
return [
'RESTARTING',
'PREPARING',
'PREPARED',
'CREATING',
'PULLING',
].includes(status);
};

const SessionInfoCell: React.FC<{
Expand Down
3 changes: 2 additions & 1 deletion react/src/pages/SessionListPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ const RUNNINGS = [
'TERMINATING',
'PENDING',
'SCHEDULED',
'PREPARED',
'PREPARING',
'PREPARED',
'CREATING',
'PULLING',
];
const TAB_STATUS_MAP = {
Expand Down
6 changes: 6 additions & 0 deletions src/components/backend-ai-edu-applauncher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,9 @@ export default class BackendAiEduApplauncher extends BackendAIPage {
globalThis.backendaiclient.supports('prepared-session-status')
? 'PREPARED'
: undefined,
globalThis.backendaiclient.supports('creating-session-status')
? 'CREATING'
: undefined,
'PREPARING',
'PULLING',
]
Expand All @@ -275,6 +278,9 @@ export default class BackendAiEduApplauncher extends BackendAIPage {
globalThis.backendaiclient.supports('prepared-session-status')
? 'PREPARED'
: undefined,
globalThis.backendaiclient.supports('creating-session-status')
? 'CREATING'
: undefined,
'PREPARING',
'PULLING',
]
Expand Down
9 changes: 8 additions & 1 deletion src/components/backend-ai-session-list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -580,8 +580,9 @@ export default class BackendAISessionList extends BackendAIPage {
_isPreparing(status) {
const preparingStatuses = [
'RESTARTING',
'PREPARED',
'PREPARING',
'PREPARED',
'CREATING',
'PULLING',
];
if (preparingStatuses.indexOf(status) === -1) {
Expand Down Expand Up @@ -772,6 +773,9 @@ export default class BackendAISessionList extends BackendAIPage {
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
Expand All @@ -789,6 +793,9 @@ export default class BackendAISessionList 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('avoid-hol-blocking') &&
Expand Down
3 changes: 3 additions & 0 deletions src/components/backend-ai-session-view.ts
Original file line number Diff line number Diff line change
Expand Up @@ -356,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(',');
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/backend.ai-client-es6.js
Original file line number Diff line number Diff line change
Expand Up @@ -32471,7 +32471,7 @@
'occupied_slots',
'containers {live_stat last_stat}',
],
e = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PULLING,TERMINATED,CANCELLED,ERROR',
e = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
i = '',
r = 100,
n = 0,
Expand Down
7 changes: 4 additions & 3 deletions src/lib/backend.ai-client-esm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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: `PREPARING`, `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.
Expand Down Expand Up @@ -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: `PREPARING`, `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.
Expand Down Expand Up @@ -3722,7 +3723,7 @@ class ComputeSession {
'occupied_slots',
'containers {live_stat last_stat}',
],
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PULLING,TERMINATED,CANCELLED,ERROR',
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PREPARED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
accessKey = '',
limit = 100,
offset = 0,
Expand Down
6 changes: 3 additions & 3 deletions src/lib/backend.ai-client-node.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: `PREPARING`, `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.
Expand Down Expand Up @@ -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: `PREPARING`, `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.
Expand Down Expand Up @@ -2932,7 +2932,7 @@ class ComputeSession {
'occupied_slots',
'containers {live_stat last_stat}',
],
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PULLING,TERMINATED,CANCELLED,ERROR',
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PREPARED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
accessKey = '',
limit = 100,
offset = 0,
Expand Down
10 changes: 5 additions & 5 deletions src/lib/backend.ai-client-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2363,7 +2363,7 @@ class Agent {
/**
* List computation agents.
*
* @param {string} status - Status to query. Should be one of 'ALIVE', 'PREPARING', 'TERMINATING' and 'TERMINATED'.
* @param {string} status - Status to query. Should be one of 'ALIVE', 'CREATING', '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.)
*/
Expand Down Expand Up @@ -3074,7 +3074,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: `PREPARING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
* Available statuses are: `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.
Expand Down Expand Up @@ -3112,7 +3112,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: `PREPARING`, `BUILDING`, `PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
* Available statuses are: `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.
Expand Down Expand Up @@ -3184,7 +3184,7 @@ class ComputeSession {
'occupied_slots',
'containers {live_stat last_stat}',
],
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,PREPARING,PULLING,TERMINATED,CANCELLED,ERROR',
status = 'RUNNING,RESTARTING,TERMINATING,PENDING,SCHEDULED,CREATING,PULLING,TERMINATED,CANCELLED,ERROR',
accessKey = '',
limit = 100,
offset = 0,
Expand Down Expand Up @@ -3300,7 +3300,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: `PREPARING`, `BUILDING`,`PENDING`, `SCHEDULED`, `RUNNING`, `RESTARTING`, `RESIZING`, `SUSPENDED`, `TERMINATING`, `TERMINATED`, `ERROR`.
* Available statuses are: `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.
Expand Down
Loading