Added close ups in wheel analysis task

Author: dlymonkai

documentation/src/utils/schemas.ts

@@ -200,11 +200,18 @@ export const CreatePricingTaskOptionsSchema = z.object({
   methodology: z.string().optional(),
 });
 
+export const CreateWheelAnalysisTaskOptionsSchema = z.object({
+  name: z.literal(TaskName.WHEEL_ANALYSIS),
+  useLongShots: z.boolean(),
+  callbacks: z.array(TaskCallbackOptionsSchema).optional(),
+});
+
 export const InspectionCreateTaskSchema = z
   .nativeEnum(TaskName)
   .or(CreateDamageDetectionTaskOptionsSchema)
   .or(CreateHinlTaskOptionsSchema)
-  .or(CreatePricingTaskOptionsSchema);
+  .or(CreatePricingTaskOptionsSchema)
+  .or(CreateWheelAnalysisTaskOptionsSchema);
 
 export const AdditionalDataSchema = z.record(z.string(), z.unknown());
 

documentation/src/utils/schemas/createInspection.schema.ts

@@ -28,11 +28,18 @@ export const CreatePricingTaskOptionsSchema = z.object({
   methodology: z.string().optional(),
 });
 
+export const CreateWheelAnalysisTaskOptionsSchema = z.object({
+  name: z.literal(TaskName.WHEEL_ANALYSIS),
+  useLongShots: z.boolean(),
+  callbacks: z.array(TaskCallbackOptionsSchema).optional(),
+});
+
 export const InspectionCreateTaskSchema = z
   .nativeEnum(TaskName)
   .or(CreateDamageDetectionTaskOptionsSchema)
   .or(CreateHinlTaskOptionsSchema)
-  .or(CreatePricingTaskOptionsSchema);
+  .or(CreatePricingTaskOptionsSchema)
+  .or(CreateWheelAnalysisTaskOptionsSchema);
 
 export const AdditionalDataSchema = z.record(z.string(), z.unknown());
 

packages/inspection-capture-web/src/hooks/useUploadQueue.ts

@@ -1,4 +1,4 @@
-import { Queue, uniq, useQueue } from '@monkvision/common';
+import { Queue, uniq, useMonkState, useQueue } from '@monkvision/common';
 import { AddImageOptions, ImageUploadType, MonkApiConfig, useMonkApi } from '@monkvision/network';
 import {
   PhotoCaptureAppConfig,
@@ -133,6 +133,7 @@ function createAddImageOptions(
   enableThumbnail: boolean,
   additionalTasks?: PhotoCaptureAppConfig['additionalTasks'],
   compliance?: ComplianceOptions,
+  wheelAnalysisCloseUp?: boolean,
 ): AddImageOptions {
   if (upload.mode === CaptureMode.SIGHT) {
     return {
@@ -143,6 +144,7 @@ function createAddImageOptions(
       inspectionId,
       compliance,
       useThumbnailCaching: enableThumbnail,
+      wheelAnalysisCloseUp,
     };
   }
   if (upload.mode === CaptureMode.ADD_DAMAGE_PART_SELECT_SHOT) {
@@ -179,6 +181,11 @@ export function useUploadQueue({
   const { handleError } = useMonitoring();
   const siblingIdRef = useRef(0);
   const { addImage } = useMonkApi(apiConfig);
+  const { state } = useMonkState();
+
+  const wheelAnalysisCloseUp = state.tasks.find(
+    (task) => task.name === TaskName.WHEEL_ANALYSIS && task.wheelAnalysisCloseUp,
+  )?.wheelAnalysisCloseUp;
 
   return useQueue<PictureUpload>(async (upload: PictureUpload) => {
     if (upload.mode === CaptureMode.ADD_DAMAGE_1ST_SHOT) {
@@ -194,6 +201,7 @@ export function useUploadQueue({
           true,
           additionalTasks,
           complianceOptions,
+          wheelAnalysisCloseUp,
         ),
       );
       const uploadDurationMs = Date.now() - startTs;

packages/network/src/api/image/requests.ts

@@ -86,6 +86,8 @@ export interface AddBeautyShotImageOptions {
    * Additional options used to configure the compliance locally.
    */
   compliance?: ComplianceOptions;
+
+  wheelAnalysisCloseUp?: boolean;
 }
 
 /**
@@ -291,6 +293,7 @@ function createBeautyShotImageData(
         TaskName.IMAGES_OCR,
         TaskName.ODOMETER,
         TaskName.WARNING_LIGHTS,
+        TaskName.WHEEL_ANALYSIS,
       ].includes(task),
   ) as ApiImagePostTask[];
   tasks.push({
@@ -323,6 +326,25 @@ function createBeautyShotImageData(
       wait_for_result: true,
     });
   }
+  if (options.tasks.includes(TaskName.WHEEL_ANALYSIS)) {
+    const sightName = sights[options.sightId].wheelName;
+    if (options.wheelAnalysisCloseUp && !sightName) {
+      throw new Error('Wheel analysis task close-up requires a sight name.');
+    }
+    if (!options.wheelAnalysisCloseUp && sightName) {
+      throw new Error(
+        "Wheel analysis task long shoot can't be run on sight that contains sightName.",
+      );
+    }
+    if (options.wheelAnalysisCloseUp && sightName) {
+      tasks.push({
+        name: TaskName.WHEEL_ANALYSIS,
+        image_details: { wheel_name: sightName },
+      });
+    } else {
+      tasks.push(TaskName.WHEEL_ANALYSIS);
+    }
+  }
 
   const body: ApiImagePost = {
     acquisition: {

packages/network/src/api/inspection/mappers.ts

@@ -5,6 +5,7 @@ import {
   CreateHinlTaskOptions,
   CreateInspectionOptions,
   CreatePricingTaskOptions,
+  CreateWheelAnalysisTaskOptions,
   CurrencyCode,
   CustomSeverityValue,
   Damage,
@@ -326,6 +327,11 @@ function mapTasks(response: ApiInspectionGet): { tasks: Task[]; taskIds: string[
       name: task.name as TaskName,
       status: task.status as ProgressStatus,
       images: task.images?.map((image) => image.image_id) ?? [],
+      ...(task.arguments?.['use_longshots'] !== undefined
+        ? {
+            wheelAnalysisCloseUp: !task.arguments['use_longshots'] as boolean,
+          }
+        : {}),
     });
   });
 
@@ -563,10 +569,20 @@ function getDamageDetectionOptions(
 function getWheelAnalysisOptions(
   options: CreateInspectionOptions,
 ): ApiWheelAnalysisTaskPostComponent | undefined {
-  return options.tasks.includes(TaskName.WHEEL_ANALYSIS)
+  if (options.tasks.includes(TaskName.WHEEL_ANALYSIS)) {
+    return {
+      status: ProgressStatus.NOT_STARTED,
+      use_longshots: true,
+    };
+  }
+  const taskOptions = options.tasks.find(
+    (task) => typeof task === 'object' && task.name === TaskName.WHEEL_ANALYSIS,
+  ) as CreateWheelAnalysisTaskOptions | undefined;
+  return taskOptions
     ? {
         status: ProgressStatus.NOT_STARTED,
-        use_longshots: true,
+        use_longshots: taskOptions.useLongShots,
+        callbacks: taskOptions.callbacks,
       }
     : undefined;
 }

packages/network/src/api/models/image.ts

@@ -10,6 +10,7 @@ import {
   ApiImagesOCRTaskPost,
   ApiImagesOdometerTaskPost,
   ApiImagesWarningLightsTaskPost,
+  ApiImagesWheelAnalysisTaskPost,
 } from './task';
 
 export type ApiImageType = 'unknown' | 'beauty_shot' | 'close_up';
@@ -111,7 +112,8 @@ export type ApiImagePostTask =
   | ApiHinlTaskPost
   | ApiImagesOCRTaskPost
   | ApiImagesOdometerTaskPost
-  | ApiImagesWarningLightsTaskPost;
+  | ApiImagesWarningLightsTaskPost
+  | ApiImagesWheelAnalysisTaskPost;
 
 export interface ApiImagePost {
   acquisition: ApiAcquisition;

packages/network/src/api/models/task.ts

@@ -1,4 +1,5 @@
 import { ApiPricingMethodology } from './pricingV2';
+import { ApiWheelType } from './wheelAnalysis';
 
 export interface ApiImageInTask {
   image_id: string;
@@ -57,6 +58,15 @@ export interface ApiImagesWarningLightsTaskPost {
   wait_for_result?: boolean;
 }
 
+export interface ApiWheelAnalysisImageDetails {
+  wheel_name: ApiWheelType;
+}
+
+export interface ApiImagesWheelAnalysisTaskPost {
+  name: 'wheel_analysis';
+  image_details: ApiWheelAnalysisImageDetails;
+}
+
 export type ApiTaskProgressStatus =
   | 'NOT_STARTED'
   | 'TODO'
@@ -71,6 +81,7 @@ export interface ApiTaskGet {
   images: ApiImageInTask[];
   name: ApiBusinessTaskName;
   status: ApiTaskProgressStatus;
+  arguments?: Record<string, unknown>;
 }
 
 export type ApiTasks = ApiTaskGet[];

packages/network/test/api/image/requests.test.ts

@@ -306,6 +306,7 @@ describe('Image requests', () => {
                 TaskName.IMAGES_OCR,
                 TaskName.ODOMETER,
                 TaskName.WARNING_LIGHTS,
+                TaskName.WHEEL_ANALYSIS,
               ].includes(task),
           ),
           {
@@ -328,6 +329,7 @@ describe('Image requests', () => {
             name: TaskName.WARNING_LIGHTS,
             wait_for_result: true,
           },
+          TaskName.WHEEL_ANALYSIS,
         ],
         additional_data: {
           sight_id: options.sightId,

packages/network/test/api/inspection/data/apiInspectionGet.data.ts

@@ -946,6 +946,7 @@ export default {
       name: 'wheel_analysis',
       status: 'DONE',
       images: ['6a5e9a4c-8752-c1e6-6a34-38338074eda1'],
+      wheelAnalysisCloseUp: false,
     },
   ],
   vehicles: [

packages/sights/research/data/fesc20/fesc20.json

@@ -70,6 +70,7 @@
     "vehicle": "fesc20",
     "mirror_sight": "fesc20-raHPDUNm",
     "dev": true,
+    "wheel_name": "wheel_back_left",
     "tasks": ["wheel_analysis"]
   },
   "fesc20-5Ts1UkPT": {
@@ -96,6 +97,7 @@
     "vehicle": "fesc20",
     "mirror_sight": "fesc20-Tlu3sz8A",
     "dev": true,
+    "wheel_name": "wheel_back_right",
     "tasks": ["wheel_analysis"]
   },
   "fesc20-6GPUkfYn": {
@@ -335,6 +337,7 @@
     "vehicle": "fesc20",
     "mirror_sight": "fesc20-W6XrryMO",
     "dev": true,
+    "wheel_name": "wheel_front_left",
     "tasks": ["wheel_analysis"]
   },
   "fesc20-WMUaKDp1": {
@@ -419,6 +422,7 @@
     "vehicle": "fesc20",
     "mirror_sight": "fesc20-YPcJPAZE",
     "dev": true,
+    "wheel_name": "wheel_front_right",
     "tasks": ["wheel_analysis"]
   },
   "fesc20-dfICsfSV": {