@jax-data-science/sci-image-visualizer 0.2.19 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/index.mjs +2 -9
- package/esm2022/lib/contracts/instance-segmenter.contract.mjs +10 -10
- package/esm2022/lib/contracts/semantic-segmenter.contract.mjs +10 -9
- package/esm2022/lib/contracts/toolbar-tool.contract.mjs +64 -0
- package/esm2022/lib/toolbar/model-info.mjs +32 -0
- package/esm2022/lib/toolbar/toolbar.component.mjs +82 -55
- package/esm2022/lib/visualizer.component.mjs +131 -138
- package/fesm2022/{jax-data-science-sci-image-visualizer-onnx-sam-session-iPNL2JyC.mjs → jax-data-science-sci-image-visualizer-onnx-sam-session-ci1q0xnJ.mjs} +2 -2
- package/fesm2022/{jax-data-science-sci-image-visualizer-onnx-sam-session-iPNL2JyC.mjs.map → jax-data-science-sci-image-visualizer-onnx-sam-session-ci1q0xnJ.mjs.map} +1 -1
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs +710 -1565
- package/fesm2022/jax-data-science-sci-image-visualizer.mjs.map +1 -1
- package/index.d.ts +1 -6
- package/lib/contracts/instance-segmenter.contract.d.ts +7 -3
- package/lib/contracts/semantic-segmenter.contract.d.ts +7 -2
- package/lib/contracts/toolbar-tool.contract.d.ts +190 -0
- package/lib/toolbar/model-info.d.ts +17 -0
- package/lib/toolbar/toolbar.component.d.ts +53 -30
- package/lib/visualizer.component.d.ts +49 -58
- package/package.json +2 -4
- package/src/lib/assets/cell-detection.svg +37 -0
- package/src/lib/assets/cells.svg +1 -1
- package/src/lib/assets/sam-box-prompt.svg +61 -0
- package/src/lib/assets/sam-point-prompt.svg +91 -0
- package/esm2022/lib/toolbar/segmentation/retinal-layer-tool.service.mjs +0 -197
- package/esm2022/lib/toolbar/segmentation/retinal-model-registry.mjs +0 -119
- package/esm2022/lib/toolbar/segmentation/retinal-segmenter.service.mjs +0 -172
- package/esm2022/lib/toolbar/segmentation/yolo-detect-tool.service.mjs +0 -208
- package/esm2022/lib/toolbar/segmentation/yolo-model-registry.mjs +0 -129
- package/esm2022/lib/toolbar/segmentation/yolo-segmenter.service.mjs +0 -172
- package/lib/toolbar/segmentation/retinal-layer-tool.service.d.ts +0 -49
- package/lib/toolbar/segmentation/retinal-model-registry.d.ts +0 -71
- package/lib/toolbar/segmentation/retinal-segmenter.service.d.ts +0 -60
- package/lib/toolbar/segmentation/yolo-detect-tool.service.d.ts +0 -51
- package/lib/toolbar/segmentation/yolo-model-registry.d.ts +0 -59
- package/lib/toolbar/segmentation/yolo-segmenter.service.d.ts +0 -50
|
@@ -1,172 +0,0 @@
|
|
|
1
|
-
import { Injectable } from '@angular/core';
|
|
2
|
-
import { getOrtWasmBase } from './ort-runtime-config';
|
|
3
|
-
import { getDefaultYoloModelId, getYoloModel } from './yolo-model-registry';
|
|
4
|
-
import * as i0 from "@angular/core";
|
|
5
|
-
/**
|
|
6
|
-
* Default in-library {@link IInstanceSegmenter}, backed by yolo-segdetect-js
|
|
7
|
-
* (YOLOv8-seg on WebGPU, falling back to WASM).
|
|
8
|
-
*
|
|
9
|
-
* `yolo-segdetect-js` is a regular dependency but is **lazy-imported** on first
|
|
10
|
-
* use, so apps that never run YOLO pay nothing for it — or for onnxruntime-web —
|
|
11
|
-
* in their initial bundle. This mirrors {@link CellposeSegmenterService}.
|
|
12
|
-
*
|
|
13
|
-
* The one structural difference from the Cellpose service: there are four YOLO
|
|
14
|
-
* checkpoints, not one, so instances are cached **per model id** rather than as
|
|
15
|
-
* a single singleton. Each entry owns its own worker and ORT session, so a host
|
|
16
|
-
* that switches models pays a second load but keeps the first one warm. Nothing
|
|
17
|
-
* evicts automatically — these are ~144 MB each, so a host that cycles through
|
|
18
|
-
* all four should call {@link dispose} for the ones it is done with.
|
|
19
|
-
*/
|
|
20
|
-
export class YoloSegmenterService {
|
|
21
|
-
constructor() {
|
|
22
|
-
this.instances = new Map();
|
|
23
|
-
this.loading = new Map();
|
|
24
|
-
}
|
|
25
|
-
async segmentInstances(image, opts = {}, progress) {
|
|
26
|
-
const modelId = opts.modelId ?? getDefaultYoloModelId();
|
|
27
|
-
const def = this.requireModel(modelId);
|
|
28
|
-
let announcedDownload = false;
|
|
29
|
-
const seg = await this.getModel(modelId, (loaded, total) => {
|
|
30
|
-
if (total)
|
|
31
|
-
progress?.onProgress?.(loaded / total);
|
|
32
|
-
progress?.onBytes?.(loaded, total);
|
|
33
|
-
if (loaded > 0 && !announcedDownload) {
|
|
34
|
-
announcedDownload = true;
|
|
35
|
-
progress?.onStatus?.(`Downloading ${def.label} model…`);
|
|
36
|
-
}
|
|
37
|
-
}, (status) => progress?.onStatus?.(status));
|
|
38
|
-
progress?.onStatus?.('Running inference…');
|
|
39
|
-
const result = await seg.segment({ data: image.data, width: image.width, height: image.height }, {
|
|
40
|
-
confThreshold: opts.confidence ?? def.defaults.confidence,
|
|
41
|
-
iouThreshold: opts.iouThreshold ?? def.defaults.iouThreshold,
|
|
42
|
-
threshold: opts.mergeThreshold ?? def.defaults.mergeThreshold,
|
|
43
|
-
overlapX: opts.overlapX ?? def.defaults.overlapX,
|
|
44
|
-
overlapY: opts.overlapY ?? def.defaults.overlapY,
|
|
45
|
-
...(opts.maskThreshold !== undefined ? { maskThreshold: opts.maskThreshold } : {}),
|
|
46
|
-
...(opts.maxDetections !== undefined ? { maxDetections: opts.maxDetections } : {}),
|
|
47
|
-
...(opts.classFilter ? { classFilter: opts.classFilter } : {}),
|
|
48
|
-
...(opts.withMasks !== undefined ? { withMasks: opts.withMasks } : {}),
|
|
49
|
-
...(opts.signal ? { signal: opts.signal } : {}),
|
|
50
|
-
// Only worth tracing when there are masks to trace.
|
|
51
|
-
tracePolygons: opts.withMasks !== false,
|
|
52
|
-
traceOptions: {
|
|
53
|
-
...(opts.simplifyTolerance !== undefined ? { simplifyTolerance: opts.simplifyTolerance } : {}),
|
|
54
|
-
...(opts.minArea !== undefined ? { minArea: opts.minArea } : {}),
|
|
55
|
-
},
|
|
56
|
-
// The worker narrates its own phases — shader warm-up, per tile, merge,
|
|
57
|
-
// tracing — because only it knows which one it is in. Deriving a second
|
|
58
|
-
// status from tile counts here would just fight it.
|
|
59
|
-
onStatus: (s) => progress?.onStatus?.(s),
|
|
60
|
-
});
|
|
61
|
-
// A detection without an outline is still a detection.
|
|
62
|
-
//
|
|
63
|
-
// These used to be dropped, which quietly emptied the entire result in
|
|
64
|
-
// detection mode: no masks means no polygons, so every object was
|
|
65
|
-
// discarded and the caller saw nothing at all. The server does not work
|
|
66
|
-
// that way either — it always writes a box feature and only *adds*
|
|
67
|
-
// segmentation outlines when asked. Callers get the box and decide what to
|
|
68
|
-
// do with it.
|
|
69
|
-
const detections = result.detections.map((d) => ({
|
|
70
|
-
polygons: (d.polygons ?? []).map((p) => ({
|
|
71
|
-
exterior: p.exterior.map(([x, y]) => [x, y]),
|
|
72
|
-
holes: p.holes.map((h) => h.map(([x, y]) => [x, y])),
|
|
73
|
-
})),
|
|
74
|
-
box: [d.box[0], d.box[1], d.box[2], d.box[3]],
|
|
75
|
-
score: d.score,
|
|
76
|
-
classId: d.classId,
|
|
77
|
-
className: d.className ?? `class${d.classId}`,
|
|
78
|
-
}));
|
|
79
|
-
return {
|
|
80
|
-
detections,
|
|
81
|
-
width: result.width,
|
|
82
|
-
height: result.height,
|
|
83
|
-
classNames: result.classNames,
|
|
84
|
-
};
|
|
85
|
-
}
|
|
86
|
-
/**
|
|
87
|
-
* The shared segmenter for a model id, created on first use and reused
|
|
88
|
-
* thereafter (deduped across concurrent callers). Exposed so a host's
|
|
89
|
-
* processing pipeline can drive richer `segment()` options on the same loaded
|
|
90
|
-
* session instead of loading the model twice.
|
|
91
|
-
*/
|
|
92
|
-
getModel(modelId = getDefaultYoloModelId(), onProgress, onStatus) {
|
|
93
|
-
const existing = this.instances.get(modelId);
|
|
94
|
-
if (existing)
|
|
95
|
-
return Promise.resolve(existing);
|
|
96
|
-
const inFlight = this.loading.get(modelId);
|
|
97
|
-
if (inFlight)
|
|
98
|
-
return inFlight;
|
|
99
|
-
const def = this.requireModel(modelId);
|
|
100
|
-
const load = (async () => {
|
|
101
|
-
// Lazy: keep yolo-segdetect-js + its ORT runtime out of the initial bundle.
|
|
102
|
-
const { YoloSegmenter, configureOrt } = await import('yolo-segdetect-js');
|
|
103
|
-
configureOrt({ wasmPaths: getOrtWasmBase() });
|
|
104
|
-
const seg = await YoloSegmenter.fromPretrained(def.modelUrl, {
|
|
105
|
-
preload: true,
|
|
106
|
-
...(def.metaUrl ? { metaUrl: def.metaUrl } : {}),
|
|
107
|
-
onProgress: ({ loaded, total }) => onProgress?.(loaded, total),
|
|
108
|
-
onStatus: (s) => onStatus?.(s),
|
|
109
|
-
});
|
|
110
|
-
this.instances.set(modelId, seg);
|
|
111
|
-
return seg;
|
|
112
|
-
})();
|
|
113
|
-
this.loading.set(modelId, load);
|
|
114
|
-
// A failed load must not poison the cache — the next caller should retry
|
|
115
|
-
// rather than inherit the rejected promise forever.
|
|
116
|
-
load.catch(() => this.loading.delete(modelId));
|
|
117
|
-
return load;
|
|
118
|
-
}
|
|
119
|
-
/** Whether a model is already loaded (warm). */
|
|
120
|
-
isLoaded(modelId = getDefaultYoloModelId()) {
|
|
121
|
-
return this.instances.has(modelId);
|
|
122
|
-
}
|
|
123
|
-
/**
|
|
124
|
-
* Release one model, or all of them. Safe to call on a model never loaded.
|
|
125
|
-
*
|
|
126
|
-
* In-flight loads are torn down too, not just warm ones. Simply dropping the
|
|
127
|
-
* pending promise and returning would let the load finish afterwards,
|
|
128
|
-
* re-populate {@link instances}, and strand a live worker and ORT session that
|
|
129
|
-
* nothing owns — disposal would have reported success while leaking. So a load
|
|
130
|
-
* that is still running is awaited and then released.
|
|
131
|
-
*/
|
|
132
|
-
async dispose(modelId) {
|
|
133
|
-
const ids = modelId ? [modelId] : [...new Set([...this.instances.keys(), ...this.loading.keys()])];
|
|
134
|
-
await Promise.all(ids.map((id) => this.disposeOne(id)));
|
|
135
|
-
}
|
|
136
|
-
async disposeOne(id) {
|
|
137
|
-
const pending = this.loading.get(id);
|
|
138
|
-
const loaded = this.instances.get(id);
|
|
139
|
-
this.instances.delete(id);
|
|
140
|
-
this.loading.delete(id);
|
|
141
|
-
if (loaded)
|
|
142
|
-
await loaded.dispose();
|
|
143
|
-
if (!pending)
|
|
144
|
-
return;
|
|
145
|
-
// A pending load assigns instances[id] before its promise resolves, so by
|
|
146
|
-
// the time this await returns the entry is back. Clear it only if it still
|
|
147
|
-
// points at what *this* load produced — a newer load started in the
|
|
148
|
-
// meantime owns its own entry and must not be evicted.
|
|
149
|
-
const seg = await pending.catch(() => null);
|
|
150
|
-
if (!seg || seg === loaded)
|
|
151
|
-
return;
|
|
152
|
-
if (this.instances.get(id) === seg)
|
|
153
|
-
this.instances.delete(id);
|
|
154
|
-
await seg.dispose();
|
|
155
|
-
}
|
|
156
|
-
requireModel(modelId) {
|
|
157
|
-
const def = getYoloModel(modelId);
|
|
158
|
-
if (!def)
|
|
159
|
-
throw new Error(`Unknown YOLO model id "${modelId}".`);
|
|
160
|
-
if (!def.modelUrl.trim()) {
|
|
161
|
-
throw new Error(`YOLO model "${modelId}" is not configured — its modelUrl is empty.`);
|
|
162
|
-
}
|
|
163
|
-
return def;
|
|
164
|
-
}
|
|
165
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloSegmenterService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
166
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloSegmenterService, providedIn: 'root' }); }
|
|
167
|
-
}
|
|
168
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.9", ngImport: i0, type: YoloSegmenterService, decorators: [{
|
|
169
|
-
type: Injectable,
|
|
170
|
-
args: [{ providedIn: 'root' }]
|
|
171
|
-
}] });
|
|
172
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"yolo-segmenter.service.js","sourceRoot":"","sources":["../../../../../src/lib/toolbar/segmentation/yolo-segmenter.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { getOrtWasmBase } from './ort-runtime-config';\nimport { getDefaultYoloModelId, getYoloModel, type YoloModelDef } from './yolo-model-registry';\n\nimport type {\n  IInstanceSegmenter,\n  InstanceDetection,\n  InstanceSegmentation,\n  InstanceSegmentOptions,\n  InstanceSegmentProgress,\n} from '../../contracts/instance-segmenter.contract';\nimport type { YoloSegmenter } from 'yolo-segdetect-js';\n\n/**\n * Default in-library {@link IInstanceSegmenter}, backed by yolo-segdetect-js\n * (YOLOv8-seg on WebGPU, falling back to WASM).\n *\n * `yolo-segdetect-js` is a regular dependency but is **lazy-imported** on first\n * use, so apps that never run YOLO pay nothing for it — or for onnxruntime-web —\n * in their initial bundle. This mirrors {@link CellposeSegmenterService}.\n *\n * The one structural difference from the Cellpose service: there are four YOLO\n * checkpoints, not one, so instances are cached **per model id** rather than as\n * a single singleton. Each entry owns its own worker and ORT session, so a host\n * that switches models pays a second load but keeps the first one warm. Nothing\n * evicts automatically — these are ~144 MB each, so a host that cycles through\n * all four should call {@link dispose} for the ones it is done with.\n */\n@Injectable({ providedIn: 'root' })\nexport class YoloSegmenterService implements IInstanceSegmenter {\n  private readonly instances = new Map<string, YoloSegmenter>();\n  private readonly loading = new Map<string, Promise<YoloSegmenter>>();\n\n  async segmentInstances(\n    image: { data: Uint8ClampedArray; width: number; height: number },\n    opts: InstanceSegmentOptions = {},\n    progress?: InstanceSegmentProgress,\n  ): Promise<InstanceSegmentation> {\n    const modelId = opts.modelId ?? getDefaultYoloModelId();\n    const def = this.requireModel(modelId);\n\n    let announcedDownload = false;\n    const seg = await this.getModel(\n      modelId,\n      (loaded, total) => {\n        if (total) progress?.onProgress?.(loaded / total);\n        progress?.onBytes?.(loaded, total);\n        if (loaded > 0 && !announcedDownload) {\n          announcedDownload = true;\n          progress?.onStatus?.(`Downloading ${def.label} model…`);\n        }\n      },\n      (status) => progress?.onStatus?.(status),\n    );\n\n    progress?.onStatus?.('Running inference…');\n    const result = await seg.segment(\n      { data: image.data, width: image.width, height: image.height },\n      {\n        confThreshold: opts.confidence ?? def.defaults.confidence,\n        iouThreshold: opts.iouThreshold ?? def.defaults.iouThreshold,\n        threshold: opts.mergeThreshold ?? def.defaults.mergeThreshold,\n        overlapX: opts.overlapX ?? def.defaults.overlapX,\n        overlapY: opts.overlapY ?? def.defaults.overlapY,\n        ...(opts.maskThreshold !== undefined ? { maskThreshold: opts.maskThreshold } : {}),\n        ...(opts.maxDetections !== undefined ? { maxDetections: opts.maxDetections } : {}),\n        ...(opts.classFilter ? { classFilter: opts.classFilter } : {}),\n        ...(opts.withMasks !== undefined ? { withMasks: opts.withMasks } : {}),\n        ...(opts.signal ? { signal: opts.signal } : {}),\n        // Only worth tracing when there are masks to trace.\n        tracePolygons: opts.withMasks !== false,\n        traceOptions: {\n          ...(opts.simplifyTolerance !== undefined ? { simplifyTolerance: opts.simplifyTolerance } : {}),\n          ...(opts.minArea !== undefined ? { minArea: opts.minArea } : {}),\n        },\n        // The worker narrates its own phases — shader warm-up, per tile, merge,\n        // tracing — because only it knows which one it is in. Deriving a second\n        // status from tile counts here would just fight it.\n        onStatus: (s) => progress?.onStatus?.(s),\n      },\n    );\n\n    // A detection without an outline is still a detection.\n    //\n    // These used to be dropped, which quietly emptied the entire result in\n    // detection mode: no masks means no polygons, so every object was\n    // discarded and the caller saw nothing at all. The server does not work\n    // that way either — it always writes a box feature and only *adds*\n    // segmentation outlines when asked. Callers get the box and decide what to\n    // do with it.\n    const detections: InstanceDetection[] = result.detections.map((d) => ({\n      polygons: (d.polygons ?? []).map((p) => ({\n        exterior: p.exterior.map(([x, y]): [number, number] => [x, y]),\n        holes: p.holes.map((h) => h.map(([x, y]): [number, number] => [x, y])),\n      })),\n      box: [d.box[0], d.box[1], d.box[2], d.box[3]] as [number, number, number, number],\n      score: d.score,\n      classId: d.classId,\n      className: d.className ?? `class${d.classId}`,\n    }));\n\n    return {\n      detections,\n      width: result.width,\n      height: result.height,\n      classNames: result.classNames,\n    };\n  }\n\n  /**\n   * The shared segmenter for a model id, created on first use and reused\n   * thereafter (deduped across concurrent callers). Exposed so a host's\n   * processing pipeline can drive richer `segment()` options on the same loaded\n   * session instead of loading the model twice.\n   */\n  getModel(\n    modelId: string = getDefaultYoloModelId(),\n    onProgress?: (loaded: number, total: number | null) => void,\n    onStatus?: (status: string) => void,\n  ): Promise<YoloSegmenter> {\n    const existing = this.instances.get(modelId);\n    if (existing) return Promise.resolve(existing);\n\n    const inFlight = this.loading.get(modelId);\n    if (inFlight) return inFlight;\n\n    const def = this.requireModel(modelId);\n    const load = (async () => {\n      // Lazy: keep yolo-segdetect-js + its ORT runtime out of the initial bundle.\n      const { YoloSegmenter, configureOrt } = await import('yolo-segdetect-js');\n      configureOrt({ wasmPaths: getOrtWasmBase() });\n      const seg = await YoloSegmenter.fromPretrained(def.modelUrl, {\n        preload: true,\n        ...(def.metaUrl ? { metaUrl: def.metaUrl } : {}),\n        onProgress: ({ loaded, total }) => onProgress?.(loaded, total),\n        onStatus: (s) => onStatus?.(s),\n      });\n      this.instances.set(modelId, seg);\n      return seg;\n    })();\n\n    this.loading.set(modelId, load);\n    // A failed load must not poison the cache — the next caller should retry\n    // rather than inherit the rejected promise forever.\n    load.catch(() => this.loading.delete(modelId));\n    return load;\n  }\n\n  /** Whether a model is already loaded (warm). */\n  isLoaded(modelId: string = getDefaultYoloModelId()): boolean {\n    return this.instances.has(modelId);\n  }\n\n  /**\n   * Release one model, or all of them. Safe to call on a model never loaded.\n   *\n   * In-flight loads are torn down too, not just warm ones. Simply dropping the\n   * pending promise and returning would let the load finish afterwards,\n   * re-populate {@link instances}, and strand a live worker and ORT session that\n   * nothing owns — disposal would have reported success while leaking. So a load\n   * that is still running is awaited and then released.\n   */\n  async dispose(modelId?: string): Promise<void> {\n    const ids = modelId ? [modelId] : [...new Set([...this.instances.keys(), ...this.loading.keys()])];\n    await Promise.all(ids.map((id) => this.disposeOne(id)));\n  }\n\n  private async disposeOne(id: string): Promise<void> {\n    const pending = this.loading.get(id);\n    const loaded = this.instances.get(id);\n    this.instances.delete(id);\n    this.loading.delete(id);\n\n    if (loaded) await loaded.dispose();\n    if (!pending) return;\n\n    // A pending load assigns instances[id] before its promise resolves, so by\n    // the time this await returns the entry is back. Clear it only if it still\n    // points at what *this* load produced — a newer load started in the\n    // meantime owns its own entry and must not be evicted.\n    const seg = await pending.catch(() => null);\n    if (!seg || seg === loaded) return;\n    if (this.instances.get(id) === seg) this.instances.delete(id);\n    await seg.dispose();\n  }\n\n  private requireModel(modelId: string): YoloModelDef {\n    const def = getYoloModel(modelId);\n    if (!def) throw new Error(`Unknown YOLO model id \"${modelId}\".`);\n    if (!def.modelUrl.trim()) {\n      throw new Error(`YOLO model \"${modelId}\" is not configured — its modelUrl is empty.`);\n    }\n    return def;\n  }\n}\n"]}
|
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
import { BehaviorSubject } from 'rxjs';
|
|
2
|
-
import { type TileAccessPort } from '../../contracts/ports/tile-access.port';
|
|
3
|
-
import type { IVisualizer } from '../../contracts/visualizer.contract';
|
|
4
|
-
import type { ISemanticSegmenter, SemanticSegmentOptions } from '../../contracts/semantic-segmenter.contract';
|
|
5
|
-
import * as i0 from "@angular/core";
|
|
6
|
-
/** Marks regions this tool produced, so a re-run can replace only its own. */
|
|
7
|
-
export declare const RETINAL_REGION_SOURCE = "retinal-layer";
|
|
8
|
-
/**
|
|
9
|
-
* Retinal-layer segmentation over the current view.
|
|
10
|
-
*
|
|
11
|
-
* Sibling of {@link YoloDetectToolService}, and structured the same way: run on
|
|
12
|
-
* whatever is on screen, map the results onto full-image coordinates through
|
|
13
|
-
* the viewer's source rect, and commit them as regions. The difference is what
|
|
14
|
-
* comes back — layers that tile the field rather than discrete objects, so
|
|
15
|
-
* every region is one connected component of one layer and there is no
|
|
16
|
-
* per-object confidence to filter on.
|
|
17
|
-
*
|
|
18
|
-
* Exposes the same `status$` / `busy$` / `progress$` surface as the cellpose and
|
|
19
|
-
* YOLO tools so the host's shared segmentation toast drives it unchanged.
|
|
20
|
-
*/
|
|
21
|
-
export declare class RetinalLayerToolService {
|
|
22
|
-
/** Server-side crop, so segmentation can run at the model's scale rather
|
|
23
|
-
* than the viewer's. Optional: without it the tool falls back to the
|
|
24
|
-
* displayed pixels, which is correct but scale-dependent. */
|
|
25
|
-
private tileAccess;
|
|
26
|
-
readonly status$: BehaviorSubject<string>;
|
|
27
|
-
readonly busy$: BehaviorSubject<boolean>;
|
|
28
|
-
readonly progress$: BehaviorSubject<number>;
|
|
29
|
-
constructor(
|
|
30
|
-
/** Server-side crop, so segmentation can run at the model's scale rather
|
|
31
|
-
* than the viewer's. Optional: without it the tool falls back to the
|
|
32
|
-
* displayed pixels, which is correct but scale-dependent. */
|
|
33
|
-
tileAccess?: TileAccessPort | null);
|
|
34
|
-
/**
|
|
35
|
-
* Segment the current view and commit the layers as regions.
|
|
36
|
-
*
|
|
37
|
-
* @returns the number of regions added.
|
|
38
|
-
*/
|
|
39
|
-
segmentInView(viz: IVisualizer, segmenter: ISemanticSegmenter, opts?: SemanticSegmentOptions): Promise<number>;
|
|
40
|
-
/**
|
|
41
|
-
* Re-crop `rect` at `1/target` of full resolution. Returns null on any
|
|
42
|
-
* failure, so the caller falls back to the displayed pixels — a coarser crop
|
|
43
|
-
* beats a failed run.
|
|
44
|
-
*/
|
|
45
|
-
private fetchCropAtScale;
|
|
46
|
-
private makeRegion;
|
|
47
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<RetinalLayerToolService, [{ optional: true; }]>;
|
|
48
|
-
static ɵprov: i0.ɵɵInjectableDeclaration<RetinalLayerToolService>;
|
|
49
|
-
}
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Registry of retinal-layer semantic-segmentation models.
|
|
3
|
-
*
|
|
4
|
-
* Mirrors {@link YOLO_MODELS}: public HF-hosted ONNX by default, repointable at
|
|
5
|
-
* private hosting via {@link setRetinalModelUrls}.
|
|
6
|
-
*
|
|
7
|
-
* ONLY ONE CHECKPOINT IS ENABLED, AND THAT IS DELIBERATE
|
|
8
|
-
* The server offers four. Measured against the ground-truth masks shipped
|
|
9
|
-
* alongside them, only VNet reproduces them:
|
|
10
|
-
*
|
|
11
|
-
* | checkpoint | mIoU |
|
|
12
|
-
* |---|---|
|
|
13
|
-
* | **VNet 2D** | **0.9061** |
|
|
14
|
-
* | ResUNet-a 2D (base) | 0.3065 |
|
|
15
|
-
* | ResUNet-a 2D 20x | 0.2869 |
|
|
16
|
-
* | ResUNet-a 2D 40x | 0.2718 |
|
|
17
|
-
*
|
|
18
|
-
* The ResUNet-a numbers are not quantization damage — their ONNX exports match
|
|
19
|
-
* their own Keras originals exactly. They disagree with the *masks*, folding
|
|
20
|
-
* ground-truth class 1 into their class 2 and class 3 into background, and no
|
|
21
|
-
* relabelling rescues them (the best of all 24 class permutations reaches only
|
|
22
|
-
* 0.36). Either those masks belong to a different model generation or the class
|
|
23
|
-
* definitions moved — an open question for whoever trained them.
|
|
24
|
-
*
|
|
25
|
-
* So their weights stay unpublished (their Hub repos are private) and their
|
|
26
|
-
* entries here carry an empty `modelUrl`, which {@link isRetinalModelReady}
|
|
27
|
-
* reports as not-ready. They are listed rather than deleted so a host shows
|
|
28
|
-
* them as unavailable-in-browser instead of pretending the server's choice does
|
|
29
|
-
* not exist — and so enabling one later is a URL, not a code change.
|
|
30
|
-
*
|
|
31
|
-
* Export tooling: the sibling `browser-onnx-tools` project.
|
|
32
|
-
*/
|
|
33
|
-
export interface RetinalModelDef {
|
|
34
|
-
id: string;
|
|
35
|
-
label: string;
|
|
36
|
-
/** URL of the `.onnx` weights. **Empty disables the model.** */
|
|
37
|
-
modelUrl: string;
|
|
38
|
-
/**
|
|
39
|
-
* URL of the `model.json` sidecar. Omit to use `model.json` alongside the
|
|
40
|
-
* weights, which is how every published repo is laid out.
|
|
41
|
-
*/
|
|
42
|
-
metaUrl?: string;
|
|
43
|
-
/** Patch size the checkpoint was trained at, for callers that size reads to it. */
|
|
44
|
-
patchSize: number;
|
|
45
|
-
/** Download size of the `fp16w` weights, MB — these are large enough to warn about. */
|
|
46
|
-
sizeMb: number;
|
|
47
|
-
/** Measured mIoU against the bucket's ground-truth masks. */
|
|
48
|
-
miou: number;
|
|
49
|
-
/** Set when the model is knowingly disabled; shown to the user. */
|
|
50
|
-
unavailableReason?: string;
|
|
51
|
-
}
|
|
52
|
-
export declare const RETINAL_MODELS: RetinalModelDef[];
|
|
53
|
-
export declare const DEFAULT_RETINAL_MODEL_ID = "vnet-2d-retinal";
|
|
54
|
-
/** Look up a model definition by id. Returns undefined for an unknown id. */
|
|
55
|
-
export declare function getRetinalModel(id: string): RetinalModelDef | undefined;
|
|
56
|
-
/** Whether a model has usable weights configured. */
|
|
57
|
-
export declare function isRetinalModelReady(id: string): boolean;
|
|
58
|
-
/** Only the models a browser can actually run. */
|
|
59
|
-
export declare function readyRetinalModels(): RetinalModelDef[];
|
|
60
|
-
/**
|
|
61
|
-
* Repoint a model at different hosting (a GCS bucket, a same-origin proxy), or
|
|
62
|
-
* enable one of the disabled entries. Call once at app init, before first use.
|
|
63
|
-
* An empty `modelUrl` disables the model.
|
|
64
|
-
*/
|
|
65
|
-
export declare function setRetinalModelUrls(id: string, urls: {
|
|
66
|
-
modelUrl?: string;
|
|
67
|
-
metaUrl?: string;
|
|
68
|
-
}): void;
|
|
69
|
-
/** Change which model runs when a caller does not name one. */
|
|
70
|
-
export declare function setDefaultRetinalModel(id: string): void;
|
|
71
|
-
export declare function getDefaultRetinalModelId(): string;
|
|
@@ -1,60 +0,0 @@
|
|
|
1
|
-
import type { ISemanticSegmenter, SemanticSegmentation, SemanticSegmentOptions, SemanticSegmentProgress } from '../../contracts/semantic-segmenter.contract';
|
|
2
|
-
import type { RetinalSegmenter } from 'jax-ai-js';
|
|
3
|
-
import * as i0 from "@angular/core";
|
|
4
|
-
/**
|
|
5
|
-
* Default in-library {@link ISemanticSegmenter}, backed by jax-ai-js.
|
|
6
|
-
*
|
|
7
|
-
* `jax-ai-js` is a regular dependency but is **lazy-imported** on first use, so
|
|
8
|
-
* apps that never segment retinal layers pay nothing for it — or for
|
|
9
|
-
* onnxruntime-web — in their initial bundle. Mirrors
|
|
10
|
-
* {@link YoloSegmenterService}, including its per-model-id cache.
|
|
11
|
-
*
|
|
12
|
-
* WEBGPU ONLY, AND A HOST MUST BE READY FOR THAT
|
|
13
|
-
* Unlike the YOLO and Cellpose services, there is no WASM fallback to degrade
|
|
14
|
-
* to: ORT-Web's WASM EP dies with `std::bad_alloc` on these graphs at 512², at
|
|
15
|
-
* every precision. jax-ai-js throws `WebGpuRequiredError` rather than trying,
|
|
16
|
-
* and it is re-thrown here unchanged so a host can show a real
|
|
17
|
-
* unsupported-browser message instead of a generic failure.
|
|
18
|
-
*/
|
|
19
|
-
export declare class RetinalSegmenterService implements ISemanticSegmenter {
|
|
20
|
-
private readonly instances;
|
|
21
|
-
private readonly loading;
|
|
22
|
-
segmentSemantic(image: {
|
|
23
|
-
data: Uint8ClampedArray;
|
|
24
|
-
width: number;
|
|
25
|
-
height: number;
|
|
26
|
-
}, opts?: SemanticSegmentOptions, progress?: SemanticSegmentProgress): Promise<SemanticSegmentation>;
|
|
27
|
-
/**
|
|
28
|
-
* The shared segmenter for a model id, created on first use and reused
|
|
29
|
-
* thereafter (deduped across concurrent callers). Exposed so a host's
|
|
30
|
-
* processing pipeline can run on the same loaded session rather than paying
|
|
31
|
-
* the ~590 MB load twice.
|
|
32
|
-
*/
|
|
33
|
-
getModel(modelId?: string, onProgress?: (loaded: number, total: number | null) => void, onStatus?: (status: string) => void,
|
|
34
|
-
/**
|
|
35
|
-
* Abort the load. This model is ~590 MB, so a cancel has to reach the
|
|
36
|
-
* *download* — aborting only the inference that follows leaves the transfer
|
|
37
|
-
* running and the UI stuck in "Cancelling" until it completes.
|
|
38
|
-
*
|
|
39
|
-
* Deliberately not applied to a load already in flight: that promise may be
|
|
40
|
-
* shared with another caller (the toolbar tool and the pipeline both use
|
|
41
|
-
* this service), and one caller's cancel must not tear the model out from
|
|
42
|
-
* under the other. A second caller joining an in-flight load simply waits.
|
|
43
|
-
*/
|
|
44
|
-
signal?: AbortSignal): Promise<RetinalSegmenter>;
|
|
45
|
-
/** Whether a model is already loaded (warm). */
|
|
46
|
-
isLoaded(modelId?: string): boolean;
|
|
47
|
-
/**
|
|
48
|
-
* Release one model, or all of them. Safe to call on a model never loaded.
|
|
49
|
-
*
|
|
50
|
-
* In-flight loads are torn down too: dropping a pending promise and returning
|
|
51
|
-
* would let the load finish afterwards, re-populate {@link instances}, and
|
|
52
|
-
* strand a live ORT session that nothing owns — disposal would report success
|
|
53
|
-
* while leaking. At 590 MB that leak is not survivable.
|
|
54
|
-
*/
|
|
55
|
-
dispose(modelId?: string): Promise<void>;
|
|
56
|
-
private disposeOne;
|
|
57
|
-
private requireModel;
|
|
58
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<RetinalSegmenterService, never>;
|
|
59
|
-
static ɵprov: i0.ɵɵInjectableDeclaration<RetinalSegmenterService>;
|
|
60
|
-
}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
import { BehaviorSubject } from 'rxjs';
|
|
2
|
-
import { type TileAccessPort } from '../../contracts/ports/tile-access.port';
|
|
3
|
-
import type { IVisualizer } from '../../contracts/visualizer.contract';
|
|
4
|
-
import type { IInstanceSegmenter, InstanceSegmentOptions } from '../../contracts/instance-segmenter.contract';
|
|
5
|
-
import * as i0 from "@angular/core";
|
|
6
|
-
/**
|
|
7
|
-
* YOLO object detection over the current view.
|
|
8
|
-
*
|
|
9
|
-
* The complement to {@link CellSegmentToolService}: cellpose auto-segments cells
|
|
10
|
-
* inside a box you draw, whereas a detector is meant to find objects across a
|
|
11
|
-
* field. So this takes no prompt — it runs on whatever is on screen and turns
|
|
12
|
-
* every detection into a region.
|
|
13
|
-
*
|
|
14
|
-
* Detections come back in the displayed image's pixels; they are mapped onto
|
|
15
|
-
* the full-resolution image through the viewer's own source rect, so the regions
|
|
16
|
-
* land where the objects actually are rather than at view-local coordinates.
|
|
17
|
-
*
|
|
18
|
-
* Exposes the same `status$` / `busy$` / `progress$` surface as the cellpose
|
|
19
|
-
* tool so the host's shared segmentation toast drives it unchanged.
|
|
20
|
-
*/
|
|
21
|
-
/** Marks regions this tool produced, so a re-run can replace only its own. */
|
|
22
|
-
export declare const YOLO_REGION_SOURCE = "yolo";
|
|
23
|
-
export declare class YoloDetectToolService {
|
|
24
|
-
/** Server-side crop, so detection can run at the model's scale rather than
|
|
25
|
-
* the viewer's. Optional: without it the tool falls back to the displayed
|
|
26
|
-
* pixels, which is correct but scale-dependent. */
|
|
27
|
-
private tileAccess;
|
|
28
|
-
readonly status$: BehaviorSubject<string>;
|
|
29
|
-
readonly busy$: BehaviorSubject<boolean>;
|
|
30
|
-
readonly progress$: BehaviorSubject<number>;
|
|
31
|
-
constructor(
|
|
32
|
-
/** Server-side crop, so detection can run at the model's scale rather than
|
|
33
|
-
* the viewer's. Optional: without it the tool falls back to the displayed
|
|
34
|
-
* pixels, which is correct but scale-dependent. */
|
|
35
|
-
tileAccess?: TileAccessPort | null);
|
|
36
|
-
/**
|
|
37
|
-
* Detect in the current view and append the results as regions.
|
|
38
|
-
*
|
|
39
|
-
* @returns the number of regions added.
|
|
40
|
-
*/
|
|
41
|
-
detectInView(viz: IVisualizer, segmenter: IInstanceSegmenter, opts?: InstanceSegmentOptions): Promise<number>;
|
|
42
|
-
/**
|
|
43
|
-
* Re-crop `rect` at `1/target` of full resolution. Returns null on any
|
|
44
|
-
* failure, so the caller falls back to the displayed pixels — a coarser crop
|
|
45
|
-
* beats a failed run.
|
|
46
|
-
*/
|
|
47
|
-
private fetchCropAtScale;
|
|
48
|
-
private makeRegion;
|
|
49
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<YoloDetectToolService, [{ optional: true; }]>;
|
|
50
|
-
static ɵprov: i0.ɵɵInjectableDeclaration<YoloDetectToolService>;
|
|
51
|
-
}
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Registry of YOLOv8-seg instance-segmentation models.
|
|
3
|
-
*
|
|
4
|
-
* Mirrors {@link SAM_MODELS}: public HF-hosted ONNX by default so the tool works
|
|
5
|
-
* out of the box in any host, repointable at private hosting via
|
|
6
|
-
* {@link setYoloModelUrls}.
|
|
7
|
-
*
|
|
8
|
-
* Each entry carries the per-model *defaults* the server-side worker uses for
|
|
9
|
-
* that checkpoint. These are properties of how the model was trained (object
|
|
10
|
-
* scale, expected crowding), not UI preferences — the embryo models want heavy
|
|
11
|
-
* 60% tile overlap and loose merge thresholds because their objects are large
|
|
12
|
-
* and touch, while the eye models were trained on sparse, downsampled fields.
|
|
13
|
-
* Keeping them here means a host that just picks a model gets sane behaviour
|
|
14
|
-
* without having to know any of that.
|
|
15
|
-
*
|
|
16
|
-
* Weights point at the `model.fp16w.onnx` variant deliberately. The `.fp16`
|
|
17
|
-
* variant accumulates in half precision on WebGPU and, at the x-scale these
|
|
18
|
-
* models use, produces materially wrong boxes; `fp16w` stores weights in fp16
|
|
19
|
-
* and computes in fp32, so it is half the download at identical accuracy.
|
|
20
|
-
*
|
|
21
|
-
* Export tooling: the sibling `browser-onnx-tools` project.
|
|
22
|
-
*/
|
|
23
|
-
export interface YoloModelDef {
|
|
24
|
-
id: string;
|
|
25
|
-
label: string;
|
|
26
|
-
/** URL of the `.onnx` weights. Empty disables the model. */
|
|
27
|
-
modelUrl: string;
|
|
28
|
-
/**
|
|
29
|
-
* URL of the `model.json` sidecar. Omit to use `model.json` alongside the
|
|
30
|
-
* weights, which is how every published repo is laid out.
|
|
31
|
-
*/
|
|
32
|
-
metaUrl?: string;
|
|
33
|
-
/** Per-model defaults, from the server worker's model table. */
|
|
34
|
-
defaults: {
|
|
35
|
-
confidence: number;
|
|
36
|
-
iouThreshold: number;
|
|
37
|
-
mergeThreshold: number;
|
|
38
|
-
overlapX: number;
|
|
39
|
-
overlapY: number;
|
|
40
|
-
};
|
|
41
|
-
}
|
|
42
|
-
export declare const YOLO_MODELS: YoloModelDef[];
|
|
43
|
-
export declare const DEFAULT_YOLO_MODEL_ID = "yolov8x-seg-opticnerve";
|
|
44
|
-
/** Look up a model definition by id. Returns undefined for an unknown id. */
|
|
45
|
-
export declare function getYoloModel(id: string): YoloModelDef | undefined;
|
|
46
|
-
/** Whether a model has a usable weights URL configured. */
|
|
47
|
-
export declare function isYoloModelReady(id: string): boolean;
|
|
48
|
-
/**
|
|
49
|
-
* Repoint a model at different hosting (e.g. a GCS bucket or a same-origin
|
|
50
|
-
* proxy). Call once at app init, before the first run. An empty `modelUrl`
|
|
51
|
-
* disables the model.
|
|
52
|
-
*/
|
|
53
|
-
export declare function setYoloModelUrls(id: string, urls: {
|
|
54
|
-
modelUrl?: string;
|
|
55
|
-
metaUrl?: string;
|
|
56
|
-
}): void;
|
|
57
|
-
/** Change which model runs when a caller does not name one. */
|
|
58
|
-
export declare function setDefaultYoloModel(id: string): void;
|
|
59
|
-
export declare function getDefaultYoloModelId(): string;
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import type { IInstanceSegmenter, InstanceSegmentation, InstanceSegmentOptions, InstanceSegmentProgress } from '../../contracts/instance-segmenter.contract';
|
|
2
|
-
import type { YoloSegmenter } from 'yolo-segdetect-js';
|
|
3
|
-
import * as i0 from "@angular/core";
|
|
4
|
-
/**
|
|
5
|
-
* Default in-library {@link IInstanceSegmenter}, backed by yolo-segdetect-js
|
|
6
|
-
* (YOLOv8-seg on WebGPU, falling back to WASM).
|
|
7
|
-
*
|
|
8
|
-
* `yolo-segdetect-js` is a regular dependency but is **lazy-imported** on first
|
|
9
|
-
* use, so apps that never run YOLO pay nothing for it — or for onnxruntime-web —
|
|
10
|
-
* in their initial bundle. This mirrors {@link CellposeSegmenterService}.
|
|
11
|
-
*
|
|
12
|
-
* The one structural difference from the Cellpose service: there are four YOLO
|
|
13
|
-
* checkpoints, not one, so instances are cached **per model id** rather than as
|
|
14
|
-
* a single singleton. Each entry owns its own worker and ORT session, so a host
|
|
15
|
-
* that switches models pays a second load but keeps the first one warm. Nothing
|
|
16
|
-
* evicts automatically — these are ~144 MB each, so a host that cycles through
|
|
17
|
-
* all four should call {@link dispose} for the ones it is done with.
|
|
18
|
-
*/
|
|
19
|
-
export declare class YoloSegmenterService implements IInstanceSegmenter {
|
|
20
|
-
private readonly instances;
|
|
21
|
-
private readonly loading;
|
|
22
|
-
segmentInstances(image: {
|
|
23
|
-
data: Uint8ClampedArray;
|
|
24
|
-
width: number;
|
|
25
|
-
height: number;
|
|
26
|
-
}, opts?: InstanceSegmentOptions, progress?: InstanceSegmentProgress): Promise<InstanceSegmentation>;
|
|
27
|
-
/**
|
|
28
|
-
* The shared segmenter for a model id, created on first use and reused
|
|
29
|
-
* thereafter (deduped across concurrent callers). Exposed so a host's
|
|
30
|
-
* processing pipeline can drive richer `segment()` options on the same loaded
|
|
31
|
-
* session instead of loading the model twice.
|
|
32
|
-
*/
|
|
33
|
-
getModel(modelId?: string, onProgress?: (loaded: number, total: number | null) => void, onStatus?: (status: string) => void): Promise<YoloSegmenter>;
|
|
34
|
-
/** Whether a model is already loaded (warm). */
|
|
35
|
-
isLoaded(modelId?: string): boolean;
|
|
36
|
-
/**
|
|
37
|
-
* Release one model, or all of them. Safe to call on a model never loaded.
|
|
38
|
-
*
|
|
39
|
-
* In-flight loads are torn down too, not just warm ones. Simply dropping the
|
|
40
|
-
* pending promise and returning would let the load finish afterwards,
|
|
41
|
-
* re-populate {@link instances}, and strand a live worker and ORT session that
|
|
42
|
-
* nothing owns — disposal would have reported success while leaking. So a load
|
|
43
|
-
* that is still running is awaited and then released.
|
|
44
|
-
*/
|
|
45
|
-
dispose(modelId?: string): Promise<void>;
|
|
46
|
-
private disposeOne;
|
|
47
|
-
private requireModel;
|
|
48
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<YoloSegmenterService, never>;
|
|
49
|
-
static ɵprov: i0.ɵɵInjectableDeclaration<YoloSegmenterService>;
|
|
50
|
-
}
|