@blueharford/scrypted-spatial-awareness 0.4.6 → 0.4.8-beta.1

package/src/core/tracking-engine.ts

@@ -516,31 +516,61 @@ export class TrackingEngine {
         `(ID: ${globalId.slice(0, 8)})`
       );
 
-      // Generate entry alert if this is an entry point
-      // Entry alerts also respect loitering threshold and cooldown
-      if (isEntryPoint && this.passesLoiteringThreshold(tracked) && !this.isInAlertCooldown(globalId)) {
-        // Get spatial reasoning for entry event
-        const spatialResult = await this.getSpatialDescription(
-          tracked,
-          'outside', // Virtual "outside" location for entry
-          sighting.cameraId,
-          0,
-          sighting.cameraId
-        );
+      // Schedule loitering check - alert after object passes loitering threshold
+      // This ensures we don't miss alerts for brief appearances while still filtering noise
+      this.scheduleLoiteringAlert(globalId, sighting, isEntryPoint);
+    }
+  }
+
+  /** Schedule an alert after loitering threshold passes */
+  private scheduleLoiteringAlert(
+    globalId: GlobalTrackingId,
+    sighting: ObjectSighting,
+    isEntryPoint: boolean
+  ): void {
+    // Check after loitering threshold if object is still being tracked
+    setTimeout(async () => {
+      const tracked = this.state.getObject(globalId);
+      if (!tracked || tracked.state !== 'active') return;
+
+      // Check if we've already alerted for this object
+      if (this.isInAlertCooldown(globalId)) return;
+
+      // Generate spatial description
+      const spatialResult = this.spatialReasoning.generateEntryDescription(
+        tracked,
+        sighting.cameraId
+      );
 
+      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 || sighting.detection.label,
+          objectLabel: spatialResult.description,
           detectionId: sighting.detectionId,
-          involvedLandmarks: spatialResult?.involvedLandmarks?.map(l => l.name),
-          usedLlm: spatialResult?.usedLlm,
+          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,
         });
-
-        this.recordAlertTime(globalId);
       }
-    }
+
+      this.recordAlertTime(globalId);
+    }, this.config.loiteringThreshold);
   }
 
   /** Attempt to correlate a sighting with existing tracked objects */
@@ -596,15 +626,23 @@ export class TrackingEngine {
       if (current && current.state === 'pending') {
         this.state.markExited(tracked.globalId, sighting.cameraId, sighting.cameraName);
 
+        // Generate rich exit description using topology context
+        const spatialResult = this.spatialReasoning.generateExitDescription(
+          current,
+          sighting.cameraId
+        );
+
         this.console.log(
-          `Object ${tracked.globalId.slice(0, 8)} exited via ${sighting.cameraName}`
+          `Object ${tracked.globalId.slice(0, 8)} exited: ${spatialResult.description}`
         );
 
         await this.alertManager.checkAndAlert('property_exit', current, {
           cameraId: sighting.cameraId,
           cameraName: sighting.cameraName,
           objectClass: current.className,
-          objectLabel: current.label,
+          objectLabel: spatialResult.description,
+          involvedLandmarks: spatialResult.involvedLandmarks?.map(l => l.name),
+          usedLlm: spatialResult.usedLlm,
         });
       }
       this.pendingTimers.delete(tracked.globalId);

package/src/main.ts

@@ -78,8 +78,8 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
     correlationThreshold: {
       title: 'Correlation Confidence Threshold',
       type: 'number',
-      defaultValue: 0.6,
-      description: 'Minimum confidence (0-1) for automatic object correlation',
+      defaultValue: 0.35,
+      description: 'Minimum confidence (0-1) for automatic object correlation. Lower values allow more matches.',
       group: 'Tracking',
     },
     lostTimeout: {
@@ -324,7 +324,7 @@ export class SpatialAwarenessPlugin extends ScryptedDeviceBase
 
     const config: TrackingEngineConfig = {
       correlationWindow: (this.storageSettings.values.correlationWindow as number || 30) * 1000,
-      correlationThreshold: this.storageSettings.values.correlationThreshold as number || 0.6,
+      correlationThreshold: this.storageSettings.values.correlationThreshold as number || 0.35,
       lostTimeout: (this.storageSettings.values.lostTimeout as number || 300) * 1000,
       useVisualMatching: this.storageSettings.values.useVisualMatching as boolean ?? true,
       loiteringThreshold: (this.storageSettings.values.loiteringThreshold as number || 3) * 1000,

package/src/models/alert.ts

@@ -214,26 +214,53 @@ export function generateAlertMessage(
 
   switch (type) {
     case 'property_entry':
-      return `${objectDesc} entered property via ${details.cameraName || 'unknown camera'}`;
+      // Use the rich description from spatial reasoning if available
+      if (details.objectLabel && details.objectLabel !== details.objectClass) {
+        return details.objectLabel;
+      }
+      // Fallback to basic description
+      if (details.involvedLandmarks && details.involvedLandmarks.length > 0) {
+        return `${objectDesc} entered property near ${details.involvedLandmarks[0]}`;
+      }
+      return `${objectDesc} entered property at ${details.cameraName || 'entrance'}`;
     case 'property_exit':
-      return `${objectDesc} exited property via ${details.cameraName || 'unknown camera'}`;
+      // Use the rich description from spatial reasoning if available
+      if (details.objectLabel && details.objectLabel !== details.objectClass) {
+        return details.objectLabel;
+      }
+      // Fallback to basic description
+      if (details.involvedLandmarks && details.involvedLandmarks.length > 0) {
+        return `${objectDesc} left property via ${details.involvedLandmarks[0]}`;
+      }
+      return `${objectDesc} left property`;
     case 'movement':
-      // If we have a rich description from LLM/RAG, use it
-      if (details.objectLabel && details.usedLlm) {
+      // If objectLabel contains a full description, use it directly
+      if (details.objectLabel && details.objectLabel !== details.objectClass) {
+        // Check if this is a cross-camera movement or initial detection
+        if (details.fromCameraId && details.fromCameraId !== details.toCameraId && details.transitTime) {
+          const transitSecs = Math.round(details.transitTime / 1000);
+          const transitStr = transitSecs > 0 ? ` (${transitSecs}s)` : '';
+          const pathContext = details.pathDescription ? ` via ${details.pathDescription}` : '';
+          return `${details.objectLabel}${pathContext}${transitStr}`;
+        }
+        // Initial detection - use the label directly
+        return details.objectLabel;
+      }
+      // Cross-camera movement with basic info
+      if (details.fromCameraId && details.fromCameraId !== details.toCameraId) {
         const transitSecs = details.transitTime ? Math.round(details.transitTime / 1000) : 0;
-        const transitStr = transitSecs > 0 ? ` (${transitSecs}s)` : '';
-        // Include path/landmark context if available
-        const pathContext = details.pathDescription ? ` via ${details.pathDescription}` : '';
-        return `${details.objectLabel}${pathContext}${transitStr}`;
+        const transitStr = transitSecs > 0 ? ` (${transitSecs}s transit)` : '';
+        let movementDesc = `${objectDesc} moving from ${details.fromCameraName || 'unknown'} towards ${details.toCameraName || 'unknown'}`;
+        if (details.involvedLandmarks && details.involvedLandmarks.length > 0) {
+          movementDesc += ` near ${details.involvedLandmarks.join(', ')}`;
+        }
+        return `${movementDesc}${transitStr}`;
       }
-      // Fallback to basic message with landmark info
-      const transitSecs = details.transitTime ? Math.round(details.transitTime / 1000) : 0;
-      const transitStr = transitSecs > 0 ? ` (${transitSecs}s transit)` : '';
-      let movementDesc = `${objectDesc} moving from ${details.fromCameraName || 'unknown'} towards ${details.toCameraName || 'unknown'}`;
+      // Initial detection without full label
       if (details.involvedLandmarks && details.involvedLandmarks.length > 0) {
-        movementDesc += ` near ${details.involvedLandmarks.join(', ')}`;
+        return `${objectDesc} detected near ${details.involvedLandmarks[0]}`;
       }
-      return `${movementDesc}${transitStr}`;
+      return `${objectDesc} detected at ${details.cameraName || 'camera'}`;
     case 'unusual_path':
       return `${objectDesc} took unusual path: ${details.actualPath || 'unknown'}`;
     case 'dwell_time':