Updated old job routes

Author: aahaanmaini

src/renderer/components/Experiment/Eval/EvalJobsTable.tsx

@@ -216,7 +216,10 @@ const EvalJobsTable = () => {
 
   const fetchCSV = async (jobId) => {
     const response = await fetch(
-      chatAPI.Endpoints.Experiment.GetAdditionalDetails(jobId),
+      chatAPI.Endpoints.Experiment.GetAdditionalDetails(
+        experimentInfo.id,
+        jobId,
+      ),
     );
     const text = await response.text();
     return text;

src/renderer/components/Experiment/Eval/ViewCSVModal.tsx

@@ -11,6 +11,7 @@ import {
 } from '@mui/joy';
 
 import * as chatAPI from 'renderer/lib/transformerlab-api-sdk';
+import { useExperimentInfo } from 'renderer/lib/ExperimentInfoContext';
 
 function formatColumnNames(name) {
   return name
@@ -215,6 +216,7 @@ const ViewCSVModal = ({
   fetchCSV,
   compareData = null,
 }) => {
+  const { experimentInfo } = useExperimentInfo();
   const [report, setReport] = useState({});
 
   useEffect(() => {
@@ -240,7 +242,11 @@ const ViewCSVModal = ({
   const handleDownload = async () => {
     if (!compareData) {
       const response = await fetch(
-        chatAPI.Endpoints.Experiment.GetAdditionalDetails(jobId, 'download'),
+        chatAPI.Endpoints.Experiment.GetAdditionalDetails(
+          experimentInfo.id,
+          jobId,
+          'download',
+        ),
       );
       const blob = await response.blob();
       const url = URL.createObjectURL(blob);

src/renderer/components/Experiment/Eval/ViewOutputModalStreaming.tsx

@@ -32,10 +32,12 @@ export default function ViewOutputModalStreaming({
   const logEndpoint =
     fileName !== ''
       ? chatAPI.Endpoints.Experiment.StreamDetailedJSONReportFromJob(
+          experimentInfo.id,
           jobId,
           fileName,
         )
       : chatAPI.Endpoints.Experiment.StreamOutputFromJob(
+          experimentInfo.id,
           jobId,
         );
   const title_sentence =
@@ -44,6 +46,7 @@ export default function ViewOutputModalStreaming({
   const handleDownload = async () => {
     const response = await fetch(
       chatAPI.Endpoints.Experiment.GetAdditionalDetails(
+        experimentInfo.id,
         jobId,
         'download',
       ),

src/renderer/components/Experiment/Export/ViewOutputModalStreaming.tsx

@@ -41,8 +41,10 @@ export default function ViewOutputModalStreaming({
   );
 
   // // Create a custom endpoint for export job output
-  const outputEndpoint =
-    chatAPI.Endpoints.Experiment.StreamOutputFromJob(jobId);
+  const outputEndpoint = chatAPI.Endpoints.Experiment.StreamOutputFromJob(
+    experimentInfo.id,
+    jobId,
+  );
 
   return (
     <Modal open={jobId !== -1} onClose={() => setJobId(-1)}>

src/renderer/components/Experiment/Generate/GenerateJobsTable.tsx

@@ -112,7 +112,10 @@ const GenerateJobsTable = () => {
 
   const fetchGenerateCSV = async (jobId) => {
     const response = await fetch(
-      chatAPI.Endpoints.Experiment.GetGeneratedDataset(jobId),
+      chatAPI.Endpoints.Experiment.GetGeneratedDataset(
+        experimentInfo.id,
+        jobId,
+      ),
     );
     const text = await response.text();
     return text;

src/renderer/components/Experiment/Generate/ViewOutputModalStreaming.tsx

@@ -27,6 +27,7 @@ export default function ViewOutputModalStreaming({ jobId, setJobId }) {
         >
           <OutputTerminal
             logEndpoint={chatAPI.Endpoints.Experiment.StreamOutputFromJob(
+              experimentInfo.id,
               jobId,
             )}
             lineAnimationDelay={5}

src/renderer/components/Experiment/Train/ViewOutputModal.tsx

@@ -11,7 +11,9 @@ const fetcher = (url) => fetch(url).then((res) => res.json());
 export default function ViewOutputModal({ jobId, setJobId }) {
   const { experimentInfo } = useExperimentInfo();
   const { data, error, isLoading, isValidating, mutate } = useSWR(
-    jobId == -1 ? null : chatAPI.Endpoints.Experiment.GetOutputFromJob(jobId),
+    jobId == -1
+      ? null
+      : chatAPI.Endpoints.Experiment.GetOutputFromJob(experimentInfo.id, jobId),
     fetcher,
     {
       refreshInterval: 5000, //refresh every 5 seconds

src/renderer/components/Experiment/Train/ViewOutputModalStreaming.tsx

@@ -139,6 +139,7 @@ export default function ViewOutputModalStreaming({
             >
               <OutputTerminal
                 logEndpoint={chatAPI.Endpoints.Experiment.StreamOutputFromJob(
+                  experimentInfo.id,
                   jobId,
                   sweeps,
                 )}

src/renderer/components/Experiment/Workflows/WorkflowRuns/JobDetails.tsx

@@ -129,6 +129,7 @@ export default function JobDetails({ experimentId, jobId, onClose }) {
             >
               <OutputTerminal
                 logEndpoint={chatAPI.Endpoints.Experiment.StreamOutputFromJob(
+                  experimentId,
                   jobId,
                 )}
                 lineAnimationDelay={1}

src/renderer/lib/api-client/endpoints.ts

@@ -390,16 +390,30 @@ Endpoints.Experiment = {
     `${API_URL()}experiment/${experimentId}/plugins/new_plugin?pluginId=${
       pluginId
     }`,
-  GetOutputFromJob: (jobId: string) => `${API_URL()}jobs/${jobId}/output`,
-  StreamOutputFromJob: (jobId: string, sweep: boolean = false) =>
-    `${API_URL()}jobs/${jobId}/stream_output?sweeps=${sweep}`,
-  StreamDetailedJSONReportFromJob: (jobId: string, fileName: string) =>
-    `${API_URL()}jobs/${jobId}/stream_detailed_json_report?file_name=${fileName}`,
-  GetAdditionalDetails: (jobId: string, task: string = 'view') =>
-    `${API_URL()}jobs/${jobId}/get_additional_details?task=${task}`,
-  GetGeneratedDataset: (jobId: string) =>
-    `${API_URL()}jobs/${jobId}/get_generated_dataset`,
-  GetPlotJSON: (jobId: string) => `${API_URL()}jobs/${jobId}/get_figure_json`,
+  GetOutputFromJob: (experimentId: string, jobId: string) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/output`,
+  StreamOutputFromJob: (
+    experimentId: string,
+    jobId: string,
+    sweep: boolean = false,
+  ) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/stream_output?sweeps=${sweep}`,
+  StreamDetailedJSONReportFromJob: (
+    experimentId: string,
+    jobId: string,
+    fileName: string,
+  ) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/stream_detailed_json_report?file_name=${fileName}`,
+  GetAdditionalDetails: (
+    experimentId: string,
+    jobId: string,
+    task: string = 'view',
+  ) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/get_additional_details?task=${task}`,
+  GetGeneratedDataset: (experimentId: string, jobId: string) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/get_generated_dataset`,
+  GetPlotJSON: (experimentId: string, jobId: string) =>
+    `${API_URL()}experiment/${experimentId}/jobs/${jobId}/get_figure_json`,
 };
 
 Endpoints.Jobs = {