@cornerstonejs/ai 5.8.1 → 5.10.2

package/dist/esm/LabelmapSlicePropagationTool.js

@@ -1,6 +1,8 @@
 import { getEnabledElementByViewportId } from '@cornerstonejs/core';
 import { LabelmapBaseTool } from '@cornerstonejs/tools';
 import ONNXSegmentationController from './ONNXSegmentationController.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.aiLog.getLogger('LabelmapSlicePropagationTool');
 class LabelmapSlicePropagationTool extends LabelmapBaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -54,7 +56,7 @@ class LabelmapSlicePropagationTool extends LabelmapBaseTool {
             const { sourceViewportId } = this.configuration;
             const enabledElement = getEnabledElementByViewportId(sourceViewportId);
             if (!enabledElement) {
-                console.debug('No enabled element found for viewportId:', sourceViewportId);
+                cs3dLogger.debug('No enabled element found for viewportId:', sourceViewportId);
                 return;
             }
             const { viewport } = enabledElement;

package/dist/esm/MarkerLabelmapTool.js

@@ -1,6 +1,8 @@
 import { getEnabledElementByViewportId } from '@cornerstonejs/core';
 import { LabelmapBaseTool, ToolGroupManager, annotation, ProbeTool, addTool, } from '@cornerstonejs/tools';
 import ONNXSegmentationController from './ONNXSegmentationController.js';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.aiLog.getLogger('MarkerLabelmapTool');
 class MarkerLabelmapTool extends LabelmapBaseTool {
     constructor(toolProps = {}, defaultToolProps = {
         supportedInteractionTypes: ['Mouse', 'Touch'],
@@ -54,7 +56,7 @@ class MarkerLabelmapTool extends LabelmapBaseTool {
             const { sourceViewportId } = this.configuration;
             const enabledElement = getEnabledElementByViewportId(sourceViewportId);
             if (!enabledElement) {
-                console.debug('No enabled element found for viewportId:', sourceViewportId);
+                cs3dLogger.debug('No enabled element found for viewportId:', sourceViewportId);
                 return;
             }
             const { viewport } = enabledElement;
@@ -67,7 +69,7 @@ class MarkerLabelmapTool extends LabelmapBaseTool {
         this._addToolInstances = () => {
             const toolGroup = this._getToolGroupId();
             if (!toolGroup) {
-                console.debug(`Tool group not found`);
+                cs3dLogger.debug(`Tool group not found`);
                 return;
             }
             addTool(ProbeTool);
@@ -180,7 +182,7 @@ class MarkerLabelmapTool extends LabelmapBaseTool {
         ];
         const toolGroup = this._getToolGroupId();
         if (!toolGroup) {
-            console.debug(`Tool group not found for tool: ${MarkerLabelmapTool.toolName}`);
+            cs3dLogger.debug(`Tool group not found for tool: ${MarkerLabelmapTool.toolName}`);
             return false;
         }
         return (this.hasPreviewData() &&

package/dist/esm/ONNXSegmentationController.d.ts

@@ -12,6 +12,7 @@ export declare enum Loggers {
     Encoder = "encoder",
     Decoder = "decoder"
 }
+type LogListener = (message: string, ...args: unknown[]) => void;
 export default class ONNXSegmentationController {
     static MarkerInclude: string;
     static MarkerExclude: string;
@@ -93,7 +94,7 @@ export default class ONNXSegmentationController {
     };
     protected pCutoff: number;
     constructor(options?: {
-        listeners?: Array<(message: string) => void>;
+        listeners?: LogListener[];
         getPromptAnnotations?: (viewport?: Types.IViewport) => cornerstoneTools.Types.Annotation[];
         promptAnnotationTypes?: string[];
         models?: Record<string, ModelType[]>;
@@ -119,7 +120,7 @@ export default class ONNXSegmentationController {
     restoreCachedPromptAnnotations(viewport: Types.IViewport): any[];
     removePromptAnnotationsWithCache(viewport: Types.IViewport): void;
     interpolateScroll(viewport?: any, dir?: number): Promise<void>;
-    protected log(logger: Loggers, ...args: any[]): void;
+    protected log(logger: Loggers, ...args: unknown[]): void;
     protected getPromptAnnotations: (viewport?: any) => cornerstoneTools.Types.Annotations;
     protected viewportRenderedListener: (_event: any) => void;
     protected annotationModifiedListener: Function;
@@ -148,3 +149,4 @@ export default class ONNXSegmentationController {
     getFileNameForImageId(imageId: any, extension: any): any;
     getConfig(modelName?: string): any;
 }
+export {};

package/dist/esm/ONNXSegmentationController.js

@@ -2,10 +2,13 @@ import { utilities, eventTarget, Enums, triggerEvent, cache, } from '@cornerston
 import * as cornerstoneTools from '@cornerstonejs/tools';
 import { segmentation as cstSegmentation, LabelmapBaseTool, } from '@cornerstonejs/tools';
 import { Events as aiEvents } from './enums/index.js';
+import getOrtWasmPaths from './utils/getOrtWasmPaths.js';
 const { strategies } = cstSegmentation;
 const { fillInsideCircle } = strategies;
 import ort from 'onnxruntime-web/webgpu';
 import { vec3 } from 'gl-matrix';
+import { utilities as cornerstoneUtilities } from '@cornerstonejs/core';
+const cs3dLogger = cornerstoneUtilities.logger.aiLog.getLogger('ONNXSegmentationController');
 const { annotation } = cornerstoneTools;
 const { state: annotationState } = annotation;
 const { Events } = Enums;
@@ -84,7 +87,9 @@ class ONNXSegmentationController {
         this.worldPoints = new Array();
         this._searchBreadth = 3;
         this.excludeTool = ONNXSegmentationController.MarkerExclude;
-        this.listeners = [console.log];
+        this.listeners = [
+            (message, ...args) => cs3dLogger.info(message, ...args),
+        ];
         this.desiredImage = {
             imageId: null,
             sampleImageId: null,
@@ -139,7 +144,7 @@ class ONNXSegmentationController {
             if (this._enabled && this._autoSegmentMode) {
                 if ('isInAcquisitionPlane' in viewport &&
                     !viewport.isInAcquisitionPlane()) {
-                    console.warn('Non acquisition plane viewports and auto segment mode is not yet supported');
+                    cs3dLogger.warn('Non acquisition plane viewports and auto segment mode is not yet supported');
                     return;
                 }
                 const segmentation = cornerstoneTools.segmentation.activeSegmentation.getActiveSegmentation(viewport.id);
@@ -365,7 +370,7 @@ class ONNXSegmentationController {
             sliceIndex: currentSliceIndex + dir,
         });
         if (!viewRef || viewRef.sliceIndex === currentSliceIndex) {
-            console.warn('No next image in direction', dir, currentSliceIndex);
+            cs3dLogger.warn('No next image in direction', dir, currentSliceIndex);
             return;
         }
         viewport.scroll(dir);
@@ -679,7 +684,7 @@ class ONNXSegmentationController {
         }
         const storeData = (data.image_embeddings || data.embeddings)?.cpuData;
         if (!storeData) {
-            console.log('Unable to store data', data);
+            cs3dLogger.info('Unable to store data', data);
             return;
         }
         const writeData = new Float32Array(storeData);
@@ -958,7 +963,9 @@ class ONNXSegmentationController {
         }
         config.threads = parseInt(String(config.threads));
         config.local = parseInt(config.local);
-        ort.env.wasm.wasmPaths = 'ort/';
+        if (!ort.env.wasm.wasmPaths) {
+            ort.env.wasm.wasmPaths = getOrtWasmPaths();
+        }
         ort.env.wasm.numThreads = config.threads;
         ort.env.wasm.proxy = config.provider == 'wasm';
         this.config = config;

package/dist/esm/index.d.ts

@@ -2,4 +2,5 @@ import ONNXSegmentationController from './ONNXSegmentationController.js';
 import LabelmapSlicePropagationTool from './LabelmapSlicePropagationTool.js';
 import MarkerLabelmapTool from './MarkerLabelmapTool.js';
 import { Events } from './enums/index.js';
-export { ONNXSegmentationController, LabelmapSlicePropagationTool, MarkerLabelmapTool, Events, };
+import getOrtWasmPaths, { DEFAULT_ORT_WASM_DIRECTORY } from './utils/getOrtWasmPaths.js';
+export { ONNXSegmentationController, LabelmapSlicePropagationTool, MarkerLabelmapTool, Events, getOrtWasmPaths, DEFAULT_ORT_WASM_DIRECTORY, };

package/dist/esm/index.js

@@ -2,4 +2,5 @@ import ONNXSegmentationController from './ONNXSegmentationController.js';
 import LabelmapSlicePropagationTool from './LabelmapSlicePropagationTool.js';
 import MarkerLabelmapTool from './MarkerLabelmapTool.js';
 import { Events } from './enums/index.js';
-export { ONNXSegmentationController, LabelmapSlicePropagationTool, MarkerLabelmapTool, Events, };
+import getOrtWasmPaths, { DEFAULT_ORT_WASM_DIRECTORY, } from './utils/getOrtWasmPaths.js';
+export { ONNXSegmentationController, LabelmapSlicePropagationTool, MarkerLabelmapTool, Events, getOrtWasmPaths, DEFAULT_ORT_WASM_DIRECTORY, };

package/dist/esm/utils/getOrtWasmPaths.d.ts

@@ -0,0 +1,2 @@
+export declare const DEFAULT_ORT_WASM_DIRECTORY = "ort/";
+export default function getOrtWasmPaths(): string;

package/dist/esm/utils/getOrtWasmPaths.js

@@ -0,0 +1,5 @@
+import { utilities } from '@cornerstonejs/core';
+export const DEFAULT_ORT_WASM_DIRECTORY = 'ort/';
+export default function getOrtWasmPaths() {
+    return utilities.resolveWasmBasePath(DEFAULT_ORT_WASM_DIRECTORY);
+}

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "5.8.1";
+export declare const version = "5.10.2";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '5.8.1';
+export const version = '5.10.2';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/ai",
-  "version": "5.8.1",
+  "version": "5.10.2",
   "description": "AI and ML Interfaces for Cornerstone3D",
   "files": [
     "dist"
@@ -63,12 +63,11 @@
     "onnxruntime-web": "1.17.1"
   },
   "devDependencies": {
-    "@cornerstonejs/core": "5.8.1",
-    "@cornerstonejs/tools": "5.8.1"
+    "@cornerstonejs/core": "5.10.2",
+    "@cornerstonejs/tools": "5.10.2"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "5.8.1",
-    "@cornerstonejs/tools": "5.8.1"
-  },
-  "gitHead": "b0e07ac229d4118fa46350210a0ed6ce2cd24a25"
+    "@cornerstonejs/core": "5.10.2",
+    "@cornerstonejs/tools": "5.10.2"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Open Health Imaging Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.