Skip to content
Draft
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
93 changes: 93 additions & 0 deletions react/src/components/AccessTokenList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import { Tag, Typography } from 'antd';
import {
BAITable,
filterOutNullAndUndefined,
filterOutEmpty,
BAIColumnType,
} from 'backend.ai-ui';
import dayjs from 'dayjs';
import { useTranslation } from 'react-i18next';
import { graphql, useFragment } from 'react-relay';
import {
AccessTokenListFragment$key,
AccessTokenListFragment$data,
} from 'src/__generated__/AccessTokenListFragment.graphql';

export type AccessTokenInList = NonNullable<
NonNullable<AccessTokenListFragment$data>[number]
>;

interface AccessTokenListProps {
accessTokensFrgmt?: AccessTokenListFragment$key;
}

const AccessTokenList: React.FC<AccessTokenListProps> = ({
accessTokensFrgmt,
}) => {
const { t } = useTranslation();

const accessTokens = useFragment(
graphql`
fragment AccessTokenListFragment on AccessToken @relay(plural: true) {
id
token
createdAt
validUntil
}
`,
accessTokensFrgmt,
);

const filteredAccessTokens = filterOutNullAndUndefined(accessTokens);

const columns = filterOutEmpty<BAIColumnType<AccessTokenInList>>([
{
key: 'token',
title: t('deployment.Token'),
dataIndex: 'token',
fixed: 'left',
render: (token) => (
<Typography.Text ellipsis copyable style={{ width: 150 }}>
{token}
</Typography.Text>
),
},
{
title: t('modelService.Status'),
render: (text, row) => {
const isExpired = dayjs.utc(row.validUntil).isBefore();
return (
<Tag color={isExpired ? 'red' : 'green'}>
{isExpired ? 'Expired' : 'Valid'}
</Tag>
);
},
},
{
key: 'validUntil',
title: t('deployment.ExpiredDate'),
dataIndex: 'validUntil',
render: (value) => dayjs(value).format('LLL'),
},
{
key: 'createdAt',
title: t('deployment.CreatedAt'),
dataIndex: 'createdAt',
render: (value) => dayjs(value).format('LLL'),
},
]);

return (
<>
<BAITable
resizable
columns={columns}
dataSource={filteredAccessTokens}
rowKey="id"
size="small"
/>
</>
);
};

export default AccessTokenList;
4 changes: 3 additions & 1 deletion react/src/components/DeploymentList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ const DeploymentList: React.FC<DeploymentListProps> = ({
dataIndex: ['revision', 'name'],
key: 'revisionName',
render: (name, row) => (
<WebUILink to={`/deployment/revision/${row.id}`}>{name}</WebUILink>
<WebUILink to={`/deployment/revision/${toLocalId(row.id)}`}>
{name}
</WebUILink>
),
defaultHidden: true,
},
Expand Down
223 changes: 223 additions & 0 deletions react/src/components/DeploymentRevisionList.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,223 @@
import ImageDetailNodeSimpleTag from './ImageDetailNodeSimpleTag';
import { MoreOutlined } from '@ant-design/icons';
import { Button, Dropdown, Tag, Typography } from 'antd';
import {
BAITable,
filterOutNullAndUndefined,
filterOutEmpty,
BAIColumnType,
convertToBinaryUnit,
BAIFlex,
toLocalId,
} from 'backend.ai-ui';
import dayjs from 'dayjs';
import _ from 'lodash';
import { useTranslation } from 'react-i18next';
import { graphql, useFragment } from 'react-relay';
import {
DeploymentRevisionListFragment$key,
DeploymentRevisionListFragment$data,
} from 'src/__generated__/DeploymentRevisionListFragment.graphql';
import { getAIAcceleratorWithStringifiedKey } from 'src/helper';
import { useBAISettingUserState } from 'src/hooks/useBAISetting';
import { ResourceNumbersOfSession } from 'src/pages/SessionLauncherPage';

export type RevisionInList = NonNullable<
NonNullable<DeploymentRevisionListFragment$data>[number]
>;

interface DeploymentRevisionListProps {
activeRevisionId: string;
revisionsFrgmt?: DeploymentRevisionListFragment$key;
onRevisionSelect?: (
revision: RevisionInList,
action: 'setActive' | 'createFrom',
) => void;
}

const DeploymentRevisionList: React.FC<DeploymentRevisionListProps> = ({
activeRevisionId,
revisionsFrgmt,
onRevisionSelect,
}) => {
const { t } = useTranslation();

const revisions = useFragment(
graphql`
fragment DeploymentRevisionListFragment on ModelRevision
@relay(plural: true) {
id
name
clusterConfig {
mode
size
}
resourceConfig {
resourceSlots
resourceOpts
}
modelRuntimeConfig {
runtimeVariant
}
image {
...ImageDetailNodeSimpleTagFragment
}
createdAt
}
`,
revisionsFrgmt,
);

const filteredRevisions = filterOutNullAndUndefined(revisions);

const columns = filterOutEmpty<BAIColumnType<RevisionInList>>([
{
key: 'name',
title: t('deployment.RevisionName'),
dataIndex: 'name',
render: (name, row) => (
<BAIFlex gap={'xs'}>
<Typography.Text>{name || '-'}</Typography.Text>
{row.id === activeRevisionId && (
<Tag color="blue">{t('deployment.ActiveRevision')}</Tag>
)}
</BAIFlex>
),
},
{
key: 'id',
title: t('deployment.RevisionID'),
dataIndex: 'id',
render: (id) => <Typography.Text>{toLocalId(id)}</Typography.Text>,
defaultHidden: true,
},
{
key: 'environments',
title: t('deployment.Environments'),
dataIndex: 'image',
render: (image) => (
<ImageDetailNodeSimpleTag imageFrgmt={image || null} />
),
},
{
key: 'runtimeVariant',
title: t('deployment.launcher.RuntimeVariant'),
dataIndex: ['modelRuntimeConfig', 'runtimeVariant'],
},
{
key: 'resource',
title: t('deployment.launcher.ResourceAllocation'),
dataIndex: ['resourceConfig', 'resourceSlots'],
render: (resourceSlots, row) => {
const resourceSlotsObj = JSON.parse(resourceSlots || '{}');
const processedResource = _.mapValues(
_.pick(resourceSlotsObj, ['cpu', 'mem']),
(value, key) =>
key === 'cpu'
? _.toInteger(value) || 0
: convertToBinaryUnit(value, 'g', 3, true)?.value || '0g',
);
const shmem = convertToBinaryUnit(
JSON.parse(row?.resourceConfig?.resourceOpts || '{}')?.shmem,
'g',
3,
true,
)?.value;
const acceleratorInfo = getAIAcceleratorWithStringifiedKey(
_.omit(resourceSlotsObj, ['cpu', 'mem']),
);
return (
<ResourceNumbersOfSession
resource={{
cpu: processedResource.cpu as number,
mem: processedResource.mem as string,
shmem: shmem || '0g',
accelerator: acceleratorInfo?.accelerator ?? 0,
acceleratorType: acceleratorInfo?.acceleratorType ?? '',
}}
containerCount={row.clusterConfig?.size || 1}
/>
);
},
},
// {
// key: 'clusterMode',
// title: t('deployment.launcher.ClusterMode'),
// dataIndex: 'clusterMode',
// render: (mode) => {
// return mode === 'single-node'
// ? t('deployment.launcher.SingleNode')
// : t('deployment.launcher.MultiNode');
// },
// },
{
key: 'createdAt',
title: t('deployment.CreatedAt'),
dataIndex: 'createdAt',
render: (value) => dayjs(value).format('YYYY-MM-DD HH:mm:ss'),
},
{
key: 'control',
width: 40,
fixed: 'right',
render: (value, row) => (
<BAIFlex gap={'xxs'}>
<Dropdown
menu={{
items: [
{
key: 'updateActiveRevision',
label: t('deployment.SetAsActiveRevision'),
disabled: row.id === activeRevisionId,
onClick: () => {
onRevisionSelect?.(row, 'setActive');
},
},
{
key: 'clone',
label: t('deployment.CreateRevisionFromSelected'),
onClick: () => {
onRevisionSelect?.(row, 'createFrom');
},
},
],
}}
trigger={['click']}
>
<Button
onClick={(e) => e.preventDefault()}
icon={<MoreOutlined />}
type="text"
/>
</Dropdown>
</BAIFlex>
),
},
]);

const [columnOverrides, setColumnOverrides] = useBAISettingUserState(
'table_column_overrides.DeploymentRevisionList',
);

return (
<>
<BAITable
resizable
columns={columns}
dataSource={filteredRevisions}
rowKey="id"
size="small"
tableSettings={{
columnOverrides: columnOverrides,
onColumnOverridesChange: setColumnOverrides,
}}
// Highlight active revision
// rowClassName={(record) =>
// record.id === activeRevisionId ? 'ant-table-row-selected' : ''
// }
/>
</>
);
};

export default DeploymentRevisionList;
Loading
Loading