CI: deploy Docker/PDM Space

services/app_service/pages/bushland_beacon.py

@@ -91,15 +91,15 @@ with st.sidebar:
 
     st.sidebar.header("Image Detection")
     img_file = st.file_uploader("Upload an image", type=["jpg", "jpeg", "png"], key="img_up")
-    run_img = st.button("🔍 Run Image Detection", use_container_width=True)
+    run_img = st.button("🔎 Detect", use_container_width=True)
 
     st.sidebar.header("Video")
     vid_file = st.file_uploader("Upload a video", type=["mp4", "mov", "avi", "mkv"], key="vid_up")
 
     # New buttons
-    run_vid_plain = st.button("Play Video", use_container_width=True)
-    run_vid = st.button("🎥 Run Detection", use_container_width=True)
-    stop_vid = st.button("Stop", use_container_width=True)
+    run_vid_plain = st.button("▶️ Play", use_container_width=True)
+    run_vid = st.button("📽️ Detect", use_container_width=True)
+    stop_vid = st.button("🛑 Stop", use_container_width=True)
 
     if stop_vid:
         st.session_state["stop_video"] = True

services/app_service/pages/signal_watch.py

@@ -16,7 +16,6 @@ from PIL import Image
 from utils.model_manager import get_model_manager, load_model
 
 
-
 def _image_to_data_url(path: str) -> str:
     p = Path(path)
     if not p.is_absolute():
@@ -40,8 +39,6 @@ model_manager = get_model_manager()
 
 # =============== Sidebar: custom menu + cards ===============
 with st.sidebar:
-
-
     logo_data_url = _image_to_data_url("../resources/images/lucid_insights_logo.png")
     st.markdown(
         f"""
@@ -59,8 +56,6 @@ with st.sidebar:
     st.markdown("---")
     st.page_link("pages/task_drone.py", label="Task Drone")
     st.page_link("pages/task_satellite.py", label="Task Satellite")
-    
-
     st.markdown("---")
 
     # ---------- Sidebar: Video feed dropdown ----------
@@ -116,17 +111,19 @@ with st.sidebar:
     max_seconds = None  # Always unlimited mode
     st.info("⚠️ Video Stream is running in unlimited mode — use Stop to end")
 
-    col1, col2 = st.columns(2)
-    with col1:
-        run_detection = st.button("🎥 Run", use_container_width=True)
-    with col2:
-        stop_detection = st.button(
-            "⏹️ Stop", use_container_width=True, help="Stop current detection"
-        )
-    st.sidebar.markdown("---")
+    # == Controls: Run / Stop / Play Only ==
+    c1, c2, c3 = st.columns(3)
+    with c1:
+        play_only = st.button("▶️ Play", use_container_width=True, help="Play raw video without detection")
+    with c2:
+        run_detection = st.button("🔎 Detect", use_container_width=True)
+    with c3:
+        stop_detection = st.button("🛑 Stop", use_container_width=True, help="Stop current stream")
+
+    st.markdown("---")
 
     # Parameters card (shared)
-    st.sidebar.header("Parameters")
+    st.header("Parameters")
     confidence_threshold = st.slider("Minimum Confidence", 0.0, 1.0, 0.5, 0.01)
 
     device = model_manager.device
@@ -146,13 +143,13 @@ with st.sidebar:
         default_stride,
         help="Higher values skip frames to keep inference responsive on slower hardware.",
     )
-    st.sidebar.markdown("---")
+    st.markdown("---")
     # Render model selection UI
     model_label, model_key = model_manager.render_model_selection(
         key_prefix="signal_watch"
     )
 
-    st.sidebar.markdown("---")
+    st.markdown("---")
     # Render device information
     model_manager.render_device_info()
 
@@ -195,28 +192,22 @@ else:
 
 def find_ytdlp_executable() -> str | None:
     """Find the yt-dlp executable, checking multiple possible locations."""
-    # First try the system PATH
     ytdlp_path = shutil.which("yt-dlp")
     if ytdlp_path:
         return ytdlp_path
-
-    # Try common virtual environment locations
     venv_paths = [
         Path(sys.executable).parent / "yt-dlp",
         Path(sys.executable).parent.parent / "bin" / "yt-dlp",
         Path(__file__).parents[3] / ".venv" / "bin" / "yt-dlp",
         Path(__file__).parents[3] / ".venv" / "Scripts" / "yt-dlp.exe",  # Windows
     ]
-
     for path in venv_paths:
         if path.exists() and path.is_file():
             return str(path)
-
     return None
 
 
 def is_youtube_url(url: str) -> bool:
-    """Check if the URL is a YouTube URL."""
     youtube_patterns = [
         r"(?:https?://)?(?:www\.)?youtube\.com/watch\?v=",
         r"(?:https?://)?(?:www\.)?youtu\.be/",
@@ -227,11 +218,9 @@ def is_youtube_url(url: str) -> bool:
 
 
 def check_ytdlp_available() -> bool:
-    """Check if yt-dlp is available on the system."""
     ytdlp_path = find_ytdlp_executable()
     if not ytdlp_path:
         return False
-
     try:
         result = subprocess.run(
             [ytdlp_path, "--version"],
@@ -246,69 +235,46 @@ def check_ytdlp_available() -> bool:
 
 
 def is_live_youtube_stream(url: str) -> bool:
-    """Check if a YouTube URL is a live stream."""
     if not is_youtube_url(url):
         return False
-
     ytdlp_path = find_ytdlp_executable()
     if not ytdlp_path:
         return False
-
     try:
-        # Get video info to check if it's live
         cmd = [ytdlp_path, "--dump-json", "--no-playlist", "--no-warnings", url]
-
         result = subprocess.run(
             cmd, check=False, capture_output=True, text=True, timeout=15
         )
-
         if result.returncode == 0:
             import json
-
             video_info = json.loads(result.stdout)
             return video_info.get("is_live", False)
     except Exception:
         pass
-
     return False
 
 
 def extract_youtube_stream_url(url: str, cookies_path: str | None = None) -> str | None:
-    """Extract the actual stream URL from a YouTube URL using yt-dlp."""
     ytdlp_path = find_ytdlp_executable()
     if not ytdlp_path:
         st.error("yt-dlp is not installed or not available in PATH.")
         st.info("Please install yt-dlp: `pip install yt-dlp` or `brew install yt-dlp`")
         return None
-
     if not check_ytdlp_available():
         st.error("yt-dlp found but not working properly.")
         return None
-
     try:
-        # Show progress message
         with st.spinner("Extracting YouTube stream URL..."):
             format_options = ["best[height<=720]", "best[height<=480]", "best", "worst"]
-
-            # First try with provided cookies if available
             if cookies_path and Path(cookies_path).exists():
                 for fmt in format_options:
                     cmd = [
-                        ytdlp_path,
-                        "--get-url",
-                        "--format",
-                        fmt,
-                        "--no-playlist",
-                        "--no-warnings",
-                        "--cookies",
-                        cookies_path,
-                        url,
+                        ytdlp_path, "--get-url", "--format", fmt, "--no-playlist",
+                        "--no-warnings", "--cookies", cookies_path, url,
                     ]
-
                     result = subprocess.run(
                         cmd, check=False, capture_output=True, text=True, timeout=30
                     )
-
                     if result.returncode == 0:
                         stream_url = result.stdout.strip()
                         if stream_url and stream_url.startswith("http"):
@@ -316,14 +282,12 @@ def extract_youtube_stream_url(url: str, cookies_path: str | None = None) -> str
                             return stream_url
                     else:
                         st.warning(f"yt-dlp failed with format {fmt}: {result.stderr}")
-
     except subprocess.TimeoutExpired:
         st.error("Timeout while extracting YouTube stream URL. The video might be unavailable.")
     except FileNotFoundError:
         st.error("yt-dlp not found. Please install it: pip install yt-dlp")
     except Exception as e:
         st.error(f"Error extracting YouTube stream URL: {e!s}")
-
     return None
 
 
@@ -386,8 +350,6 @@ def run_video_feed_detection(
     is_youtube = isinstance(cap_source, str) and is_youtube_url(cap_source)
     is_webcam = isinstance(cap_source, int)
 
-    # OpenCV capture
-    # On Windows, you may prefer: cv2.VideoCapture(cap_source, cv2.CAP_DSHOW)
     cap = cv2.VideoCapture(cap_source)
 
     # For webcam, set resolution & reduce buffering
@@ -396,7 +358,6 @@ def run_video_feed_detection(
         if webcam_size:
             cap.set(cv2.CAP_PROP_FRAME_WIDTH, webcam_size[0])
             cap.set(cv2.CAP_PROP_FRAME_HEIGHT, webcam_size[1])
-        # Hints for common backends
         cap.set(cv2.CAP_PROP_FPS, 30)
         cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*"MJPG"))
 
@@ -404,28 +365,24 @@ def run_video_feed_detection(
         st.error("Failed to open the selected source.")
         return
 
-    # Additional robustness for cloud deployment
     try:
-        # Test if we can read at least one frame
         test_ret, test_frame = cap.read()
         if not test_ret or test_frame is None:
             st.error("Video source is not providing frames. Please try a different stream.")
             cap.release()
             return
-        # Reset to beginning when it's a file
         cap.set(cv2.CAP_PROP_POS_FRAMES, 0)
     except Exception as e:
         st.error(f"Error testing video source: {e}")
         cap.release()
         return
 
-    # Set buffer size for live streams to reduce latency
     if is_youtube or isinstance(cap_source, str):
-        cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)  # Minimal buffer for live streams
-        cap.set(cv2.CAP_PROP_FPS, 25)  # Target FPS
+        cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)
+        cap.set(cv2.CAP_PROP_FPS, 25)
         cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*"MJPG"))
 
-    # Check if it's a local file (not a URL)
+    # Determine if local file
     is_file = False
     if isinstance(cap_source, str):
         if cap_source.startswith(("http://", "https://", "rtsp://")):
@@ -445,7 +402,6 @@ def run_video_feed_detection(
     start_t = time.time()
     i = 0
     last_preview_update = 0
-    # Use frame count-based preview throttling to prevent freezing
     preview_update_interval = max(1, int(30 / (preview_max_fps or 10)))  # Update every N frames
 
     writer = None
@@ -460,7 +416,7 @@ def run_video_feed_detection(
     if not is_file and preview_max_fps and preview_max_fps <= 6:
         max_frame_skip = 15
     else:
-        max_frame_skip = 5  # Limit how many buffered frames we drop at once
+        max_frame_skip = 5
 
     progress_update_seconds = 0.0 if is_file else (
         0.7 if not preview_max_fps else max(0.4, 1.0 / preview_max_fps)
@@ -469,16 +425,14 @@ def run_video_feed_detection(
 
     try:
         while True:
-            # Check for stop signal
             if st.session_state.get("stop_processing", False):
                 st.info("🛑 Stopping detection...")
                 break
 
             ok, frame = cap.read()
             if not ok:
-                # For live streams, try to reconnect a few times before giving up
                 if is_youtube or not is_file:
-                    if i < 10:  # Only retry early in the stream
+                    if i < 10:
                         time.sleep(0.5)
                         continue
                 break
@@ -488,7 +442,6 @@ def run_video_feed_detection(
                 continue
 
             inference_start = time.time()
-
             if model_key == "deim" and hasattr(model, "annotate_frame_bgr"):
                 vis = model.annotate_frame_bgr(frame, min_confidence=conf_thr)
             elif model_key == "deim":
@@ -501,9 +454,9 @@ def run_video_feed_detection(
                 _, vis = model.predict_and_visualize(
                     frame, min_confidence=conf_thr, show_score=True
                 )
-
             inference_elapsed = time.time() - inference_start
 
+            # Drop buffered frames if we're slower than source FPS
             if not is_file and frame_interval > 0.0 and inference_elapsed > frame_interval:
                 frames_to_drop = min(int(inference_elapsed / frame_interval) - 1, max_frame_skip)
                 for _ in range(frames_to_drop):
@@ -512,7 +465,7 @@ def run_video_feed_detection(
 
             loop_now = time.time()
 
-            # Update progress and status
+            # Progress
             if is_file or (loop_now - last_progress_time) >= progress_update_seconds:
                 progress = i / total if total > 0 else 0
                 prog.progress(
@@ -521,24 +474,17 @@ def run_video_feed_detection(
                 )
                 last_progress_time = loop_now
 
-            # Update preview (throttled to prevent freezing)
+            # Preview (throttled)
             if frame_ph is not None and (i - last_preview_update) >= preview_update_interval:
                 try:
-                    # Convert to RGB and resize for better performance
                     display_frame = cv2.cvtColor(vis, cv2.COLOR_BGR2RGB)
-
-                    # Resize large frames to improve performance for cloud deployment
                     height, width = display_frame.shape[:2]
                     if is_youtube or not is_file:
-                        # More aggressive resizing for live sources (incl. webcam) to prevent freezing
                         if width > 720:
                             scale = 720 / width
                             new_width = 720
                             new_height = int(height * scale)
-                            display_frame = cv2.resize(
-                                display_frame, (new_width, new_height),
-                                interpolation=cv2.INTER_LINEAR
-                            )
+                            display_frame = cv2.resize(display_frame, (new_width, new_height), interpolation=cv2.INTER_LINEAR)
                     elif width > 1280:
                         scale = 1280 / width
                         new_width = 1280
@@ -552,12 +498,10 @@ def run_video_feed_detection(
                         channels="RGB",
                     )
                     last_preview_update = i
-
                 except Exception as e:
-                    # If display fails, continue processing but log the error
-                    if i % 30 == 0:  # Only show error every 30 frames to avoid spam
+                    if i % 30 == 0:
                         st.warning(f"Display update failed: {e}")
-                    last_preview_update = i  # Still update counter to prevent repeated failures
+                    last_preview_update = i
 
             if writer is not None:
                 writer.write(vis)
@@ -569,7 +513,6 @@ def run_video_feed_detection(
         else:
             elapsed = time.time() - start_t
             stream_type = "YouTube" if is_youtube else ("Live" if not is_file else "File")
-
             if max_seconds is None:
                 prog.progress(0.0, text=f"{stream_type}… {int(elapsed)}s (unlimited)")
             else:
@@ -580,18 +523,15 @@ def run_video_feed_detection(
                 if elapsed >= max_seconds:
                     return
 
-            # For live streams, add adaptive delay based on processing speed
             if not is_file:
                 elapsed = time.time() - start_t
                 if elapsed > 0:
                     current_fps = i / elapsed
-                    # Target 10–15 FPS for live streams to prevent freezing
                     if current_fps > 15:
-                        time.sleep(0.1)  # Slow down if too fast
+                        time.sleep(0.1)
                     elif current_fps < 8:
-                        time.sleep(0.02)  # Slight nudge
+                        time.sleep(0.02)
 
-                # Clear GPU memory periodically for long-running streams
                 if i % 100 == 0 and is_youtube:
                     if torch.cuda.is_available():
                         torch.cuda.empty_cache()
@@ -599,14 +539,11 @@ def run_video_feed_detection(
     except Exception as e:
         st.error(f"Error during processing: {e!s}")
     finally:
-        # Ensure proper cleanup
         cap.release()
         if writer is not None:
             writer.release()
-        # Clear GPU memory after processing
         if torch.cuda.is_available():
             torch.cuda.empty_cache()
-        # Reset stop flag
         st.session_state.stop_processing = False
 
     stream_type = "YouTube" if is_youtube else ("Live" if not is_file else "File")
@@ -622,15 +559,76 @@ def run_video_feed_detection(
             )
 
 
-# Stop/Run controls
+# === NEW: play-only (no detection) ===
+def play_video_only(src_choice: str, webcam_index: int, webcam_size: tuple[int, int]):
+    """
+    Play raw video without running any model.
+    - For YouTube/live or local files: st.video(...)
+    - For Webcam: OpenCV capture loop until Stop pressed.
+    """
+    # YouTube/live or local file -> use st.video for simplest playback
+    if src_choice in youtube_urls:
+        st.info("▶ Playing YouTube stream (no detection). Use ⏹️ Stop to end.")
+        st.video(youtube_urls[src_choice])
+        return
+    if src_choice in video_map:
+        st.info("▶ Playing local file (no detection). Use ⏹️ Stop to end.")
+        st.video(video_map[src_choice])
+        return
+
+    # Webcam fallback -> simple OpenCV loop
+    if src_choice == "Webcam":
+        st.info("▶ Playing webcam (no detection). Use ⏹️ Stop to end.")
+        ph = st.empty()
+        cap = cv2.VideoCapture(int(webcam_index))
+        cap.set(cv2.CAP_PROP_BUFFERSIZE, 1)
+        cap.set(cv2.CAP_PROP_FRAME_WIDTH, webcam_size[0])
+        cap.set(cv2.CAP_PROP_FRAME_HEIGHT, webcam_size[1])
+        cap.set(cv2.CAP_PROP_FPS, 30)
+        cap.set(cv2.CAP_PROP_FOURCC, cv2.VideoWriter_fourcc(*"MJPG"))
+        if not cap.isOpened():
+            st.error("Failed to open webcam.")
+            return
+        try:
+            while True:
+                if st.session_state.get("stop_processing", False):
+                    st.info("🛑 Stopping playback...")
+                    break
+                ok, frame = cap.read()
+                if not ok:
+                    time.sleep(0.05)
+                    continue
+                frame_rgb = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
+                ph.image(frame_rgb, channels="RGB", use_container_width=True, output_format="JPEG")
+                time.sleep(0.01)
+        except Exception as e:
+            st.error(f"Playback error: {e!s}")
+        finally:
+            cap.release()
+            st.session_state.stop_processing = False
+        st.success("Stopped webcam playback.")
+    else:
+        st.warning("Please choose a valid source to play.")
+
+
+# Stop/Run/Play controls
+if 'stop_processing' not in st.session_state:
+    st.session_state.stop_processing = False
+
 if stop_detection:
     st.session_state.stop_processing = True
-    st.info("🛑 Stop signal sent. Detection will stop after current frame.")
+    st.info("🛑 Stop signal sent. Playback/detection will stop after current frame.")
 
-if run_detection:
-    # Reset stop flag when starting new detection
+if 'play_only' not in locals():
+    play_only = False  # safety for environments that re-run blocks
+
+if play_only:
     st.session_state.stop_processing = False
+    # Use *display* URLs for simple playback (no extraction/model)
+    play_video_only(src_choice, webcam_index=webcam_index, webcam_size=webcam_size)
 
+elif 'run_detection' in locals() and run_detection:
+    st.session_state.stop_processing = False
     src = resolve_video_source(src_choice, cookies_path, webcam_index=webcam_index)
     # Note: 0 (webcam) is a valid source; don't treat it as falsey
     if src is None and src != 0:
@@ -646,6 +644,4 @@ if run_detection:
             webcam_size=webcam_size if src_choice == "Webcam" else None,
         )
 else:
-    st.info(
-        "Pick a video source from the sidebar (including **Webcam** or YouTube) and click **Run Detection**."
-    )
+    st.info("Pick a source from the sidebar and click **🎥 Run** for detections or **▶ Play Only** for raw playback.")

services/app_service/resources/cookies/www.youtube.com_cookies (1).txt

@@ -14,13 +14,13 @@
 .youtube.com	TRUE	/	TRUE	1795860052	__Secure-1PSID	g.a0002wgrpcW9K-QNYioDxFejw3GZD9efUs0mRhFq3acAXjra01COElc9yIf8E5lZjcmehkOAoAACgYKATYSARUSFQHGX2MiWlVwx7WCXoMqEpE8OPe6uBoVAUF8yKoNXCEYEM1OaXvtmwgRgVk50076
 .youtube.com	TRUE	/	TRUE	1795860052	__Secure-3PSID	g.a0002wgrpcW9K-QNYioDxFejw3GZD9efUs0mRhFq3acAXjra01COIiAEqiDC2XZPFcs_RH2U7AACgYKAfYSARUSFQHGX2Mi0KLOQQs0Au5u5xYXwmfaBhoVAUF8yKqN132DDK9He9JDLUX1bEz10076
 .youtube.com	TRUE	/	TRUE	1795860053	LOGIN_INFO	AFmmF2swRAIgRKXvUyDr8P18ZQwmyUgxyKGvHjNBMkeIsGSaWm76WDACIG2OvtxNgjffm-ENPsSwdsv6sn1Rv3OLmUXY8uVhCzEF:QUQ3MjNmeWxRMkNvOEtZejh3VEVRRGxlazNMY3hEa0Zhc0dUcl9vTlVFZWtDdk5PX2laWWpvLWE0WngxbW9oYlNQRzFackoxeUpmTkx5SGtsWW9kUXl4eFo1ZUphTVFiYkhlRGxsTksyUUZkRnBBbTNDWWFVLUdlS09QaUVyUU1SVEtVOVNaOElJSFl5X2JPS09TT2JSQkswelFSaW43TVln
-.youtube.com	TRUE	/	FALSE	1793705713	SIDCC	AKEyXzVXwX8w2nWZfMv3_vm9x9MHP2X74I7xRSXBl1PVMH2De19pI_YA8z_2yr2Z13gIzUFOo2M
-.youtube.com	TRUE	/	TRUE	1793705713	__Secure-1PSIDCC	AKEyXzUsuWKIzQPgtFuXQQAbPdNspeAjdQuuPAxJ04FKw7fjyfwCLoBHSyjJ9CDr5INOHx6ysQ
-.youtube.com	TRUE	/	TRUE	1793705713	__Secure-3PSIDCC	AKEyXzXNYjyFEUljVmMwnMpTI-0eOyZ2rB2GIe7AxTqYYmrEa03vXkT9sGPwS7WMC-solvhrKcU
+.youtube.com	TRUE	/	FALSE	1793708909	SIDCC	AKEyXzVbBAWpzyxngGYEjLYfhkCBFrkwJ6n7kwoUUOKXL7xvBcjg97pGTxuIXPkvu3QNrmzPuuc
+.youtube.com	TRUE	/	TRUE	1793708909	__Secure-1PSIDCC	AKEyXzUh-hV97EvC1uklo2cTzWzL5ckOLmqxL8TXM1gyzisAEwG0OVSD01JyDncI8DQuCpHomQ
+.youtube.com	TRUE	/	TRUE	1793708909	__Secure-3PSIDCC	AKEyXzUcK9Z5Rr5cU66egaTKxwLaUIsHQs_6__IEWxDGFhtEtUOvZktYMtlCxq-rul6__UsHYyE
 .youtube.com	TRUE	/	TRUE	0	YSC	JNOzy0pmT_0
-.youtube.com	TRUE	/	TRUE	1777721713	VISITOR_INFO1_LIVE	y1BPxdbbDNs
-.youtube.com	TRUE	/	TRUE	1777721713	VISITOR_PRIVACY_METADATA	CgJBVRIEGgAgJw%3D%3D
+.youtube.com	TRUE	/	TRUE	1777724909	VISITOR_INFO1_LIVE	y1BPxdbbDNs
+.youtube.com	TRUE	/	TRUE	1777724909	VISITOR_PRIVACY_METADATA	CgJBVRIEGgAgJw%3D%3D
 .youtube.com	TRUE	/	TRUE	1777706424	__Secure-ROLLOUT_TOKEN	CMDh2N6P_q_XIBDpoLH5yLyQAxjNjY3kuNWQAw%3D%3D
-.youtube.com	TRUE	/	TRUE	1825241713	__Secure-YT_TVFAS	t=489249&s=2
-.youtube.com	TRUE	/	TRUE	1777721713	DEVICE_INFO	ChxOelUyTlRBNE56VXlNek0xTnpBek16QTVOdz09EPGmosgGGIWu8scG
-.youtube.com	TRUE	/tv	TRUE	1795001713	__Secure-YT_DERP	CPjNrY5_
+.youtube.com	TRUE	/	TRUE	1825244909	__Secure-YT_TVFAS	t=489249&s=2
+.youtube.com	TRUE	/	TRUE	1777724909	DEVICE_INFO	ChxOelUyTlRBNE56VXlNek0xTnpBek16QTVOdz09EO2/osgGGIWu8scG
+.youtube.com	TRUE	/tv	TRUE	1795004909	__Secure-YT_DERP	CPjNrY5_