Go CSAPI server compat: uid on datastreams, str Time fields, GeoJSON features lookup, OSH_BASE_URL override

Author: Sam-Bolling

publishers/bootstrap_helpers.py

@@ -214,8 +214,10 @@ def find_by_uid(base_url: str, auth: str, collection: str, uid: str) -> str | No
         return _uid_cache[cache_key]
 
     result = api_get(base_url, f"{collection}?uid={uid}", auth)
-    if result and "items" in result:
-        for item in result["items"]:
+    if result:
+        # Support both GeoJSON (features) and flat JSON (items) collections
+        items = result.get("items", []) or result.get("features", [])
+        for item in items:
             props = item.get("properties", item)
             if props.get("uid") == uid:
                 item_id = item.get("id") or props.get("id")

publishers/usgs_eq/bootstrap_usgs_eq.py

@@ -335,6 +335,7 @@ def _system_sml(config: dict) -> dict:
 def _datastream_schema() -> dict:
     """SWE DataRecord schema for earthquake event datastream."""
     return {
+        "uid": "urn:os4csapi:datastream:usgs-eq-feed:earthquakeEvent:v1",
         "outputName": DS_OUTPUT_NAME,
         "name": "Earthquake Events",
         "description": (

publishers/usgs_eq/usgs_eq_publisher.py

@@ -139,8 +139,8 @@ def parse_earthquake(feature: dict) -> dict | None:
             "magnitude": float(mag) if mag is not None else "NaN",
             "magType": mag_type or "unknown",
             "place": place or "Unknown location",
-            "eventTime": event_time_ms,
-            "updatedTime": updated_ms,
+            "eventTime": str(event_time_ms),
+            "updatedTime": str(updated_ms),
             "latitude": float(lat),
             "longitude": float(lon),
             "depth_km": float(depth_km) if depth_km is not None else 0.0,
@@ -200,7 +200,10 @@ def __init__(self):
 
         # REST config
         import base64
-        self._base_url = f"https://{self.osh_address}/{self.osh_root}/api"
+        self._base_url = os.environ.get(
+            "OSH_BASE_URL",
+            f"https://{self.osh_address}/{self.osh_root}/api",
+        )
         self._auth = "Basic " + base64.b64encode(
             f"{self.osh_user}:{self.osh_pass}".encode()).decode()