Oti su mi mehn

pages/1_Live_Detection.py

@@ -51,24 +51,36 @@ def autoplay_audio(audio_bytes: bytes):
 
 # --- WebRTC Video Processor ---
 class VideoProcessor(VideoProcessorBase):
-    def __init__(self):
+    def __init__(self, status_queue: queue.Queue, audio_queue: queue.Queue):
+        self.status_queue = status_queue
+        self.audio_queue = audio_queue
         self._detector = get_detector(config)
         self._alerter = get_alerter(config, secrets["gemini_api_key"])
-        # Thread-safe queues for communication
-        self.status_queue = queue.Queue()
-        self.audio_queue = queue.Queue()
 
     def recv(self, frame: av.VideoFrame) -> av.VideoFrame:
         img = frame.to_ndarray(format="bgr24")
         
         strategy = config.get('detection_strategy')
+        
+        # The return signature of process_frame varies by strategy.
+        # We need to handle each case correctly.
         if strategy == 'hybrid':
             processed_frame, alert_triggered, active_alerts = self._detector.process_frame(img)
-            self.status_queue.put(active_alerts if alert_triggered else {"status": "Awake"})
-        else:
+            self.status_queue.put(active_alerts if alert_triggered or 'Low Light' in active_alerts else {"status": "Awake"})
+        elif strategy == 'geometric':
+            # The geometric processor returns frame, indicators, and landmarks.
+            processed_frame, indicators, _ = self._detector.process_frame(img)
+            alert_triggered = any(v for k, v in indicators.items() if k not in ['low_light', 'details'])
+            self.status_queue.put(indicators if alert_triggered or indicators.get('low_light') else {"status": "Awake"})
+        elif strategy == 'cnn_model':
+            # The cnn_model processor returns frame and indicators.
             processed_frame, indicators = self._detector.process_frame(img)
             alert_triggered = any(indicators.values())
             self.status_queue.put(indicators if alert_triggered else {"status": "Awake"})
+        else:
+            # Default case if strategy is unknown
+            processed_frame = img
+            alert_triggered = False
 
         if alert_triggered:
             audio_data = self._alerter.trigger_alert()
@@ -78,6 +90,8 @@ class VideoProcessor(VideoProcessorBase):
             self._alerter.reset_alert()
             
         return av.VideoFrame.from_ndarray(processed_frame, format="bgr24")
+    
+    
 # --- Page UI ---
 st.title("📹 Live Drowsiness Detection")
 st.info("Press 'START' to activate your camera and begin monitoring.")