WIP: Fix on Cam part hopefully

pages/1_Live_Detection.py

@@ -30,12 +30,6 @@ def load_app_config():
 
 config, secrets = load_app_config()
 
-# --- Initialize Session State for Queues at the TOP of the script ---
-if "status_queue" not in st.session_state:
-    st.session_state.status_queue = queue.Queue()
-if "audio_queue" not in st.session_state:
-    st.session_state.audio_queue = queue.Queue()
-
 # --- Client-Side Audio Playback Function ---
 def autoplay_audio(audio_bytes: bytes):
     """Injects HTML to autoplay audio in the user's browser."""
@@ -49,12 +43,12 @@ def autoplay_audio(audio_bytes: bytes):
 
 # --- WebRTC Video Processor ---
 class VideoProcessor(VideoProcessorBase):
-    # The __init__ method now accepts the queues as arguments
-    def __init__(self, status_queue: queue.Queue, audio_queue: queue.Queue):
-        self.status_queue = status_queue
-        self.audio_queue = audio_queue
+    def __init__(self):
         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")
@@ -62,23 +56,20 @@ class VideoProcessor(VideoProcessorBase):
         strategy = config.get('detection_strategy')
         if strategy == 'hybrid':
             processed_frame, alert_triggered, active_alerts = self._detector.process_frame(img)
-            # Use self.status_queue.put() instead of st.session_state
-            self.status_queue.put(active_alerts if alert_triggered or 'Low Light' in active_alerts else {"status": "Awake"})
+            self.status_queue.put(active_alerts if alert_triggered else {"status": "Awake"})
         else:
             processed_frame, indicators = self._detector.process_frame(img)
-            alert_triggered = any(v for k, v in indicators.items() if k != 'low_light')
-            self.status_queue.put(indicators)
+            alert_triggered = any(indicators.values())
+            self.status_queue.put(indicators if alert_triggered else {"status": "Awake"})
 
         if alert_triggered:
             audio_data = self._alerter.trigger_alert()
             if audio_data:
-                # Use self.audio_queue.put()
                 self.audio_queue.put(audio_data)
         else:
             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.")
@@ -101,9 +92,8 @@ col1, col2 = st.columns([3, 1])
 with col1:
     webrtc_ctx = webrtc_streamer(
         key="drowsiness-detection",
-        # The factory now correctly passes the queues from session_state
         video_processor_factory=VideoProcessor,
-        rtc_configuration=RTC_CONFIGURATION,
+        rtc_configuration=RTC_CONFIGURATION, # Use the new robust configuration
         media_stream_constraints={"video": True, "audio": False},
         async_processing=True,
     )