CI: deploy Docker/PDM Space

services/app_service/app.py

@@ -3,7 +3,6 @@ from pathlib import Path
 
 import streamlit as st
 
-
 def local_image_to_data_url(path: str | Path) -> str:
     """Convert a local image into a base64 data URL for inlined CSS backgrounds."""
     p = Path(path)
@@ -13,7 +12,6 @@ def local_image_to_data_url(path: str | Path) -> str:
     b64 = base64.b64encode(p.read_bytes()).decode()
     return f"data:{mime};base64,{b64}"
 
-
 def main() -> None:
     st.set_page_config(
         page_title="Home",
@@ -24,10 +22,11 @@ def main() -> None:
     with st.sidebar:
         st.header("Menu")
         st.page_link("app.py", label="Home")
-        st.page_link("pages/bushland_beacon.py", label="Bushland beacon")
         st.page_link("pages/lost_at_sea.py", label="Lost at sea")
-        st.page_link("pages/signal_watch.py", label="Signal Watch")
+        st.page_link("pages/bushland_beacon.py", label="Bushland beacon")
+        st.page_link("pages/signal_watch.py", label="Signal watch")
 
+    bg_image = local_image_to_data_url("resources/images/rescue.jpg")
     hide_default_css = """
     <style>
     #MainMenu {visibility: hidden;}
@@ -36,9 +35,7 @@ def main() -> None:
     </style>
     """
     st.markdown(hide_default_css, unsafe_allow_html=True)
-
-    bg_image = local_image_to_data_url("resources/images/rescue.png")
-
+   
     st.markdown(
         f"""
         <style>
@@ -49,6 +46,18 @@ def main() -> None:
             --cta-alt: #f4f4f4;
         }}
 
+        /* Fixed full-screen background behind main content */
+        .stApp {{
+            background: url("{bg_image}") no-repeat center center fixed;
+            background-size: cover;
+        }}
+
+        /* Keep sidebar opaque (so it’s not transparent) */
+        [data-testid="stSidebar"] > div:first-child {{
+        background-color: rgba(255,255,255,0);
+        backdrop-filter: blur(2px);
+        }}
+
         .hero {{
             position: relative;
             min-height: 92vh;
@@ -57,12 +66,12 @@ def main() -> None:
             place-items: center;
             text-align: center;
             color: var(--text);
-            background-image:
-            linear-gradient(180deg, rgba(0,0,0,0.10) 0%, rgba(0,0,0,0.20) 35%, rgba(0,0,0,0.35) 100%),
-            url('{bg_image}');
-            background-size: cover;
-            background-position: center;
-            background-repeat: no-repeat;
+            # background-image:
+            # linear-gradient(180deg, rgba(0,0,0,0.10) 0%, rgba(0,0,0,0.20) 35%, rgba(0,0,0,0.35) 100%),
+            # url('{bg_image}');
+            # background-size: cover;
+            # background-position: center;
+            # background-repeat: no-repeat;
         }}
 
         .hero .content {{
@@ -70,11 +79,11 @@ def main() -> None:
             padding: 2rem 1rem 5rem;
         }}
 
-        .hero h1 {{
-            font-size: clamp(2.6rem, 6vw, 5rem);
-            font-weight: 700;
+        .hero h2 {{
+            font-size: clamp(2rem, 4vw, 5rem);
+            font-weight: 500;
             letter-spacing: 0.3px;
-            margin: 0 0 0.7rem 0;
+            margin: 0 0 1rem 0;
         }}
 
         .hero .subtitle {{
@@ -89,53 +98,19 @@ def main() -> None:
             justify-content: center;
             flex-wrap: wrap;
         }}
-
-        .hero .btn {{
-            border: 0;
-            border-radius: 4px;
-            padding: 0.9rem 1.4rem;
-            font-weight: 600;
-            cursor: pointer;
-            transition: transform 120ms ease, opacity 120ms ease;
-        }}
-
-        .hero .btn.primary {{ background: var(--cta); color: white; }}
-        .hero .btn.secondary {{ background: var(--cta-alt); color: #171a20; }}
-
-        .hero .btn:hover {{ transform: translateY(-1px); }}
-        .nav {{
-            position: fixed;
-            top: 0; left: 0; right: 0;
-            height: 54px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            gap: 1.2rem;
-            backdrop-filter: saturate(180%) blur(10px);
-            background: rgba(255,255,255,0.2);
-            color: white;
-            z-index: 9999;
-        }}
-        .nav a {{
-            color: white;
-            text-decoration: none;
-            font-weight: 600;
-            font-size: 0.95rem;
-            opacity: 0.95;
-        }}
-        .nav a:hover {{ opacity: 1; }}
+       
         </style>
         """,
         unsafe_allow_html=True,
     )
-
+# --- Streamlit content ---
     st.markdown(
         """
         <section class="hero">
             <div class="content">
-                <h2>NATSAR Search & Rescue Simulation Hub</h2>
+                <h2>NATSAR Detection Hub</h2>
                 <div class="subtitle">
-                    This web application helps search and rescue teams and researchers detect critical objects from images captured via drones, bodycams, or other camera systems.
+                    Search and detect people and ships within images and video.
                 </div>
             </div>
         </section>
@@ -143,6 +118,5 @@ def main() -> None:
         unsafe_allow_html=True,
     )
 
-
 if __name__ == "__main__":
     main()

services/app_service/pages/signal_watch.py

@@ -542,11 +542,103 @@ def extract_youtube_stream_url(url: str, cookies_path: str | None = None) -> str
 
 
 @st.cache_resource
+<<<<<<< HEAD
+def load_model(model_key: str, device: str = "cpu"):
+    if model_key == "deim":
+        return DeimHgnetV2MDrone(device=device)
+    if not model_key.startswith("yolo:"):
+        raise ValueError(f"Unknown model key: {model_key}")
+    if not YOLO_AVAILABLE:
+        raise RuntimeError(
+            "Ultralytics YOLO weights requested but the package is not installed."
+        )
+
+    weight_path = Path(model_key.split(":", 1)[1])
+    if not weight_path.exists():
+        raise FileNotFoundError(
+            f"YOLO weights not found at {weight_path}. Place the .pt file there or "
+            "choose the DEIM model."
+        )
+    return YOLO(str(weight_path))
+
+
+def draw_yolo_dets(frame_bgr, result, show_score=True):
+    out = frame_bgr.copy()
+    boxes = getattr(result, "boxes", None)
+    if boxes is None:
+        return out
+    names = result.names
+    cls_ids = boxes.cls.cpu().numpy().astype(int)
+    confs = boxes.conf.cpu().numpy()
+    xyxy = boxes.xyxy.cpu().numpy()
+    for (x1, y1, x2, y2), cls, score in zip(xyxy, cls_ids, confs):
+        x1, y1, x2, y2 = map(int, (x1, y1, x2, y2))
+        label = names.get(int(cls), str(int(cls)))
+        if show_score:
+            label = f"{label} {score:.2f}"
+        cv2.rectangle(out, (x1, y1), (x2, y2), (0, 255, 0), 2)
+        (tw, th), _ = cv2.getTextSize(label, cv2.FONT_HERSHEY_SIMPLEX, 0.6, 2)
+        cv2.rectangle(out, (x1, y1 - th - 8), (x1 + tw + 6, y1), (0, 255, 0), -1)
+        cv2.putText(
+            out,
+            label,
+            (x1 + 3, max(0, y1 - 6)),
+            cv2.FONT_HERSHEY_SIMPLEX,
+            0.6,
+            (0, 0, 0),
+            2,
+            cv2.LINE_AA,
+        )
+    return out
+
+
+# ---------- Sidebar: Video feed dropdown ----------
+st.sidebar.header("Streaming Video")
+
+VIDEO_DIR = Path(__file__).resolve().parents[1] / "resources" / "videos" / "raw"
+
+video_map = {}
+if VIDEO_DIR.exists():
+    for p in sorted(VIDEO_DIR.glob("*")):
+        if p.suffix.lower() in {".mp4", ".mov", ".avi", ".mkv"}:
+            video_map[p.name] = str(p)
+
+source_options = ["Webcam (0)"] + list(video_map.keys()) + ["Youtube URL…"]
+src_choice = st.sidebar.selectbox("Source", source_options, index=0)
+
+custom_url = None
+if src_choice == "Youtube URL…":
+    custom_url = st.sidebar.text_input(
+        "RTSP/HTTP URL", placeholder="rtsp://... or https://..."
+    )
+
+st.sidebar.header("Parameters")
+label_to_key: dict[str, str] = {label: key for label, key in MODEL_ENTRIES}
+available_model_labels = []
+for label, key in MODEL_ENTRIES:
+    if key == "deim":
+        available_model_labels.append(label)
+        continue
+    if not key.startswith("yolo:"):
+        continue
+    weight_path = Path(key.split(":", 1)[1])
+    if YOLO_AVAILABLE and weight_path.exists():
+        available_model_labels.append(label)
+
+if not available_model_labels:
+    available_model_labels = ["DEIM (NATSAR bespoke)"]
+
+model_label = st.sidebar.selectbox("Model", available_model_labels, index=0)
+model_key = label_to_key.get(model_label, "deim")
+confidence_threshold = st.sidebar.slider("Minimum Confidence", 0.0, 1.0, 0.5, 0.01)
+frame_stride = st.sidebar.slider("Process every Nth frame", 1, 5, 2, 1)
+max_seconds = st.sidebar.slider("Max seconds (webcam/live)", 3, 60, 12, 1)
+run_detection = st.sidebar.button("🎥 Run Detection", use_container_width=True)
+
 def load_model_cached(model_key: str):
     """Cached model loading function."""
     return load_model(model_key)
 
-
 # ---------- Main UI logic ----------
 
 # Initialize session state for stop functionality

services/app_service/resources/images/desktop.ini

@@ -0,0 +1,2 @@
+[LocalizedFileNames]
+[email protected],0