Fix weather sat auto-scheduler and Mercator tracking

utils/weather_sat_scheduler.py

@@ -4,13 +4,12 @@ Automatically captures satellite passes based on predicted pass times.
 Uses threading.Timer for scheduling — no external dependencies required.
 """
 
-from __future__ import annotations
-
-import threading
-import time
-import uuid
-from datetime import datetime, timezone, timedelta
-from typing import Any, Callable
+from __future__ import annotations
+
+import threading
+import uuid
+from datetime import datetime, timezone, timedelta
+from typing import Any, Callable
 
 from utils.logging import get_logger
 from utils.weather_sat import get_weather_sat_decoder, WEATHER_SATELLITES, CaptureProgress
@@ -28,7 +27,7 @@ except ImportError:
     WEATHER_SAT_CAPTURE_BUFFER_SECONDS = 30
 
 
-class ScheduledPass:
+class ScheduledPass:
     """A pass scheduled for automatic capture."""
 
     def __init__(self, pass_data: dict[str, Any]):
@@ -47,21 +46,13 @@ class ScheduledPass:
         self._timer: threading.Timer | None = None
         self._stop_timer: threading.Timer | None = None
 
-    @property
-    def start_dt(self) -> datetime:
-        dt = datetime.fromisoformat(self.start_time)
-        if dt.tzinfo is None:
-            # Naive datetime - assume UTC
-            dt = dt.replace(tzinfo=timezone.utc)
-        return dt.astimezone(timezone.utc)
-
-    @property
-    def end_dt(self) -> datetime:
-        dt = datetime.fromisoformat(self.end_time)
-        if dt.tzinfo is None:
-            # Naive datetime - assume UTC
-            dt = dt.replace(tzinfo=timezone.utc)
-        return dt.astimezone(timezone.utc)
+    @property
+    def start_dt(self) -> datetime:
+        return _parse_utc_iso(self.start_time)
+
+    @property
+    def end_dt(self) -> datetime:
+        return _parse_utc_iso(self.end_time)
 
     def to_dict(self) -> dict[str, Any]:
         return {
@@ -80,7 +71,7 @@ class ScheduledPass:
         }
 
 
-class WeatherSatScheduler:
+class WeatherSatScheduler:
     """Auto-scheduler for weather satellite captures."""
 
     def __init__(self):
@@ -209,10 +200,10 @@ class WeatherSatScheduler:
         with self._lock:
             return [p.to_dict() for p in self._passes]
 
-    def _refresh_passes(self) -> None:
-        """Recompute passes and schedule timers."""
-        if not self._enabled:
-            return
+    def _refresh_passes(self) -> None:
+        """Recompute passes and schedule timers."""
+        if not self._enabled:
+            return
 
         try:
             from utils.weather_sat_predict import predict_passes
@@ -236,30 +227,39 @@ class WeatherSatScheduler:
                     p._stop_timer.cancel()
 
             # Keep completed/skipped for history, replace scheduled
-            history = [p for p in self._passes if p.status in ('complete', 'skipped', 'capturing')]
-            self._passes = history
-
-            now = datetime.now(timezone.utc)
-            buffer = WEATHER_SAT_CAPTURE_BUFFER_SECONDS
-
-            for pass_data in passes:
-                sp = ScheduledPass(pass_data)
-
-                # Skip passes that already started
-                if sp.start_dt - timedelta(seconds=buffer) <= now:
-                    continue
-
-                # Check if already in history
-                if any(h.id == sp.id for h in history):
-                    continue
-
-                # Schedule capture timer
-                delay = (sp.start_dt - timedelta(seconds=buffer) - now).total_seconds()
-                if delay > 0:
-                    sp._timer = threading.Timer(delay, self._execute_capture, args=[sp])
-                    sp._timer.daemon = True
-                    sp._timer.start()
-                    self._passes.append(sp)
+            history = [p for p in self._passes if p.status in ('complete', 'skipped', 'capturing')]
+            self._passes = history
+
+            now = datetime.now(timezone.utc)
+            buffer = WEATHER_SAT_CAPTURE_BUFFER_SECONDS
+
+            for pass_data in passes:
+                try:
+                    sp = ScheduledPass(pass_data)
+                    start_dt = sp.start_dt
+                    end_dt = sp.end_dt
+                except Exception as e:
+                    logger.warning(f"Skipping invalid pass data: {e}")
+                    continue
+
+                capture_start = start_dt - timedelta(seconds=buffer)
+                capture_end = end_dt + timedelta(seconds=buffer)
+
+                # Skip passes that are already over
+                if capture_end <= now:
+                    continue
+
+                # Check if already in history
+                if any(h.id == sp.id for h in history):
+                    continue
+
+                # Schedule capture timer. If we're already inside the capture
+                # window, trigger immediately instead of skipping the pass.
+                delay = max(0.0, (capture_start - now).total_seconds())
+                sp._timer = threading.Timer(delay, self._execute_capture, args=[sp])
+                sp._timer.daemon = True
+                sp._timer.start()
+                self._passes.append(sp)
 
             logger.info(
                 f"Scheduler refreshed: {sum(1 for p in self._passes if p.status == 'scheduled')} "
@@ -374,11 +374,31 @@ class WeatherSatScheduler:
 
     def _emit_event(self, event: dict[str, Any]) -> None:
         """Emit scheduler event to callback."""
-        if self._event_callback:
-            try:
-                self._event_callback(event)
-            except Exception as e:
-                logger.error(f"Error in scheduler event callback: {e}")
+        if self._event_callback:
+            try:
+                self._event_callback(event)
+            except Exception as e:
+                logger.error(f"Error in scheduler event callback: {e}")
+
+
+def _parse_utc_iso(value: str) -> datetime:
+    """Parse UTC ISO8601 timestamp robustly across Python versions."""
+    if not value:
+        raise ValueError("missing timestamp")
+
+    text = str(value).strip()
+    # Backward compatibility for malformed legacy strings.
+    text = text.replace('+00:00Z', 'Z')
+    # Python <3.11 does not accept trailing 'Z' in fromisoformat.
+    if text.endswith('Z'):
+        text = text[:-1] + '+00:00'
+
+    dt = datetime.fromisoformat(text)
+    if dt.tzinfo is None:
+        dt = dt.replace(tzinfo=timezone.utc)
+    else:
+        dt = dt.astimezone(timezone.utc)
+    return dt
 
 
 # Singleton