Skip to content

fix(FR-750): improve resource slot display in SessionSlotCell component #3438

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

Merged
graphite-app merged 1 commit into from
Apr 2, 2025
Merged

fix(FR-750): improve resource slot display in SessionSlotCell component #3438

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
17 changes: 12 additions & 5 deletions react/src/components/ComputeSessionNodeItems/SessionSlotCell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const SessionSlotCell: React.FC<OccupiedSlotViewProps> = ({
sessionFrgmt,
mode = 'requested',
}) => {
const { deviceMetadata } = useResourceSlotsDetails();
const { mergedResourceSlots } = useResourceSlotsDetails('');
const session = useFragment(
graphql`
fragment SessionSlotCellFragment on ComputeSessionNode {
Expand All @@ -38,18 +38,25 @@ const SessionSlotCell: React.FC<OccupiedSlotViewProps> = ({
return slots.cpu ?? '-';
} else if (type === 'mem') {
const mem = slots.mem ?? '-';
return mem === '-' ? mem : convertBinarySizeUnit(mem, 'G')?.number + ' GiB';
return mem === '-'
? mem
: convertBinarySizeUnit(mem, 'G', 3)?.numberFixed + ' GiB';
} else if (type === 'accelerator') {
const occupiedAccelerators = _.omit(slots, ['cpu', 'mem']);
return _.isEmpty(occupiedAccelerators)

const filteredAccelerators = _.omitBy(
occupiedAccelerators,
(value) => _.toNumber(value) <= 0 || _.isNaN(_.toNumber(value)),
);
return _.every(filteredAccelerators, (value) => value === 0)
? '-'
: _.map(occupiedAccelerators, (value, key) => {
: _.map(filteredAccelerators, (value, key) => {
return (
<Fragment key={key}>
<Typography.Text>{value}</Typography.Text>
<Divider type="vertical" />
<Typography.Text>
{deviceMetadata?.[key]?.human_readable_name}
{mergedResourceSlots?.[key]?.display_unit}
</Typography.Text>
</Fragment>
);
Expand Down
14 changes: 6 additions & 8 deletions react/src/hooks/backendai.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,18 @@ export const useResourceSlotsDetails = (resourceGroupName?: string) => {
}>({
queryKey: ['useResourceSlots', resourceGroupName, key],
queryFn: () => {
// return baiClient.get_resource_slots();
if (
!resourceGroupName ||
!baiClient.isManagerVersionCompatibleWith('23.09.0')
) {
return undefined;
if (!baiClient.isManagerVersionCompatibleWith('23.09.0')) {
return {};
} else {
// `/resource-slots/details` is available since 23.09
// https://github.com/lablup/backend.ai/issues/1589
const search = new URLSearchParams();
search.set('sgroup', resourceGroupName);
resourceGroupName && search.set('sgroup', resourceGroupName);
const searchParamString = search.toString();
return baiRequestWithPromise({
method: 'GET',
url: `/config/resource-slots/details?${search.toString()}`,
// if `sgroup` is not provided, it will return all resource slots of all resource groups
url: `/config/resource-slots/details${searchParamString ? '?' + search.toString() : ''}`,
});
}
},
Expand Down