From ed3b3ce7d560e82e44cd7c708a25fe32c03ced7e Mon Sep 17 00:00:00 2001 From: Yifan Mai Date: Wed, 25 Sep 2024 10:28:59 -0700 Subject: [PATCH 1/4] Fetch single run spec rather than all run specs on predictions page --- helm-frontend/src/routes/Run.tsx | 9 ++++----- helm-frontend/src/services/getRunSpecByName.ts | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/helm-frontend/src/routes/Run.tsx b/helm-frontend/src/routes/Run.tsx index 42cd1396bd3..b95b2602102 100644 --- a/helm-frontend/src/routes/Run.tsx +++ b/helm-frontend/src/routes/Run.tsx @@ -6,7 +6,6 @@ import { ArrowTopRightOnSquareIcon, } from "@heroicons/react/24/solid"; import getSchema from "@/services/getSchema"; -import getRunSpecs from "@/services/getRunSpecs"; import type RunSpec from "@/types/RunSpec"; import getInstances from "@/services/getInstances"; import type Instance from "@/types/Instance"; @@ -18,7 +17,7 @@ import getScenarioByName from "@/services/getScenarioByName"; import type Scenario from "@/types/Scenario"; import type AdapterFieldMap from "@/types/AdapterFieldMap"; import type MetricFieldMap from "@/types/MetricFieldMap"; -import { getRunSpecByNameUrl } from "@/services/getRunSpecByName"; +import getRunSpecByName, { getRunSpecByNameUrl } from "@/services/getRunSpecByName"; import { getScenarioStateByNameUrl } from "@/services/getScenarioStateByName"; import Tab from "@/components/Tab"; import Tabs from "@/components/Tabs"; @@ -75,7 +74,7 @@ export default function Run() { setRunSuite(suite); const [ - runSpecs, + runSpecResp, instancesResp, statsResp, scenario, @@ -83,7 +82,7 @@ export default function Run() { displayRequests, schema, ] = await Promise.all([ - getRunSpecs(signal), + getRunSpecByName(runName, signal, suite), getInstances(runName, signal, suite), getStatsByName(runName, signal, suite), getScenarioByName(runName, signal, suite), @@ -92,7 +91,7 @@ export default function Run() { getSchema(signal), ]); - setRunSpec(runSpecs.find((rs) => rs.name === runName)); + setRunSpec(runSpecResp); setInstances(instancesResp); const totalInstancesPages = Math.ceil( instancesResp.length / INSTANCES_PAGE_SIZE, diff --git a/helm-frontend/src/services/getRunSpecByName.ts b/helm-frontend/src/services/getRunSpecByName.ts index a1a9f3f97ce..cb1560d673a 100644 --- a/helm-frontend/src/services/getRunSpecByName.ts +++ b/helm-frontend/src/services/getRunSpecByName.ts @@ -10,9 +10,10 @@ export function getRunSpecByNameUrl(runName: string, suite?: string): string { export default async function getRunSpecByName( runName: string, signal: AbortSignal, + suite?: string, ): Promise { try { - const runSpec = await fetch(getRunSpecByNameUrl(runName), { signal }); + const runSpec = await fetch(getRunSpecByNameUrl(runName, suite), { signal }); return (await runSpec.json()) as RunSpec; } catch (error) { From c811c25dcf327e40dc149d9366b812615696e46b Mon Sep 17 00:00:00 2001 From: Yifan Mai Date: Wed, 25 Sep 2024 10:29:24 -0700 Subject: [PATCH 2/4] Lint --- helm-frontend/src/routes/Run.tsx | 4 +++- helm-frontend/src/services/getRunSpecByName.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/helm-frontend/src/routes/Run.tsx b/helm-frontend/src/routes/Run.tsx index b95b2602102..0ed04737818 100644 --- a/helm-frontend/src/routes/Run.tsx +++ b/helm-frontend/src/routes/Run.tsx @@ -17,7 +17,9 @@ import getScenarioByName from "@/services/getScenarioByName"; import type Scenario from "@/types/Scenario"; import type AdapterFieldMap from "@/types/AdapterFieldMap"; import type MetricFieldMap from "@/types/MetricFieldMap"; -import getRunSpecByName, { getRunSpecByNameUrl } from "@/services/getRunSpecByName"; +import getRunSpecByName, { + getRunSpecByNameUrl, +} from "@/services/getRunSpecByName"; import { getScenarioStateByNameUrl } from "@/services/getScenarioStateByName"; import Tab from "@/components/Tab"; import Tabs from "@/components/Tabs"; diff --git a/helm-frontend/src/services/getRunSpecByName.ts b/helm-frontend/src/services/getRunSpecByName.ts index cb1560d673a..c80a1fb8915 100644 --- a/helm-frontend/src/services/getRunSpecByName.ts +++ b/helm-frontend/src/services/getRunSpecByName.ts @@ -13,7 +13,9 @@ export default async function getRunSpecByName( suite?: string, ): Promise { try { - const runSpec = await fetch(getRunSpecByNameUrl(runName, suite), { signal }); + const runSpec = await fetch(getRunSpecByNameUrl(runName, suite), { + signal, + }); return (await runSpec.json()) as RunSpec; } catch (error) { From 93a93519d3c0ed4dc41073b262a7b582b8d154c4 Mon Sep 17 00:00:00 2001 From: Yifan Mai Date: Wed, 25 Sep 2024 10:30:59 -0700 Subject: [PATCH 3/4] Fix lint --- helm-frontend/src/routes/Run.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-frontend/src/routes/Run.tsx b/helm-frontend/src/routes/Run.tsx index 0ed04737818..ac6fb0fcc73 100644 --- a/helm-frontend/src/routes/Run.tsx +++ b/helm-frontend/src/routes/Run.tsx @@ -167,7 +167,7 @@ export default function Run() { schema.models.find( (m) => m.name === - runSpecs.find((rs) => rs.name === runName)?.adapter_spec.model, + runSpecResp?.adapter_spec.model, ), ); } From ad7b0fe17ca0abdc41b7778f4a7a0802211398a5 Mon Sep 17 00:00:00 2001 From: Yifan Mai Date: Wed, 25 Sep 2024 10:31:18 -0700 Subject: [PATCH 4/4] Lint again --- helm-frontend/src/routes/Run.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/helm-frontend/src/routes/Run.tsx b/helm-frontend/src/routes/Run.tsx index ac6fb0fcc73..b2c189b1c05 100644 --- a/helm-frontend/src/routes/Run.tsx +++ b/helm-frontend/src/routes/Run.tsx @@ -164,11 +164,7 @@ export default function Run() { ); setModel( - schema.models.find( - (m) => - m.name === - runSpecResp?.adapter_spec.model, - ), + schema.models.find((m) => m.name === runSpecResp?.adapter_spec.model), ); }