Updates from #1199's comments

Author: the-glu

monitoring/mock_uss/tracer/kml.py

@@ -7,7 +7,7 @@
 from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from enum import Enum
-from typing import Protocol
+from typing import Protocol, TypeVar
 
 import yaml
 from implicitdict import ImplicitDict
@@ -59,11 +59,14 @@ class HistoricalVolumesCollection:
     active_at: datetime
 
 
-class HistoricalVolumesRenderer[T](Protocol):
+TracerLogEntryType = TypeVar("TracerLogEntryType", bound=TracerLogEntry)
+
+
+class HistoricalVolumesRenderer[TracerLogEntryType](Protocol):
     @abstractmethod
     def __call__(
         self,
-        log_entry: T,
+        log_entry: TracerLogEntryType,
         existing_volume_collections: list[HistoricalVolumesCollection],
     ) -> list[HistoricalVolumesCollection]:
         """Function that generates named collections of 4D volumes from a tracer log entry.
@@ -302,18 +305,23 @@ def truncate(self, latest_time: Time) -> None:
             c.truncate(latest_time)
 
     def to_kml_folder(self):
-        def dt(t: Time) -> int:
-            if self.reference_time is None:
-                return -1
-            return round((t.datetime - self.reference_time.datetime).total_seconds())
-
         if self.reference_time:
             description = f"Relative to {self.reference_time}"
             folder = kml.Folder(kml.name(self.name), kml.description(description))
         else:
             folder = kml.Folder(kml.name(self.name))
+
         for v in self.volumes:
-            name = f"{v.name} {dt(v.volume.time_start) if v.volume.time_start else '?'}s-{dt(v.volume.time_end) if v.volume.time_end else '?'}s"
+            name = v.name
+
+            if self.reference_time:
+                base_time = self.reference_time.datetime
+
+                def dt(t: Time) -> int:
+                    return round((t.datetime - base_time).total_seconds())
+
+                name = f"{name} {dt(v.volume.time_start) if v.volume.time_start else '?'}s-{dt(v.volume.time_end) if v.volume.time_end else '?'}s"
+
             folder.append(
                 make_placemark_from_volume(v.volume, name=name, style_url=v.style)
             )

monitoring/mock_uss/tracer/routes/ui.py

@@ -228,12 +228,12 @@ def tracer_rid_request_poll(observation_area_id: str):
     area = _get_validated_obs_area(observation_area_id)
     if not area.f3411:
         flask.abort(400, "Specified observation area is not observing F3411 remote ID")
-        return
+        raise RuntimeError("An exception should have been raised.")
     if not area.area.volume.outline_polygon and not area.area.volume.outline_circle:
         flask.abort(
             400, "Specified observation area does not define its spatial outline"
         )
-        return
+        raise RuntimeError("An exception should have been raised.")
 
     rid_client = context.get_client(area.f3411.auth_spec, area.f3411.dss_base_url)
     flights_result = rid.all_flights(

monitoring/mock_uss/tracer/tracer_poll.py

@@ -24,11 +24,16 @@
     ObservationAreaID,
 )
 from monitoring.monitorlib import versioning
-from monitoring.monitorlib.fetch.rid import FetchedISAs, isas
+from monitoring.monitorlib.fetch.rid import FetchedISAs
+from monitoring.monitorlib.fetch.rid import isas as fetch_rid_isas
 from monitoring.monitorlib.fetch.scd import (
     FetchedEntities,
-    constraints,
-    operations,
+)
+from monitoring.monitorlib.fetch.scd import (
+    constraints as fetch_scd_constraints,
+)
+from monitoring.monitorlib.fetch.scd import (
+    operations as fetch_scd_operations,
 )
 from monitoring.monitorlib.geo import get_latlngrect_vertices, make_latlng_rect
 from monitoring.monitorlib.infrastructure import UTMClientSession
@@ -113,7 +118,7 @@ def poll_isas(area: ObservationArea, logger: tracerlog.Logger) -> None:
     box = get_latlngrect_vertices(make_latlng_rect(area.area.volume))
 
     t0 = datetime.datetime.now(datetime.UTC)
-    result = isas(
+    result = fetch_rid_isas(
         box,
         area.area.time_start.datetime if area.area.time_start else None,
         area.area.time_end.datetime if area.area.time_end else None,
@@ -158,7 +163,7 @@ def poll_ops(
     t0 = datetime.datetime.now(datetime.UTC)
     if "operational_intents" not in context.scd_cache:
         context.scd_cache["operational_intents"] = {}
-    result = operations(
+    result = fetch_scd_operations(
         scd_client,
         box,
         area.area.time_start.datetime,
@@ -204,7 +209,7 @@ def poll_constraints(
     t0 = datetime.datetime.now(datetime.UTC)
     if "constraints" not in context.scd_cache:
         context.scd_cache["constraints"] = {}
-    result = constraints(
+    result = fetch_scd_constraints(
         scd_client,
         box,
         area.area.time_start.datetime,