adapted frontend accordingly (using new Job & LLMAssistant DTOs)

Author: bigabig

frontend/src/api/LLMHooks.ts

@@ -2,29 +2,29 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 import queryClient from "../plugins/ReactQueryClient.ts";
 import { QueryKey } from "./QueryKey.ts";
 import { ApproachType } from "./openapi/models/ApproachType.ts";
-import { BackgroundJobStatus } from "./openapi/models/BackgroundJobStatus.ts";
-import { LLMJobRead } from "./openapi/models/LLMJobRead.ts";
+import { JobStatus } from "./openapi/models/JobStatus.ts";
+import { LlmAssistantJobRead } from "./openapi/models/LlmAssistantJobRead.ts";
 import { TaskType } from "./openapi/models/TaskType.ts";
 import { LlmService } from "./openapi/services/LlmService.ts";
 
 const useStartLLMJob = () =>
   useMutation({
-    mutationFn: LlmService.startLlmJob,
+    mutationFn: LlmService.startLlmAssistantJob,
     onSuccess: (job) => {
       // force refetch of all llm jobs when adding a new one
-      queryClient.invalidateQueries({ queryKey: [QueryKey.PROJECT_LLM_JOBS, job.parameters.project_id] });
+      queryClient.invalidateQueries({ queryKey: [QueryKey.PROJECT_LLM_JOBS, job.project_id] });
     },
     meta: {
-      successMessage: (data: LLMJobRead) => `Started LLM Job as a new background task (ID: ${data.id})`,
+      successMessage: (data: LlmAssistantJobRead) => `Started LLM Job as a new background task (ID: ${data.job_id})`,
     },
   });
 
-const usePollLLMJob = (llmJobId: string | undefined, initialData: LLMJobRead | undefined) => {
-  return useQuery<LLMJobRead, Error>({
+const usePollLLMJob = (llmJobId: string | undefined, initialData: LlmAssistantJobRead | undefined) => {
+  return useQuery<LlmAssistantJobRead, Error>({
     queryKey: [QueryKey.LLM_JOB, llmJobId],
     queryFn: () =>
-      LlmService.getLlmJob({
-        llmJobId: llmJobId!,
+      LlmService.getLlmAssistantJobById({
+        jobId: llmJobId!,
       }),
     enabled: !!llmJobId,
     refetchInterval: (query) => {
@@ -33,11 +33,15 @@ const usePollLLMJob = (llmJobId: string | undefined, initialData: LLMJobRead | u
       }
       if (query.state.data.status) {
         switch (query.state.data.status) {
-          case BackgroundJobStatus.ERRORNEOUS:
-          case BackgroundJobStatus.FINISHED:
+          case JobStatus.CANCELED:
+          case JobStatus.FAILED:
+          case JobStatus.FINISHED:
+          case JobStatus.STOPPED:
             return false;
-          case BackgroundJobStatus.WAITING:
-          case BackgroundJobStatus.RUNNING:
+          case JobStatus.DEFERRED:
+          case JobStatus.QUEUED:
+          case JobStatus.SCHEDULED:
+          case JobStatus.STARTED:
             return 1000;
         }
       }
@@ -48,10 +52,10 @@ const usePollLLMJob = (llmJobId: string | undefined, initialData: LLMJobRead | u
 };
 
 const useGetAllLLMJobs = (projectId: number) => {
-  return useQuery<LLMJobRead[], Error>({
+  return useQuery<LlmAssistantJobRead[], Error>({
     queryKey: [QueryKey.PROJECT_LLM_JOBS, projectId],
     queryFn: () =>
-      LlmService.getAllLlmJobs({
+      LlmService.getLlmAssistantJobsByProject({
         projectId: projectId!,
       }),
     enabled: !!projectId,

frontend/src/api/openapi/models/DuplicateFinderJobRead.ts

@@ -26,6 +26,14 @@ export type DuplicateFinderJobRead = {
    * Status message
    */
   status_message?: string | null;
+  /**
+   * Current step in the job process
+   */
+  current_step: number;
+  /**
+   * Total number of steps in the job process
+   */
+  num_steps: number;
   /**
    * Input for the job
    */

…penapi/models/LLMJobParameters2_Input.ts …/api/openapi/models/LLMJobInput_Input.tsfrontend/src/api/openapi/models/LLMJobParameters2_Input.ts renamed to frontend/src/api/openapi/models/LLMJobInput_Input.ts frontend/src/api/openapi/models/LLMJobParameters2_Input.ts renamed to frontend/src/api/openapi/models/LLMJobInput_Input.ts

@@ -11,15 +11,15 @@ import type { SentenceAnnotationParams } from "./SentenceAnnotationParams";
 import type { TaggingParams } from "./TaggingParams";
 import type { TaskType } from "./TaskType";
 import type { ZeroShotParams } from "./ZeroShotParams";
-export type LLMJobParameters2_Input = {
+export type LLMJobInput_Input = {
   /**
-   * The type of the LLMJob (what to llm)
+   * Project ID associated with the job
    */
-  llm_job_type: TaskType;
+  project_id: number;
   /**
-   * The ID of the Project to analyse
+   * The type of the LLMJob (what to llm)
    */
-  project_id: number;
+  llm_job_type: TaskType;
   /**
    * Specific parameters for the LLMJob w.r.t it's type
    */

…enapi/models/LLMJobParameters2_Output.ts …api/openapi/models/LLMJobInput_Output.tsfrontend/src/api/openapi/models/LLMJobParameters2_Output.ts renamed to frontend/src/api/openapi/models/LLMJobInput_Output.ts frontend/src/api/openapi/models/LLMJobParameters2_Output.ts renamed to frontend/src/api/openapi/models/LLMJobInput_Output.ts

@@ -11,15 +11,15 @@ import type { SentenceAnnotationParams } from "./SentenceAnnotationParams";
 import type { TaggingParams } from "./TaggingParams";
 import type { TaskType } from "./TaskType";
 import type { ZeroShotParams } from "./ZeroShotParams";
-export type LLMJobParameters2_Output = {
+export type LLMJobInput_Output = {
   /**
-   * The type of the LLMJob (what to llm)
+   * Project ID associated with the job
    */
-  llm_job_type: TaskType;
+  project_id: number;
   /**
-   * The ID of the Project to analyse
+   * The type of the LLMJob (what to llm)
    */
-  project_id: number;
+  llm_job_type: TaskType;
   /**
    * Specific parameters for the LLMJob w.r.t it's type
    */

…d/src/api/openapi/models/LLMJobResult.ts …d/src/api/openapi/models/LLMJobOutput.tsfrontend/src/api/openapi/models/LLMJobResult.ts renamed to frontend/src/api/openapi/models/LLMJobOutput.ts frontend/src/api/openapi/models/LLMJobResult.ts renamed to frontend/src/api/openapi/models/LLMJobOutput.ts

@@ -7,7 +7,7 @@ import type { MetadataExtractionLLMJobResult } from "./MetadataExtractionLLMJobR
 import type { SentenceAnnotationLLMJobResult } from "./SentenceAnnotationLLMJobResult";
 import type { TaggingLLMJobResult } from "./TaggingLLMJobResult";
 import type { TaskType } from "./TaskType";
-export type LLMJobResult = {
+export type LLMJobOutput = {
   /**
    * The type of the LLMJob (what to llm)
    */

frontend/src/api/openapi/models/LLMJobParameters.ts

@@ -9,13 +9,13 @@ import type { TaggingParams } from "./TaggingParams";
 import type { TaskType } from "./TaskType";
 export type LLMJobParameters = {
   /**
-   * The type of the LLMJob (what to llm)
+   * Project ID associated with the job
    */
-  llm_job_type: TaskType;
+  project_id: number;
   /**
-   * The ID of the Project to analyse
+   * The type of the LLMJob (what to llm)
    */
-  project_id: number;
+  llm_job_type: TaskType;
   /**
    * Specific parameters for the LLMJob w.r.t it's type
    */

frontend/src/api/openapi/models/LLMJobRead.ts

@@ -0,0 +1,45 @@
+/* generated using openapi-typescript-codegen -- do not edit */
+/* istanbul ignore file */
+/* tslint:disable */
+/* eslint-disable */
+import type { JobStatus } from "./JobStatus";
+import type { LLMJobInput_Output } from "./LLMJobInput_Output";
+import type { LLMJobOutput } from "./LLMJobOutput";
+export type LlmAssistantJobRead = {
+  /**
+   * RQ job ID
+   */
+  job_id: string;
+  /**
+   * Type of the job
+   */
+  job_type: string;
+  /**
+   * Project ID associated with the job
+   */
+  project_id: number;
+  /**
+   * Current status of the job
+   */
+  status: JobStatus;
+  /**
+   * Status message
+   */
+  status_message?: string | null;
+  /**
+   * Current step in the job process
+   */
+  current_step: number;
+  /**
+   * Total number of steps in the job process
+   */
+  num_steps: number;
+  /**
+   * Input for the job
+   */
+  input: LLMJobInput_Output;
+  /**
+   * Output for the job
+   */
+  output?: LLMJobOutput | null;
+};