Skip to content
Closed
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
56 changes: 56 additions & 0 deletions frontend/src/pages/Runs/Details/Jobs/List/helpers.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
jest.mock('App/helpers', () => ({ getBaseUrl: () => '' }));
jest.mock('libs/fleet', () => ({ formatBackend: () => '-' }));

import { getRunListItemResources } from '../../../List/helpers';
import { getJobListItemResources } from './helpers';

const instanceResources: IResources = {
cpus: 4,
memory_mib: 16 * 1024,
gpus: [],
spot: false,
};

const blockResources: IResources = {
cpus: 1,
memory_mib: 4 * 1024,
gpus: [],
spot: false,
};

const submission: IJobSubmission = {
id: 'submission',
submission_num: 0,
status: 'running',
submitted_at: 0,
finished_at: null,
job_provisioning_data: {
backend: 'aws',
instance_type: { name: 't3.xlarge', resources: instanceResources },
instance_id: 'instance',
hostname: 'localhost',
region: 'us-east-1',
price: 0,
username: 'ubuntu',
ssh_port: 22,
dockerized: false,
},
job_runtime_data: {
offer: { instance: { name: 'block', resources: blockResources } },
},
};

const job = { job_spec: {}, job_submissions: [submission] } as IJob;

describe('job resource display', () => {
test('uses allocated block resources when runtime offer is available', () => {
expect(getJobListItemResources(job)).toBe('cpu=1 mem=4GB');
expect(getRunListItemResources({ jobs: [job], latest_job_submission: submission } as IRun)).toBe('cpu=1 mem=4GB');
});

test('falls back to instance resources for older submissions', () => {
const legacySubmission = { ...submission, job_runtime_data: null };
const legacyJob = { ...job, job_submissions: [legacySubmission] } as IJob;
expect(getJobListItemResources(legacyJob)).toBe('cpu=4 mem=16GB');
});
});
8 changes: 7 additions & 1 deletion frontend/src/pages/Runs/Details/Jobs/List/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,14 @@ import { capitalize } from 'libs';
import { formatBackend } from 'libs/fleet';
import { formatResources } from 'libs/resources';

export const getJobSubmissionResources = (submission?: IJobSubmission | null) => {
return (
submission?.job_runtime_data?.offer?.instance?.resources ?? submission?.job_provisioning_data?.instance_type?.resources
);
};

export const getJobListItemResources = (job: IJob) => {
const resources = job.job_submissions?.[job.job_submissions.length - 1]?.job_provisioning_data?.instance_type?.resources;
const resources = getJobSubmissionResources(job.job_submissions?.[job.job_submissions.length - 1]);
return resources ? formatResources(resources) : '-';
};

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/Runs/List/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { formatResources } from 'libs/resources';
import { getBaseUrl } from 'App/helpers';

import { finishedJobs, finishedRunStatuses } from '../constants';
import { getJobStatus } from '../Details/Jobs/List/helpers';
import { getJobStatus, getJobSubmissionResources } from '../Details/Jobs/List/helpers';

export const getGroupedRunsByProjectAndRepoID = (runs: IRun[]) => {
return _groupBy(runs, ({ project_name }) => project_name);
Expand All @@ -17,7 +17,7 @@ export const getRunListItemResources = (run: IRun) => {
return '-';
}

const resources = run.latest_job_submission?.job_provisioning_data?.instance_type?.resources;
const resources = getJobSubmissionResources(run.latest_job_submission);
return resources ? formatResources(resources) : '-';
};

Expand Down
3 changes: 3 additions & 0 deletions frontend/src/types/run.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,9 @@ declare interface IJobProvisioningData {
declare interface IJobRuntimeData {
working_dir?: string | null;
username?: string | null;
offer?: {
instance: InstanceType;
} | null;
}

declare interface IJobSubmission {
Expand Down