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.

Sign up for GitHub

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

Jump to bottom

feat: Session usage monitor in react #2814

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Session usage monitor in react #2814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion react/src/components/SessionDetailContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import SessionStatusTag from './ComputeSessionNodeItems/SessionStatusTag';
import SessionTypeTag from './ComputeSessionNodeItems/SessionTypeTag';
import Flex from './Flex';
import ImageMetaIcon from './ImageMetaIcon';
import SessionUsageMonitor from './SessionUsageMonitor';
import { SessionDetailContentQuery } from './__generated__/SessionDetailContentQuery.graphql';
import {
Alert,
Expand Down Expand Up @@ -80,6 +81,7 @@ const SessionDetailContent: React.FC<{
# fix: This fragment is not used in this component, but it is required by the SessionActionButtonsFragment.
# It might be a bug in relay
...ContainerLogModalFragment
...SessionUsageMonitorFragment
}
legacy_session: compute_session(id: $uuid) {
image
Expand Down Expand Up @@ -178,11 +180,14 @@ const SessionDetailContent: React.FC<{
<Descriptions.Item label={t('session.Agent')}>
{session.agent_ids || '-'}
</Descriptions.Item>
<Descriptions.Item label={t('session.Reservation')}>
<Descriptions.Item label={t('session.Reservation')} span={md ? 2 : 1}>
<Flex gap={'xs'} wrap={'wrap'}>
<SessionReservation sessionFrgmt={session} />
</Flex>
</Descriptions.Item>
<Descriptions.Item label={'Resource Usage'} span={md ? 2 : 1}>
<SessionUsageMonitor sessionFrgmt={session} col={md ? 2 : 1} />
</Descriptions.Item>
</Descriptions>
</Flex>
) : (
Expand Down
232 changes: 232 additions & 0 deletions react/src/components/SessionUsageMonitor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
import {
convertBinarySizeUnit,
convertDecimalSizeUnit,
toFixedFloorWithoutTrailingZeros,
} from '../helper';
import { knownAcceleratorResourceSlotNames } from '../hooks/backendai';
import Flex from './Flex';
import { ResourceTypeIcon } from './ResourceNumber';
import { SessionUsageMonitorFragment$key } from './__generated__/SessionUsageMonitorFragment.graphql';
import { Col, Progress, ProgressProps, Row, Typography, theme } from 'antd';
import { createStyles } from 'antd-style';
import graphql from 'babel-plugin-relay/macro';
import _ from 'lodash';
import { useMemo } from 'react';
import { useFragment } from 'react-relay';

const useStyles = createStyles(({ css, token }) => ({
progress: css`
.ant-progress-text {
font-size: ${token.fontSizeSM} !important;
}
.ant-progress-inner {
}
.ant-typography {
color: ${token.colorTextSecondary} !important;
font-size: ${token.fontSizeSM}px !important;
}
`,
}));

interface SessionUsageMonitorProps extends ProgressProps {
sessionFrgmt: SessionUsageMonitorFragment$key | null;
col?: 1 | 2 | 3 | 4;
size?: ProgressProps['size'];
}

const gridColSpanMap = {
1: 24,
2: 12,
3: 8,
4: 6,
};

const SessionUsageMonitor: React.FC<SessionUsageMonitorProps> = ({
sessionFrgmt,
col = 1,
size = 'default',
}) => {
const { token } = theme.useToken();
const { styles } = useStyles();

const kernel_nodes = useFragment(
graphql`
fragment SessionUsageMonitorFragment on ComputeSessionNode {
kernel_nodes {
edges {
node {
live_stat
}
}
}
}
`,
sessionFrgmt,
);

const liveStat = JSON.parse(
_.get(kernel_nodes, 'kernel_nodes.edges[0].node.live_stat') ?? '{}',
);
// to display util first, mem second
const sortedLiveStat = useMemo(
() =>
Object.keys(liveStat)
.sort((a, b) => {
const aUtil = a.includes('_util');
const bUtil = b.includes('_util');
const aMem = a.includes('_mem');
const bMem = b.includes('_mem');

if (aUtil && !bUtil) return -1;
if (!aUtil && bUtil) return 1;
if (aMem && !bMem) return -1;
if (!aMem && bMem) return 1;

return 0;
})
.reduce((acc: { [key: string]: any }, key) => {
acc[key] = liveStat[key];
return acc;
}, {}),
[liveStat],
);

const mapDeviceToResourceSlotName = (device: string) => {
const deviceName = device.split('_')[0];
const resourceSlotName = _.find(
knownAcceleratorResourceSlotNames,
(name) => {
return _.includes(name, deviceName);
},
);
return resourceSlotName;
};

return (
<>
<Row className={styles.progress} gutter={token.marginXL}>
{sortedLiveStat?.cpu_util ? (
<Col
span={_.get(gridColSpanMap, col)}
style={{ marginBottom: token.marginXS }}
>
<Flex direction="column" align="end">
<Flex
align="start"
gap={token.marginSM}
style={{ width: '100%' }}
>
<ResourceTypeIcon type={'cpu'} showTooltip={true} />
<Progress
showInfo
status="normal"
percent={_.toNumber(
toFixedFloorWithoutTrailingZeros(
liveStat?.cpu_util?.pct || 0,
1,
),
)}
strokeLinecap="butt"
size={size === 'default' ? { height: token.sizeMD } : size}
strokeColor={token.colorPrimary}
></Progress>
</Flex>
{size === 'small' ? (
<Typography.Text>
{`${liveStat?.cpu_util?.pct} %`}
</Typography.Text>
) : null}
</Flex>
</Col>
) : null}
{sortedLiveStat?.mem ? (
<Col
span={_.get(gridColSpanMap, col)}
style={{ marginBottom: token.marginXS }}
>
<Flex direction="column" align="end">
<Flex
align="start"
gap={token.marginSM}
style={{ width: '100%' }}
>
<ResourceTypeIcon type={'mem'} showTooltip={true} />
<Progress
showInfo
status="normal"
percent={_.toNumber(
toFixedFloorWithoutTrailingZeros(
sortedLiveStat?.mem?.pct || 0,
1,
),
)}
strokeLinecap="butt"
size={{ height: 20 }}
ironAiken2 marked this conversation as resolved.
Show resolved Hide resolved
strokeColor={token.colorPrimary}
></Progress>
</Flex>
<Typography.Text>
{`(mem) ${
convertBinarySizeUnit(sortedLiveStat?.mem?.current, 'g')
?.numberUnit
}iB
/
${
convertBinarySizeUnit(sortedLiveStat?.mem?.capacity, 'g')
?.numberUnit
}iB`}
</Typography.Text>
</Flex>
</Col>
) : null}
{_.map(_.omit(sortedLiveStat, 'cpu_util', 'mem'), (value, key) => {
const resourceSlotName = mapDeviceToResourceSlotName(key);
return resourceSlotName ? (
<Col
span={_.get(gridColSpanMap, col)}
style={{ marginBottom: token.marginXS }}
>
<Flex direction="column" align="end">
<Flex
align="start"
gap={token.marginSM}
style={{ width: '100%' }}
>
<ResourceTypeIcon
type={resourceSlotName}
showTooltip={true}
/>
<Progress
showInfo
status="normal"
percent={_.toNumber(
toFixedFloorWithoutTrailingZeros(
sortedLiveStat?.[key]?.pct || 0,
1,
),
)}
strokeLinecap="butt"
size={{ height: token.sizeMD }}
strokeColor={token.colorPrimary}
></Progress>
</Flex>
<Typography.Text>
{_.includes(key, 'mem') &&
`${key.split('_')[0]} (mem) ${convertBinarySizeUnit(sortedLiveStat?.[key]?.current, 'g')?.numberUnit}iB /
${convertBinarySizeUnit(sortedLiveStat?.[key]?.capacity, 'g')?.numberUnit}iB`}
</Typography.Text>
</Flex>
</Col>
) : null;
})}
</Row>
<Flex justify="end" style={{ width: '100%' }}>
<Typography.Text>
{`I/O Read: ${convertDecimalSizeUnit(sortedLiveStat?.io_read?.current, 'm')?.numberUnit ?? '-'}B / Write: ${convertDecimalSizeUnit(sortedLiveStat?.io_write?.current, 'm')?.numberUnit ?? '-'}B`}
</Typography.Text>
</Flex>
</>
);
};

export default SessionUsageMonitor;
Loading