@monkvision/network 5.0.8 → 5.0.9

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@monkvision/network",
-    "version": "5.0.7",
+    "version": "5.0.8",
     "license": "BSD-3-Clause-Clear",
     "packageManager": "yarn@3.2.4",
     "description": "MonkJs core package used to communicate with the API",
@@ -28,8 +28,8 @@
         "lint:fix": "yarn run prettier:fix && yarn run eslint:fix"
     },
     "dependencies": {
-        "@monkvision/common": "5.0.7",
-        "@monkvision/sights": "5.0.7",
+        "@monkvision/common": "5.0.8",
+        "@monkvision/sights": "5.0.8",
         "jsonwebtoken": "^9.0.2",
         "jwt-decode": "^4.0.0",
         "ky": "^1.2.0",
@@ -42,12 +42,12 @@
         "react-router-dom": "^6.22.3"
     },
     "devDependencies": {
-        "@monkvision/eslint-config-base": "5.0.7",
-        "@monkvision/eslint-config-typescript": "5.0.7",
-        "@monkvision/jest-config": "5.0.7",
-        "@monkvision/prettier-config": "5.0.7",
-        "@monkvision/types": "5.0.7",
-        "@monkvision/typescript-config": "5.0.7",
+        "@monkvision/eslint-config-base": "5.0.8",
+        "@monkvision/eslint-config-typescript": "5.0.8",
+        "@monkvision/jest-config": "5.0.8",
+        "@monkvision/prettier-config": "5.0.8",
+        "@monkvision/types": "5.0.8",
+        "@monkvision/typescript-config": "5.0.8",
         "@types/jest": "^29.2.2",
         "@types/jsonwebtoken": "^9.0.5",
         "@types/node": "^18.11.9",

package/lib/src/api/image/requests.d.ts

@@ -63,6 +63,7 @@ export interface AddBeautyShotImageOptions {
      * Additional options used to configure the compliance locally.
      */
     compliance?: ComplianceOptions;
+    wheelAnalysisCloseUp?: boolean;
 }
 /**
  * Options specififed when adding a close up (an "add damage" image) to an inspection using the 2-shot process.

package/lib/src/api/image/requests.js

@@ -154,6 +154,7 @@ function createBeautyShotImageData(options, filetype) {
             types_1.TaskName.IMAGES_OCR,
             types_1.TaskName.ODOMETER,
             types_1.TaskName.WARNING_LIGHTS,
+            types_1.TaskName.WHEEL_ANALYSIS,
         ].includes(task);
     });
     tasks.push({
@@ -185,6 +186,21 @@ function createBeautyShotImageData(options, filetype) {
             wait_for_result: true,
         });
     }
+    if (options.tasks.includes(types_1.TaskName.WHEEL_ANALYSIS)) {
+        var sightName = sights_1.sights[options.sightId].wheelName;
+        if (options.wheelAnalysisCloseUp && !sightName) {
+            throw new Error('Wheel analysis task close-up requires a sight name.');
+        }
+        if (sightName) {
+            tasks.push({
+                name: types_1.TaskName.WHEEL_ANALYSIS,
+                image_details: { wheel_name: sightName },
+            });
+        }
+        else {
+            tasks.push(types_1.TaskName.WHEEL_ANALYSIS);
+        }
+    }
     var body = {
         acquisition: {
             strategy: 'upload_multipart_form_keys',

package/lib/src/api/inspection/mappers.js

@@ -220,16 +220,13 @@ function mapTasks(response) {
     var tasks = [];
     var taskIds = [];
     (_a = response.tasks) === null || _a === void 0 ? void 0 : _a.forEach(function (task) {
-        var _a, _b;
+        var _a, _b, _c;
         taskIds.push(task.id);
-        tasks.push({
-            id: task.id,
-            entityType: types_1.MonkEntityType.TASK,
-            inspectionId: response.id,
-            name: task.name,
-            status: task.status,
-            images: (_b = (_a = task.images) === null || _a === void 0 ? void 0 : _a.map(function (image) { return image.image_id; })) !== null && _b !== void 0 ? _b : [],
-        });
+        tasks.push(__assign({ id: task.id, entityType: types_1.MonkEntityType.TASK, inspectionId: response.id, name: task.name, status: task.status, images: (_b = (_a = task.images) === null || _a === void 0 ? void 0 : _a.map(function (image) { return image.image_id; })) !== null && _b !== void 0 ? _b : [] }, (((_c = task.arguments) === null || _c === void 0 ? void 0 : _c['use_longshots']) !== undefined
+            ? {
+                wheelAnalysisCloseUp: !task.arguments['use_longshots'],
+            }
+            : {})));
     });
     return { taskIds: taskIds, tasks: tasks };
 }
@@ -416,10 +413,18 @@ function getDamageDetectionOptions(options) {
         : undefined;
 }
 function getWheelAnalysisOptions(options) {
-    return options.tasks.includes(types_1.TaskName.WHEEL_ANALYSIS)
-        ? {
+    if (options.tasks.includes(types_1.TaskName.WHEEL_ANALYSIS)) {
+        return {
             status: types_1.ProgressStatus.NOT_STARTED,
             use_longshots: true,
+        };
+    }
+    var taskOptions = options.tasks.find(function (task) { return typeof task === 'object' && task.name === types_1.TaskName.WHEEL_ANALYSIS; });
+    return taskOptions
+        ? {
+            status: types_1.ProgressStatus.NOT_STARTED,
+            use_longshots: taskOptions.useLongShots,
+            callbacks: taskOptions.callbacks,
         }
         : undefined;
 }

package/lib/src/api/models/image.d.ts

@@ -3,7 +3,7 @@ import type { ApiAdditionalData, ApiCenterOnElement, ApiLabelPrediction } from '
 import type { ApiRenderedOutputs } from './renderedOutput';
 import type { ApiImageComplianceResults } from './compliance';
 import type { ApiViews } from './view';
-import { ApiBusinessTaskName, ApiHinlTaskPost, ApiImageCompliancesTaskPost, ApiImagesOCRTaskPost, ApiImagesOdometerTaskPost, ApiImagesWarningLightsTaskPost } from './task';
+import { ApiBusinessTaskName, ApiHinlTaskPost, ApiImageCompliancesTaskPost, ApiImagesOCRTaskPost, ApiImagesOdometerTaskPost, ApiImagesWarningLightsTaskPost, ApiImagesWheelAnalysisTaskPost } from './task';
 export type ApiImageType = 'unknown' | 'beauty_shot' | 'close_up';
 export type ApiImageSubType = 'close_up_part' | 'close_up_damage';
 export interface ApiRelatedImage {
@@ -77,7 +77,7 @@ export interface ApiCompliance {
     coverage_360?: ApiCoverage360Parameters;
     zoom_level?: ApiComplianceParameters;
 }
-export type ApiImagePostTask = Extract<ApiBusinessTaskName, 'damage_detection' | 'wheel_analysis' | 'dashboard_ocr' | 'compliances'> | ApiImageCompliancesTaskPost | ApiHinlTaskPost | ApiImagesOCRTaskPost | ApiImagesOdometerTaskPost | ApiImagesWarningLightsTaskPost;
+export type ApiImagePostTask = Extract<ApiBusinessTaskName, 'damage_detection' | 'wheel_analysis' | 'dashboard_ocr' | 'compliances'> | ApiImageCompliancesTaskPost | ApiHinlTaskPost | ApiImagesOCRTaskPost | ApiImagesOdometerTaskPost | ApiImagesWarningLightsTaskPost | ApiImagesWheelAnalysisTaskPost;
 export interface ApiImagePost {
     acquisition: ApiAcquisition;
     tasks?: ApiImagePostTask[];

package/lib/src/api/models/task.d.ts

@@ -1,4 +1,5 @@
 import { ApiPricingMethodology } from './pricingV2';
+import { ApiWheelType } from './wheelAnalysis';
 export interface ApiImageInTask {
     image_id: string;
 }
@@ -33,12 +34,20 @@ export interface ApiImagesWarningLightsTaskPost {
     name: 'warning_lights';
     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' | 'IN_PROGRESS' | 'DONE' | 'ERROR' | 'ABORTED' | 'VALIDATED';
 export interface ApiTaskGet {
     id: string;
     images: ApiImageInTask[];
     name: ApiBusinessTaskName;
     status: ApiTaskProgressStatus;
+    arguments?: Record<string, unknown>;
 }
 export type ApiTasks = ApiTaskGet[];
 export type ApiCallbackEventEnum = 'STATUS_SET_TO_DONE' | 'STATUS_SET_TO_ERROR';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@monkvision/network",
-  "version": "5.0.8",
+  "version": "5.0.9",
   "license": "BSD-3-Clause-Clear",
   "packageManager": "yarn@3.2.4",
   "description": "MonkJs core package used to communicate with the API",
@@ -28,8 +28,8 @@
     "lint:fix": "yarn run prettier:fix && yarn run eslint:fix"
   },
   "dependencies": {
-    "@monkvision/common": "5.0.8",
-    "@monkvision/sights": "5.0.8",
+    "@monkvision/common": "5.0.9",
+    "@monkvision/sights": "5.0.9",
     "jsonwebtoken": "^9.0.2",
     "jwt-decode": "^4.0.0",
     "ky": "^1.2.0",
@@ -42,12 +42,12 @@
     "react-router-dom": "^6.22.3"
   },
   "devDependencies": {
-    "@monkvision/eslint-config-base": "5.0.8",
-    "@monkvision/eslint-config-typescript": "5.0.8",
-    "@monkvision/jest-config": "5.0.8",
-    "@monkvision/prettier-config": "5.0.8",
-    "@monkvision/types": "5.0.8",
-    "@monkvision/typescript-config": "5.0.8",
+    "@monkvision/eslint-config-base": "5.0.9",
+    "@monkvision/eslint-config-typescript": "5.0.9",
+    "@monkvision/jest-config": "5.0.9",
+    "@monkvision/prettier-config": "5.0.9",
+    "@monkvision/types": "5.0.9",
+    "@monkvision/typescript-config": "5.0.9",
     "@types/jest": "^29.2.2",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/node": "^18.11.9",
@@ -84,5 +84,5 @@
     "url": "https://github.com/monkvision/monkjs/issues"
   },
   "homepage": "https://github.com/monkvision/monkjs",
-  "gitHead": "6da388e4c3dd73b423a33dfe4998cb06e960beff"
+  "gitHead": "0a5c205106b6224ad0f7a7e9f16204dd36e485ef"
 }