@blueharford/scrypted-spatial-awareness 0.6.23 → 0.6.25

package/out/main.nodejs.js

@@ -34496,6 +34496,7 @@ class AlertManager {
     }
     /**
      * Get notification title based on alert type
+     * For movement alerts with LLM descriptions, use the smart description as title
      */
     getNotificationTitle(alert) {
         const prefix = alert.severity === 'critical' ? '🚨 ' :
@@ -34506,11 +34507,27 @@ class AlertManager {
             : 'Object';
         switch (alert.type) {
             case 'property_entry':
+                // Legacy - use simple title
                 return `${prefix}${objectType} Arrived`;
             case 'property_exit':
+                // Legacy - use simple title
                 return `${prefix}${objectType} Left`;
             case 'movement':
-                // Include destination in title
+                // For smart activity alerts, use the LLM description as title if available
+                // This gives us rich context like "Person walking toward front door"
+                if (alert.details.objectLabel && alert.details.usedLlm) {
+                    // Truncate to reasonable title length (first sentence or 60 chars)
+                    let smartTitle = alert.details.objectLabel;
+                    const firstPeriod = smartTitle.indexOf('.');
+                    if (firstPeriod > 0 && firstPeriod < 60) {
+                        smartTitle = smartTitle.substring(0, firstPeriod);
+                    }
+                    else if (smartTitle.length > 60) {
+                        smartTitle = smartTitle.substring(0, 57) + '...';
+                    }
+                    return `${prefix}${smartTitle}`;
+                }
+                // Fallback: include destination in title
                 const dest = alert.details.toCameraName || 'area';
                 return `${prefix}${objectType} → ${dest}`;
             case 'unusual_path':
@@ -37334,14 +37351,23 @@ class TrackingEngine {
     recordLlmCall() {
         this.lastLlmCallTime = Date.now();
     }
+    /** Check and record LLM call - returns false if rate limited */
+    tryLlmCall() {
+        if (!this.isLlmCallAllowed()) {
+            this.console.log('[LLM] Rate limited, skipping LLM call');
+            return false;
+        }
+        this.recordLlmCall();
+        return true;
+    }
     /** Get spatial reasoning result for movement (uses RAG + LLM) with debouncing and fallback */
     async getSpatialDescription(tracked, fromCameraId, toCameraId, transitTime, currentCameraId) {
         const fallbackEnabled = this.config.llmFallbackEnabled ?? true;
         const fallbackTimeout = this.config.llmFallbackTimeout ?? 3000;
         try {
             // Check rate limiting - if not allowed, return null to use basic description
-            if (!this.isLlmCallAllowed()) {
-                this.console.log('LLM rate-limited, using basic notification');
+            if (!this.tryLlmCall()) {
+                this.console.log('[Movement] LLM rate-limited, using basic notification');
                 return null;
             }
             // Get snapshot from camera for LLM analysis (if LLM is enabled)
@@ -37352,8 +37378,6 @@ class TrackingEngine {
                     mediaObject = await camera.takePicture();
                 }
             }
-            // Record that we're making an LLM call
-            this.recordLlmCall();
             // Use spatial reasoning engine for rich context-aware description
             // Apply timeout if fallback is enabled
             let result;
@@ -37507,45 +37531,39 @@ class TrackingEngine {
                     this.console.log(`[Entry Alert] Prefetch result: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
                 }
                 catch (e) {
-                    this.console.warn(`[Entry Alert] Prefetch failed, generating fallback: ${e}`);
+                    this.console.warn(`[Entry Alert] Prefetch failed, using basic description: ${e}`);
+                    // Don't make another LLM call - use basic description (no mediaObject = no LLM)
                     spatialResult = await this.spatialReasoning.generateEntryDescription(tracked, sighting.cameraId);
                 }
                 this.pendingDescriptions.delete(globalId);
             }
             else {
-                // Fallback: generate description now (slower path)
-                this.console.log(`[Entry Alert] No prefetch available, generating now`);
-                const mediaObject = this.snapshotCache.get(globalId);
-                spatialResult = await this.spatialReasoning.generateEntryDescription(tracked, sighting.cameraId, mediaObject);
-                this.console.log(`[Entry Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
-            }
-            if (isEntryPoint) {
-                // Entry point - generate property entry alert
-                await this.alertManager.checkAndAlert('property_entry', tracked, {
-                    cameraId: sighting.cameraId,
-                    cameraName: sighting.cameraName,
-                    objectClass: sighting.detection.className,
-                    objectLabel: spatialResult.description,
-                    detectionId: sighting.detectionId,
-                    involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
-                    usedLlm: spatialResult.usedLlm,
-                });
-            }
-            else {
-                // Non-entry point - still alert about activity using movement alert type
-                // This notifies about any activity around the property using topology context
-                await this.alertManager.checkAndAlert('movement', tracked, {
-                    cameraId: sighting.cameraId,
-                    cameraName: sighting.cameraName,
-                    toCameraId: sighting.cameraId,
-                    toCameraName: sighting.cameraName,
-                    objectClass: sighting.detection.className,
-                    objectLabel: spatialResult.description, // Use spatial reasoning description (topology-based)
-                    detectionId: sighting.detectionId,
-                    involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
-                    usedLlm: spatialResult.usedLlm,
-                });
+                // No prefetch available - only call LLM if rate limit allows
+                if (this.tryLlmCall()) {
+                    this.console.log(`[Entry Alert] No prefetch, generating with LLM`);
+                    const mediaObject = this.snapshotCache.get(globalId);
+                    spatialResult = await this.spatialReasoning.generateEntryDescription(tracked, sighting.cameraId, mediaObject);
+                    this.console.log(`[Entry Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
+                }
+                else {
+                    // Rate limited - use basic description (no LLM)
+                    this.console.log(`[Entry Alert] Rate limited, using basic description`);
+                    spatialResult = await this.spatialReasoning.generateEntryDescription(tracked, sighting.cameraId);
+                }
             }
+            // Always use movement alert type for smart notifications with LLM descriptions
+            // The property_entry/property_exit types are legacy and disabled by default
+            await this.alertManager.checkAndAlert('movement', tracked, {
+                cameraId: sighting.cameraId,
+                cameraName: sighting.cameraName,
+                toCameraId: sighting.cameraId,
+                toCameraName: sighting.cameraName,
+                objectClass: sighting.detection.className,
+                objectLabel: spatialResult.description, // Smart LLM-generated description
+                detectionId: sighting.detectionId,
+                involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
+                usedLlm: spatialResult.usedLlm,
+            });
             this.recordAlertTime(globalId);
         }, this.config.loiteringThreshold);
     }
@@ -37558,9 +37576,9 @@ class TrackingEngine {
                 if (mediaObject) {
                     this.snapshotCache.set(globalId, mediaObject);
                     this.console.log(`[Snapshot] Cached snapshot for ${globalId.slice(0, 8)} from ${cameraId}`);
-                    // Start LLM analysis immediately in parallel (don't await)
+                    // Start LLM analysis immediately in parallel (don't await) - but respect rate limits
                     const tracked = this.state.getObject(globalId);
-                    if (tracked && this.config.useLlmDescriptions) {
+                    if (tracked && this.config.useLlmDescriptions && this.tryLlmCall()) {
                         this.console.log(`[LLM Prefetch] Starting ${eventType} analysis for ${globalId.slice(0, 8)}`);
                         const descriptionPromise = eventType === 'exit'
                             ? this.spatialReasoning.generateExitDescription(tracked, cameraId, mediaObject)
@@ -37573,6 +37591,9 @@ class TrackingEngine {
                             this.console.warn(`[LLM Prefetch] Failed for ${globalId.slice(0, 8)}: ${e}`);
                         });
                     }
+                    else if (tracked && this.config.useLlmDescriptions) {
+                        this.console.log(`[LLM Prefetch] Skipped for ${globalId.slice(0, 8)} - rate limited`);
+                    }
                 }
             }
         }
@@ -37641,21 +37662,32 @@ class TrackingEngine {
                         this.console.log(`[Exit Alert] Prefetch result: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
                     }
                     catch (e) {
-                        this.console.warn(`[Exit Alert] Prefetch failed, generating fallback: ${e}`);
+                        this.console.warn(`[Exit Alert] Prefetch failed, using basic description: ${e}`);
+                        // Don't make another LLM call - use basic description
                         spatialResult = await this.spatialReasoning.generateExitDescription(current, sighting.cameraId);
                     }
                     this.pendingDescriptions.delete(tracked.globalId);
                 }
                 else {
-                    // Fallback: generate description now (slower path)
-                    this.console.log(`[Exit Alert] No prefetch available, generating now`);
-                    const mediaObject = this.snapshotCache.get(tracked.globalId);
-                    spatialResult = await this.spatialReasoning.generateExitDescription(current, sighting.cameraId, mediaObject);
-                    this.console.log(`[Exit Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
+                    // No prefetch available - only call LLM if rate limit allows
+                    if (this.tryLlmCall()) {
+                        this.console.log(`[Exit Alert] No prefetch, generating with LLM`);
+                        const mediaObject = this.snapshotCache.get(tracked.globalId);
+                        spatialResult = await this.spatialReasoning.generateExitDescription(current, sighting.cameraId, mediaObject);
+                        this.console.log(`[Exit Alert] Got description: "${spatialResult.description.substring(0, 60)}...", usedLlm=${spatialResult.usedLlm}`);
+                    }
+                    else {
+                        // Rate limited - use basic description (no LLM)
+                        this.console.log(`[Exit Alert] Rate limited, using basic description`);
+                        spatialResult = await this.spatialReasoning.generateExitDescription(current, sighting.cameraId);
+                    }
                 }
-                await this.alertManager.checkAndAlert('property_exit', current, {
+                // Use movement alert for exit too - smart notifications with LLM descriptions
+                await this.alertManager.checkAndAlert('movement', current, {
                     cameraId: sighting.cameraId,
                     cameraName: sighting.cameraName,
+                    toCameraId: sighting.cameraId,
+                    toCameraName: sighting.cameraName,
                     objectClass: current.className,
                     objectLabel: spatialResult.description,
                     involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
@@ -39191,8 +39223,8 @@ class SpatialAwarenessPlugin extends sdk_1.ScryptedDeviceBase {
         llmDebounceInterval: {
             title: 'LLM Rate Limit (seconds)',
             type: 'number',
-            defaultValue: 10,
-            description: 'Minimum time between LLM calls to prevent API overload (0 = no limit)',
+            defaultValue: 30,
+            description: 'Minimum time between LLM calls to prevent API rate limiting. Increase if you get rate limit errors. (0 = no limit)',
             group: 'AI & Spatial Reasoning',
         },
         llmFallbackEnabled: {
@@ -41207,8 +41239,8 @@ function createDefaultRules() {
     return [
         {
             id: 'property-entry',
-            name: 'Property Entry',
-            enabled: true,
+            name: 'Property Entry (Legacy)',
+            enabled: false, // Disabled - use movement alerts with LLM descriptions instead
             type: 'property_entry',
             conditions: [],
             severity: 'info',
@@ -41217,8 +41249,8 @@ function createDefaultRules() {
         },
         {
             id: 'property-exit',
-            name: 'Property Exit',
-            enabled: true,
+            name: 'Property Exit (Legacy)',
+            enabled: false, // Disabled - use movement alerts with LLM descriptions instead
             type: 'property_exit',
             conditions: [],
             severity: 'info',
@@ -41227,7 +41259,7 @@ function createDefaultRules() {
         },
         {
             id: 'movement',
-            name: 'Movement Between Cameras',
+            name: 'Smart Activity Alerts',
             enabled: true,
             type: 'movement',
             conditions: [],