scrypted-detection-trainer 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrypted-detection-trainer",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Collect and label detections to fine-tune the Scrypted NVR object detection model.",
   "keywords": [
     "scrypted-plugin"

package/src/main.ts

@@ -10,6 +10,8 @@ import sdk, {
     ObjectsDetected,
     ObjectDetector,
 } from '@scrypted/sdk';
+import fs from 'fs';
+import path from 'path';
 
 const { systemManager, deviceManager, mediaManager } = sdk;
 
@@ -55,13 +57,16 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
     private lastCapture = new Map<string, number>();
     // Map<captureId, CaptureRecord>
     private captures = new Map<string, CaptureRecord>();
-    // Map<captureId, jpegBuffer>
-    private images = new Map<string, Buffer>();
     // Active event listeners
     private listeners: (() => void)[] = [];
+    // Directory for storing images on disk
+    private imgDir: string;
 
     constructor(nativeId?: string) {
         super(nativeId);
+        // Use a stable directory inside the plugin's volume
+        this.imgDir = path.join(process.env.SCRYPTED_PLUGIN_VOLUME || '/tmp', 'detection-trainer-images');
+        try { fs.mkdirSync(this.imgDir, { recursive: true }); } catch {}
         this.loadState();
         this.registerListeners();
     }
@@ -79,26 +84,43 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
         } catch (e) {
             this.console.warn('Could not load captures from storage:', e);
         }
-        // images are stored as individual items
+        // Clean up any old base64 image entries from previous versions
         for (const [id] of this.captures) {
-            const raw = this.storage.getItem(`img:${id}`);
-            if (raw) this.images.set(id, Buffer.from(raw, 'base64'));
+            try { this.storage.removeItem(`img:${id}`); } catch {}
         }
     }
 
     private saveCaptures() {
-        this.storage.setItem('captures', JSON.stringify([...this.captures.values()]));
+        try {
+            this.storage.setItem('captures', JSON.stringify([...this.captures.values()]));
+        } catch (e) {
+            this.console.warn('Could not save captures:', e);
+        }
+    }
+
+    private imgPath(id: string): string {
+        return path.join(this.imgDir, `${id}.jpg`);
     }
 
     private saveImage(id: string, buf: Buffer) {
-        this.storage.setItem(`img:${id}`, buf.toString('base64'));
+        try {
+            fs.writeFileSync(this.imgPath(id), buf);
+        } catch (e) {
+            this.console.warn(`Could not save image ${id}:`, e);
+        }
+    }
+
+    private loadImage(id: string): Buffer | undefined {
+        try {
+            const p = this.imgPath(id);
+            if (fs.existsSync(p)) return fs.readFileSync(p);
+        } catch {}
+        return undefined;
     }
 
     private deleteCapture(id: string) {
-        const old = this.storage.getItem(`img:${id}`);
-        if (old) this.storage.removeItem(`img:${id}`);
+        try { fs.unlinkSync(this.imgPath(id)); } catch {}
         this.captures.delete(id);
-        this.images.delete(id);
         this.saveCaptures();
     }
 
@@ -114,8 +136,7 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
 
         let uiUrl: string;
         try {
-            const authPath = await sdk.endpointManager.getAuthenticatedPath();
-            uiUrl = `${authPath}endpoint/scrypted-detection-trainer/public/`;
+            uiUrl = await sdk.endpointManager.getLocalEndpoint(undefined, { public: true });
         } catch {
             uiUrl = '/endpoint/scrypted-detection-trainer/public/';
         }
@@ -250,7 +271,6 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
         };
 
         this.captures.set(id, record);
-        this.images.set(id, jpeg);
         this.saveImage(id, jpeg);
         this.saveCaptures();
 
@@ -260,19 +280,13 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
     // ── HTTP Handler ──────────────────────────────────────────────────────────
 
     async onRequest(request: HttpRequest, response: HttpResponse) {
-        // Require authentication — reject unauthenticated requests
-        if (!request.username) {
-            response.send('Unauthorized', { code: 401, headers: { 'WWW-Authenticate': 'Basic realm="Detection Trainer"' } });
-            return;
-        }
-
         const url = new URL(request.url, 'http://localhost');
         const path = url.pathname.replace(request.rootPath, '');
 
         // Serve image
         if (path.startsWith('/img/')) {
-            const id = path.slice(5);
-            const img = this.images.get(id);
+            const id = path.slice(5).replace(/[^a-zA-Z0-9_\-]/g, ''); // sanitize
+            const img = this.loadImage(id);
             if (!img) return response.send('Not found', { code: 404 });
             return response.send(img, { headers: { 'Content-Type': 'image/jpeg', 'Cache-Control': 'max-age=3600' } });
         }
@@ -303,6 +317,17 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
             return response.send(JSON.stringify(pending), { headers: { 'Content-Type': 'application/json' } });
         }
 
+        // API: get labeled captures
+        if (path === '/api/labeled') {
+            const page = parseInt(new URL(request.url, 'http://localhost').searchParams.get('page') || '0');
+            const pageSize = 50;
+            const labeled = [...this.captures.values()]
+                .filter(c => c.reviewed)
+                .sort((a, b) => b.timestamp - a.timestamp);
+            const slice = labeled.slice(page * pageSize, (page + 1) * pageSize);
+            return response.send(JSON.stringify({ items: slice, total: labeled.length, page, pageSize }), { headers: { 'Content-Type': 'application/json' } });
+        }
+
         // API: stats
         if (path === '/api/stats') {
             const all = [...this.captures.values()];
@@ -335,7 +360,7 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
             const dataset: { filename: string; content: string; encoding: string }[] = [];
 
             for (const record of labeled) {
-                const img = this.images.get(record.id);
+                const img = this.loadImage(record.id);
                 if (!img) continue;
 
                 const fname = `${record.id}`;
@@ -483,6 +508,7 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
   <div class="card">
     <div class="tab-bar">
       <div class="tab active" onclick="showTab('review')">Review</div>
+      <div class="tab" onclick="showTab('labeled')">Labeled</div>
       <div class="tab" onclick="showTab('stats')">Stats</div>
       <div class="tab" onclick="showTab('export')">Export Dataset</div>
     </div>
@@ -492,6 +518,11 @@ class DetectionTrainer extends ScryptedDeviceBase implements Settings, HttpReque
       <div id="detections-list"></div>
     </div>
 
+    <!-- Labeled tab -->
+    <div class="tab-panel" id="tab-labeled">
+      <div id="labeled-list"></div>
+    </div>
+
     <!-- Stats tab -->
     <div class="tab-panel" id="tab-stats">
       <div class="tab-content">
@@ -649,14 +680,134 @@ function lbKeyHandler(e) {
 }
 
 function showTab(name) {
+  const names = ['review', 'labeled', 'stats', 'export'];
   document.querySelectorAll('.tab').forEach((t, i) => {
-    const names = ['review', 'stats', 'export'];
     t.classList.toggle('active', names[i] === name);
   });
   document.querySelectorAll('.tab-panel').forEach(p => p.classList.remove('active'));
   document.getElementById('tab-' + name).classList.add('active');
   if (name === 'stats') loadStats();
   if (name === 'export') loadExportInfo();
+  if (name === 'labeled') loadLabeled(0);
+}
+
+const LABEL_COLORS = { person:'#4d9', animal:'#d85', face:'#6be', vehicle:'#99d', plate:'#cc9', package:'#fc9', discard:'#a44' };
+
+async function loadLabeled(page) {
+  const list = document.getElementById('labeled-list');
+  list.innerHTML = '<div class="empty"><div style="color:#888">Loading…</div></div>';
+  try {
+    const res = await fetch(BASE + '/api/labeled?page=' + page);
+    const data = await res.json();
+    const { items, total, pageSize } = data;
+    const totalPages = Math.ceil(total / pageSize);
+
+    if (!items.length) {
+      list.innerHTML = '<div class="empty"><div class="icon">🏷️</div><div>No labeled detections yet.</div></div>';
+      return;
+    }
+
+    const pagerHtml = totalPages > 1 ? \`
+      <div style="display:flex;align-items:center;gap:12px;padding:14px 16px;border-top:1px solid #222;font-size:13px;color:#888;">
+        \${page > 0 ? \`<button class="label-btn" onclick="loadLabeled(\${page-1})">← Prev</button>\` : ''}
+        <span>Page \${page+1} of \${totalPages} · \${total} total</span>
+        \${page < totalPages-1 ? \`<button class="label-btn" onclick="loadLabeled(\${page+1})">Next →</button>\` : ''}
+      </div>\` : '';
+
+    list.innerHTML = items.map(r => {
+      const date = new Date(r.timestamp).toLocaleString();
+      const score = Math.round(r.score * 100);
+      const labelColor = LABEL_COLORS[r.label] || '#aaa';
+      return \`
+      <div class="detection" id="ldet-\${r.id}">
+        <div class="detection-imgs">
+          <div class="img-panel">
+            <div class="img-label">Full frame</div>
+            <canvas id="lcanvas-full-\${r.id}" class="det-canvas" width="240" height="160"></canvas>
+          </div>
+          <div class="img-panel">
+            <div class="img-label">Crop</div>
+            <canvas id="lcanvas-crop-\${r.id}" class="det-canvas" width="160" height="160"></canvas>
+          </div>
+        </div>
+        <div class="detection-info">
+          <div class="detection-meta">
+            <div><strong>\${r.cameraName}</strong></div>
+            <div>\${date}</div>
+            <div class="det-class-badge">\${r.detectedClass} \${score}%</div>
+            <div style="display:inline-block;background:#1a1a1a;border:1px solid \${labelColor};color:\${labelColor};font-size:11px;padding:2px 8px;border-radius:4px;">✓ \${r.label}</div>
+          </div>
+          <div style="font-size:12px;color:#888;">Change label:</div>
+          <div class="label-buttons">
+            <button class="label-btn person" onclick="relabel('\${r.id}', 'person')">👤 Person</button>
+            <button class="label-btn animal" onclick="relabel('\${r.id}', 'animal')">🐾 Animal</button>
+            <button class="label-btn face" onclick="relabel('\${r.id}', 'face')">😀 Face</button>
+            <button class="label-btn vehicle" onclick="relabel('\${r.id}', 'vehicle')">🚗 Vehicle</button>
+            <button class="label-btn" onclick="relabel('\${r.id}', 'plate')">🔢 Plate</button>
+            <button class="label-btn" onclick="relabel('\${r.id}', 'package')">📦 Package</button>
+            <button class="label-btn discard" onclick="relabel('\${r.id}', 'discard')">🗑 Discard</button>
+          </div>
+        </div>
+      </div>\`;
+    }).join('') + pagerHtml;
+
+    // Draw bounding boxes
+    for (const r of items) {
+      const img = new Image();
+      img.onload = () => {
+        imgCache.set(r.id, img);
+        // Reuse drawDetection with the labeled canvases
+        const origFull = document.getElementById('canvas-full-' + r.id);
+        const origCrop = document.getElementById('canvas-crop-' + r.id);
+        // Temporarily point to labeled canvases
+        const fakeFull = document.getElementById('lcanvas-full-' + r.id);
+        const fakeCrop = document.getElementById('lcanvas-crop-' + r.id);
+        if (fakeFull) fakeFull.id = 'canvas-full-' + r.id;
+        if (fakeCrop) fakeCrop.id = 'canvas-crop-' + r.id;
+        drawDetection(img, r);
+        if (fakeFull) fakeFull.id = 'lcanvas-full-' + r.id;
+        if (fakeCrop) fakeCrop.id = 'lcanvas-crop-' + r.id;
+        if (fakeFull) fakeFull.onclick = () => openLightbox(r);
+        if (fakeCrop) fakeCrop.onclick = () => openLightbox(r);
+      };
+      img.src = BASE + '/img/' + r.id;
+    }
+  } catch(e) {
+    list.innerHTML = '<div class="empty"><div style="color:#a44">Error: ' + e.message + '</div></div>';
+  }
+}
+
+async function relabel(id, labelVal) {
+  await fetch(BASE + '/api/label', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ id, label: labelVal }),
+  });
+  const el = document.getElementById('ldet-' + id);
+  if (labelVal === 'discard') {
+    if (el) el.remove();
+    toast('Discarded', '#633');
+  } else {
+    // Update the label badge in place
+    const badge = el && el.querySelector('[style*="✓"]');
+    const labelColor = LABEL_COLORS[labelVal] || '#aaa';
+    if (el) {
+      const badges = el.querySelectorAll('.detection-meta > div');
+      badges.forEach(b => { if (b.textContent.startsWith('✓')) b.remove(); });
+      const meta = el.querySelector('.detection-meta');
+      const newBadge = document.createElement('div');
+      newBadge.style.cssText = \`display:inline-block;background:#1a1a1a;border:1px solid \${labelColor};color:\${labelColor};font-size:11px;padding:2px 8px;border-radius:4px;\`;
+      newBadge.textContent = '✓ ' + labelVal;
+      meta.appendChild(newBadge);
+    }
+    toast('Re-labeled: ' + labelVal, '#1a6');
+  }
+  // Refresh stats
+  const statsRes = await fetch(BASE + '/api/stats');
+  const stats = await statsRes.json();
+  document.getElementById('stat-pending').textContent = stats.pending;
+  document.getElementById('stat-labeled').textContent = stats.labeled;
+  document.getElementById('stat-total').textContent = stats.total;
 }
 
 function toast(msg, color='#1a3') {