@blueharford/scrypted-spatial-awareness 0.6.26 → 0.6.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueharford/scrypted-spatial-awareness",
-  "version": "0.6.26",
+  "version": "0.6.28",
   "description": "Cross-camera object tracking for Scrypted NVR with spatial awareness",
   "author": "Joshua Seidel <blueharford>",
   "license": "Apache-2.0",

package/src/core/spatial-reasoning.ts

@@ -33,6 +33,8 @@ const { systemManager, mediaManager } = sdk;
 export interface SpatialReasoningConfig {
   /** Enable LLM-based descriptions */
   enableLlm: boolean;
+  /** Specific LLM device IDs to use (if not set, auto-discovers all) */
+  llmDeviceIds?: string[];
   /** Enable landmark learning/suggestions */
   enableLandmarkLearning: boolean;
   /** Minimum confidence for landmark suggestions */
@@ -447,43 +449,47 @@ export class SpatialReasoningEngine {
   }> = [];
   private llmIndex: number = 0;
 
-  /** Find ALL LLM devices for load balancing */
+  /** Find LLM devices - uses configured devices or auto-discovers all for load balancing */
   private async findAllLlmDevices(): Promise<void> {
     if (this.llmSearched) return;
     this.llmSearched = true;
 
     try {
+      // If specific LLM devices are configured, use only those
+      if (this.config.llmDeviceIds && this.config.llmDeviceIds.length > 0) {
+        for (const deviceId of this.config.llmDeviceIds) {
+          const device = systemManager.getDeviceById(deviceId);
+          if (device?.interfaces?.includes('ChatCompletion')) {
+            const providerTypeEnum = this.detectProviderType(device);
+            this.llmDevices.push({
+              device: device as unknown as ChatCompletionDevice,
+              id: deviceId,
+              name: device.name || deviceId,
+              providerType: providerTypeEnum,
+              lastUsed: 0,
+              errorCount: 0,
+            });
+            this.console.log(`[LLM] Using configured LLM: ${device.name}`);
+          } else {
+            this.console.warn(`[LLM] Configured device ${deviceId} not found or doesn't support ChatCompletion`);
+          }
+        }
+
+        if (this.llmDevices.length > 0) {
+          this.console.log(`[LLM] Using ${this.llmDevices.length} configured LLM provider(s)`);
+          return;
+        }
+        // Fall through to auto-discovery if none of the configured devices worked
+        this.console.warn('[LLM] No configured devices available, falling back to auto-discovery');
+      }
+
+      // Auto-discover all LLM devices for load balancing
       for (const id of Object.keys(systemManager.getSystemState())) {
         const device = systemManager.getDeviceById(id);
         if (!device) continue;
 
         if (device.interfaces?.includes('ChatCompletion')) {
-          const deviceName = device.name?.toLowerCase() || '';
-          const pluginId = (device as any).pluginId?.toLowerCase() || '';
-
-          // Identify the provider type for image format selection
-          let providerType = 'Unknown';
-          let providerTypeEnum: LlmProvider = 'unknown';
-
-          if (deviceName.includes('openai') || deviceName.includes('gpt')) {
-            providerType = 'OpenAI';
-            providerTypeEnum = 'openai';
-          } else if (deviceName.includes('anthropic') || deviceName.includes('claude')) {
-            providerType = 'Anthropic';
-            providerTypeEnum = 'anthropic';
-          } else if (deviceName.includes('ollama')) {
-            providerType = 'Ollama';
-            providerTypeEnum = 'openai';
-          } else if (deviceName.includes('gemini') || deviceName.includes('google')) {
-            providerType = 'Google';
-            providerTypeEnum = 'openai';
-          } else if (deviceName.includes('llama')) {
-            providerType = 'llama.cpp';
-            providerTypeEnum = 'openai';
-          } else if (pluginId.includes('@scrypted/llm') || pluginId.includes('llm')) {
-            providerType = 'Scrypted LLM';
-            providerTypeEnum = 'unknown';
-          }
+          const providerTypeEnum = this.detectProviderType(device);
 
           this.llmDevices.push({
             device: device as unknown as ChatCompletionDevice,
@@ -494,7 +500,7 @@ export class SpatialReasoningEngine {
             errorCount: 0,
           });
 
-          this.console.log(`[LLM] Found ${providerType}: ${device.name}`);
+          this.console.log(`[LLM] Auto-discovered: ${device.name}`);
         }
       }
 
@@ -508,6 +514,27 @@ export class SpatialReasoningEngine {
     }
   }
 
+  /** Detect the provider type from device name */
+  private detectProviderType(device: ScryptedDevice): LlmProvider {
+    const deviceName = device.name?.toLowerCase() || '';
+    const pluginId = (device as any).pluginId?.toLowerCase() || '';
+
+    if (deviceName.includes('openai') || deviceName.includes('gpt')) {
+      return 'openai';
+    } else if (deviceName.includes('anthropic') || deviceName.includes('claude')) {
+      return 'anthropic';
+    } else if (deviceName.includes('ollama')) {
+      return 'openai'; // Ollama uses OpenAI-compatible format
+    } else if (deviceName.includes('gemini') || deviceName.includes('google')) {
+      return 'openai'; // Google uses OpenAI-compatible format
+    } else if (deviceName.includes('llama')) {
+      return 'openai'; // llama.cpp uses OpenAI-compatible format
+    } else if (pluginId.includes('@scrypted/llm') || pluginId.includes('llm')) {
+      return 'unknown';
+    }
+    return 'unknown';
+  }
+
   /** Get the next available LLM using round-robin with least-recently-used preference */
   private async findLlmDevice(): Promise<ChatCompletionDevice | null> {
     await this.findAllLlmDevices();

package/src/core/tracking-engine.ts

@@ -63,6 +63,8 @@ export interface TrackingEngineConfig {
   objectAlertCooldown: number;
   /** Use LLM for enhanced descriptions */
   useLlmDescriptions: boolean;
+  /** Specific LLM device IDs to use (if not set, auto-discovers all for load balancing) */
+  llmDeviceIds?: string[];
   /** LLM rate limit interval (ms) - minimum time between LLM calls */
   llmDebounceInterval?: number;
   /** Whether to fall back to basic notifications when LLM is unavailable or slow */
@@ -161,6 +163,7 @@ export class TrackingEngine {
     // Initialize spatial reasoning engine
     const spatialConfig: SpatialReasoningConfig = {
       enableLlm: config.useLlmDescriptions,
+      llmDeviceIds: config.llmDeviceIds,
       enableLandmarkLearning: config.enableLandmarkLearning ?? true,
       landmarkConfidenceThreshold: config.landmarkConfidenceThreshold ?? 0.7,
       contextCacheTtl: 60000, // 1 minute cache

package/src/main.ts

@@ -237,20 +237,22 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       group: 'MQTT Integration',
     },
 
-    // Alert Settings
-    enableAlerts: {
-      title: 'Enable Alerts',
-      type: 'boolean',
-      defaultValue: true,
-      group: 'Alerts',
+    // Integrations
+    llmDevices: {
+      title: 'LLM Providers',
+      type: 'device',
+      multiple: true,
+      deviceFilter: `interfaces.includes('ChatCompletion')`,
+      description: 'Select one or more LLM providers for smart descriptions. Multiple providers will be load-balanced.',
+      group: 'Integrations',
     },
     defaultNotifiers: {
-      title: 'Notifiers',
+      title: 'Notification Service',
       type: 'device',
       multiple: true,
       deviceFilter: `interfaces.includes('${ScryptedInterface.Notifier}')`,
-      description: 'Select one or more notifiers to receive alerts',
-      group: 'Alerts',
+      description: 'Select one or more notifiers to receive alerts (e.g., Pushover, Home Assistant)',
+      group: 'Integrations',
     },
 
     // Tracked Cameras
@@ -262,13 +264,6 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       group: 'Cameras',
       description: 'Select cameras with object detection to track',
     },
-
-    // Alert Rules (stored as JSON)
-    alertRules: {
-      title: 'Alert Rules',
-      type: 'string',
-      hide: true,
-    },
   });
 
   constructor(nativeId?: ScryptedNativeId) {
@@ -368,7 +363,8 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       loiteringThreshold: (this.storageSettings.values.loiteringThreshold as number || 3) * 1000,
       objectAlertCooldown: (this.storageSettings.values.objectAlertCooldown as number || 30) * 1000,
       useLlmDescriptions: this.storageSettings.values.useLlmDescriptions as boolean ?? true,
-      llmDebounceInterval: (this.storageSettings.values.llmDebounceInterval as number || 10) * 1000,
+      llmDeviceIds: this.parseLlmDevices(),
+      llmDebounceInterval: (this.storageSettings.values.llmDebounceInterval as number || 30) * 1000,
       llmFallbackEnabled: this.storageSettings.values.llmFallbackEnabled as boolean ?? true,
       llmFallbackTimeout: (this.storageSettings.values.llmFallbackTimeout as number || 3) * 1000,
       enableTransitTimeLearning: this.storageSettings.values.enableTransitTimeLearning as boolean ?? true,
@@ -422,6 +418,36 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     }
   }
 
+  /** Parse LLM devices from settings - handles both array and single value formats */
+  private parseLlmDevices(): string[] | undefined {
+    const value = this.storageSettings.values.llmDevices;
+    if (!value) return undefined;
+
+    // Handle array format
+    if (Array.isArray(value)) {
+      const filtered = value.filter(Boolean);
+      return filtered.length > 0 ? filtered : undefined;
+    }
+
+    // Handle JSON string format
+    if (typeof value === 'string') {
+      try {
+        const parsed = JSON.parse(value);
+        if (Array.isArray(parsed)) {
+          const filtered = parsed.filter(Boolean);
+          return filtered.length > 0 ? filtered : undefined;
+        }
+        // Single device ID string
+        return value ? [value] : undefined;
+      } catch {
+        // Not JSON, treat as single device ID
+        return value ? [value] : undefined;
+      }
+    }
+
+    return undefined;
+  }
+
   // ==================== DeviceProvider Implementation ====================
 
   async getDevice(nativeId: string): Promise<any> {
@@ -697,95 +723,21 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     // ==================== 5. Tracking ====================
     addGroup('Tracking');
 
-    // ==================== 6. AI & Spatial Reasoning ====================
+    // ==================== 6. Integrations ====================
+    addGroup('Integrations');
+
+    // ==================== 7. AI & Spatial Reasoning ====================
     addGroup('AI & Spatial Reasoning');
 
-    // ==================== 7. Auto-Topology Discovery ====================
+    // ==================== 8. Auto-Topology Discovery ====================
     addGroup('Auto-Topology Discovery');
 
-    // ==================== 8. Alerts ====================
-    addGroup('Alerts');
-
-    // Add alert rules configuration UI
-    const alertRules = this.alertManager.getRules();
-    const rulesHtml = this.generateAlertRulesHtml(alertRules);
-    settings.push({
-      key: 'alertRulesEditor',
-      title: 'Alert Rules',
-      type: 'html' as any,
-      value: rulesHtml,
-      group: 'Alerts',
-    });
-
     // ==================== 9. MQTT Integration ====================
     addGroup('MQTT Integration');
 
     return settings;
   }
 
-  private generateAlertRulesHtml(rules: any[]): string {
-    const ruleRows = rules.map(rule => `
-      <tr data-rule-id="${rule.id}">
-        <td style="padding:8px;border-bottom:1px solid #333;">
-          <input type="checkbox" ${rule.enabled ? 'checked' : ''}
-                 onchange="(function(el){var rules=JSON.parse(localStorage.getItem('sa-temp-rules')||'[]');var r=rules.find(x=>x.id==='${rule.id}');if(r)r.enabled=el.checked;localStorage.setItem('sa-temp-rules',JSON.stringify(rules));})(this)" />
-        </td>
-        <td style="padding:8px;border-bottom:1px solid #333;color:#fff;">${rule.name}</td>
-        <td style="padding:8px;border-bottom:1px solid #333;color:#888;">${rule.type}</td>
-        <td style="padding:8px;border-bottom:1px solid #333;">
-          <span style="padding:2px 8px;border-radius:4px;font-size:12px;background:${
-            rule.severity === 'critical' ? '#e94560' :
-            rule.severity === 'warning' ? '#f39c12' : '#3498db'
-          };color:white;">${rule.severity}</span>
-        </td>
-        <td style="padding:8px;border-bottom:1px solid #333;color:#888;">${Math.round(rule.cooldown / 1000)}s</td>
-      </tr>
-    `).join('');
-
-    const initCode = `localStorage.setItem('sa-temp-rules',JSON.stringify(${JSON.stringify(rules)}))`;
-    const saveCode = `(function(){var rules=JSON.parse(localStorage.getItem('sa-temp-rules')||'[]');fetch('/endpoint/@blueharford/scrypted-spatial-awareness/api/alert-rules',{method:'PUT',headers:{'Content-Type':'application/json'},body:JSON.stringify(rules)}).then(r=>r.json()).then(d=>{if(d.success)alert('Alert rules saved!');else alert('Error: '+d.error);}).catch(e=>alert('Error: '+e));})()`;
-
-    return `
-      <style>
-        .sa-rules-table { width:100%; border-collapse:collapse; margin-top:10px; }
-        .sa-rules-table th { text-align:left; padding:10px 8px; border-bottom:2px solid #e94560; color:#e94560; font-size:13px; }
-        .sa-save-rules-btn {
-          background: linear-gradient(135deg, #27ae60 0%, #2ecc71 100%);
-          color: white;
-          border: none;
-          padding: 10px 20px;
-          border-radius: 6px;
-          font-size: 14px;
-          font-weight: 600;
-          cursor: pointer;
-          margin-top: 15px;
-        }
-        .sa-save-rules-btn:hover { opacity: 0.9; }
-        .sa-rules-container { background:#16213e; border-radius:8px; padding:15px; }
-        .sa-rules-desc { color:#888; font-size:13px; margin-bottom:10px; }
-      </style>
-      <div class="sa-rules-container">
-        <p class="sa-rules-desc">Enable or disable alert types. Movement alerts notify you when someone moves between cameras.</p>
-        <table class="sa-rules-table">
-          <thead>
-            <tr>
-              <th style="width:40px;">On</th>
-              <th>Alert Type</th>
-              <th>Event</th>
-              <th>Severity</th>
-              <th>Cooldown</th>
-            </tr>
-          </thead>
-          <tbody>
-            ${ruleRows}
-          </tbody>
-        </table>
-        <button class="sa-save-rules-btn" onclick="${saveCode}">Save Alert Rules</button>
-        <script>(function(){${initCode}})();</script>
-      </div>
-    `;
-  }
-
   async putSetting(key: string, value: SettingValue): Promise<void> {
     await this.storageSettings.putSetting(key, value);
 
@@ -802,6 +754,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
       key === 'llmDebounceInterval' ||
       key === 'llmFallbackEnabled' ||
       key === 'llmFallbackTimeout' ||
+      key === 'llmDevices' ||
       key === 'enableTransitTimeLearning' ||
       key === 'enableConnectionSuggestions' ||
       key === 'enableLandmarkLearning' ||