scrypted-detection-trainer 0.1.2 → 0.1.3

package/out/main.nodejs.js

@@ -1624,15 +1624,16 @@ class DetectionTrainer extends sdk_1.ScryptedDeviceBase {
             {
                 key: 'info',
                 title: 'Detection Trainer',
-                description: `${this.captures.size} captures stored (${[...this.captures.values()].filter(c => !c.reviewed).length} pending review, ${[...this.captures.values()].filter(c => c.reviewed && c.label !== 'discard').length} labeled). Open the web UI to review and export.`,
+                description: `${this.captures.size} captures stored (${[...this.captures.values()].filter(c => !c.reviewed).length} pending review, ${[...this.captures.values()].filter(c => c.reviewed && c.label !== 'discard').length} labeled).`,
                 readonly: true,
                 value: '',
             },
             {
-                key: 'open_ui',
-                title: 'Open Review UI',
+                key: 'ui_link',
+                title: 'Review UI',
                 description: 'Open the detection review and labeling interface.',
-                type: 'button',
+                readonly: true,
+                value: await sdk_1.default.endpointManager.getLocalEndpoint('scrypted-detection-trainer', { public: true }).catch(() => '/endpoint/scrypted-detection-trainer/public/'),
             },
         ];
         for (const cam of cameras) {
@@ -1649,7 +1650,7 @@ class DetectionTrainer extends sdk_1.ScryptedDeviceBase {
         return settings;
     }
     async putSetting(key, value) {
-        if (key === 'open_ui')
+        if (key === 'open_ui' || key === 'ui_link' || key === 'info')
             return;
         this.storage.setItem(key, value);
         if (key.startsWith('rate:')) {
@@ -1853,6 +1854,7 @@ class DetectionTrainer extends sdk_1.ScryptedDeviceBase {
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <title>Detection Trainer</title>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script>
 <style>
   * { box-sizing: border-box; margin: 0; padding: 0; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif; background: #0f0f0f; color: #e8e8e8; min-height: 100vh; }
@@ -1979,10 +1981,14 @@ class DetectionTrainer extends sdk_1.ScryptedDeviceBase {
 <div class="toast" id="toast"></div>
 
 <script>
-const BASE = location.pathname.replace(/\\/$/, '');
+const BASE = location.pathname.replace(/\/$/, '');
 let pending = [];
 let labeledCount = 0;
 
+function imgError(img) {
+  img.parentElement.innerHTML = '<div style="padding:20px;color:#555;font-size:12px;text-align:center">No image</div>';
+}
+
 function showTab(name) {
   document.querySelectorAll('.tab').forEach((t, i) => {
     const names = ['review', 'stats', 'export'];
@@ -2024,7 +2030,7 @@ async function loadPending() {
     return \`
     <div class="detection" id="det-\${r.id}">
       <div class="detection-img">
-        <img src="\${BASE}/img/\${r.id}" alt="\${r.detectedClass}" loading="lazy" onerror="this.parentElement.innerHTML='<div style=\\"padding:20px;color:#555;font-size:12px;text-align:center\\">Image unavailable</div>'">
+        <img src="\${BASE}/img/\${r.id}" alt="\${r.detectedClass}" loading="lazy" onerror="imgError(this)">
         <div class="detection-class">\${r.detectedClass} \${score}%</div>
       </div>
       <div class="detection-info">
@@ -2095,7 +2101,7 @@ async function exportDataset() {
   const btn = document.getElementById('export-btn');
   const status = document.getElementById('export-status');
   btn.disabled = true;
-  status.textContent = 'Preparing…';
+  status.textContent = 'Fetching data…';
 
   try {
     const res = await fetch(BASE + '/api/export');
@@ -2103,13 +2109,22 @@ async function exportDataset() {
     const data = await res.json();
     if (data.error) { status.textContent = data.error; btn.disabled = false; return; }
 
-    // Build a zip-like structure using a self-extracting HTML page
-    // Actually just download as a JSON bundle that train.py can consume
-    const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' });
+    status.textContent = 'Building zip…';
+
+    const zip = new JSZip();
+    for (const f of data.files) {
+      if (f.encoding === 'base64') {
+        zip.file(f.filename, f.content, { base64: true });
+      } else {
+        zip.file(f.filename, f.content);
+      }
+    }
+
+    const blob = await zip.generateAsync({ type: 'blob', compression: 'DEFLATE' });
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
-    a.download = 'scrypted_dataset_' + new Date().toISOString().slice(0,10) + '.json';
+    a.download = 'scrypted_dataset_' + new Date().toISOString().slice(0,10) + '.zip';
     a.click();
     URL.revokeObjectURL(url);
     status.textContent = \`Downloaded \${data.count} samples.\`;