Fix stale publisher resource lookups

Author: Sam-Bolling

publishers/aviation_wx/aviation_wx_publisher.py

@@ -239,9 +239,10 @@ def _system_uid(self, icao_id: str) -> str:
 
     def connect(self):
         """Resolve system and datastream IDs for each station via REST API."""
+        self._ds_ids.clear()
         for st in self.stations:
             uid = self._system_uid(st["icao_id"])
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {st['icao_id']}")
                 continue

publishers/bootstrap_helpers.py

@@ -229,10 +229,15 @@ def fn():
 _uid_cache: dict[str, str] = {}
 
 
-def find_by_uid(base_url: str, auth: str, collection: str, uid: str) -> str | None:
+def _uid_cache_key(base_url: str, collection: str, uid: str) -> str:
+    return f"{base_url.rstrip('/')}:{collection}:{uid}"
+
+
+def find_by_uid(base_url: str, auth: str, collection: str, uid: str,
+                *, no_cache: bool = False) -> str | None:
     """Find a resource by UID in a collection. Returns server ID or None."""
-    cache_key = f"{collection}:{uid}"
-    if cache_key in _uid_cache:
+    cache_key = _uid_cache_key(base_url, collection, uid)
+    if not no_cache and cache_key in _uid_cache:
         return _uid_cache[cache_key]
 
     result = api_get(base_url, f"{collection}?uid={uid}&limit=1000", auth)
@@ -244,8 +249,9 @@ def find_by_uid(base_url: str, auth: str, collection: str, uid: str) -> str | No
             if props.get("uid") == uid:
                 item_id = item.get("id") or props.get("id")
                 if item_id:
-                    _uid_cache[cache_key] = str(item_id)
-                    return str(item_id)
+                    item_id = str(item_id)
+                    _uid_cache[cache_key] = item_id
+                    return item_id
     return None
 
 
@@ -516,7 +522,7 @@ def ensure_procedure(base_url: str, auth: str, uid: str, stub_body: dict,
         stats.setdefault("created", 0)
         stats["created"] += 1
     if new_id:
-        _uid_cache[f"procedures:{uid}"] = new_id
+        _uid_cache[_uid_cache_key(base_url, "procedures", uid)] = new_id
     return new_id
 
 
@@ -574,7 +580,7 @@ def ensure_system(base_url: str, auth: str, uid: str, stub_body: dict,
         stats.setdefault("created", 0)
         stats["created"] += 1
     if new_id:
-        _uid_cache[f"systems:{uid}"] = new_id
+        _uid_cache[_uid_cache_key(base_url, "systems", uid)] = new_id
     return new_id
 
 
@@ -690,7 +696,7 @@ def ensure_deployment(base_url: str, auth: str, uid: str, stub_body: dict,
         stats.setdefault("created", 0)
         stats["created"] += 1
     if new_id:
-        _uid_cache[f"deployments:{uid}"] = new_id
+        _uid_cache[_uid_cache_key(base_url, "deployments", uid)] = new_id
     return new_id
 
 
@@ -713,8 +719,7 @@ def clean_resource(base_url: str, auth: str, collection: str, uid: str,
         stats["deleted"] += 1
 
     # Invalidate cache
-    cache_key = f"{collection}:{uid}"
-    _uid_cache.pop(cache_key, None)
+    _uid_cache.pop(_uid_cache_key(base_url, collection, uid), None)
 
 
 # ═══════════════════════════════════════════════════════════════════════════

publishers/coops/coops_publisher.py

@@ -260,9 +260,10 @@ def _system_uid(self, station_id: str) -> str:
 
     def connect(self):
         """Resolve system and datastream IDs for each station via REST API."""
+        self._ds_ids.clear()
         for st in self.stations:
             uid = self._system_uid(st["id"])
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {st['id']}")
                 continue

publishers/iss/iss_publisher.py

@@ -234,7 +234,8 @@ def connect(self):
         """Connect to server. Uses REST mode when OSH_BASE_URL is set, SDK otherwise."""
         if self._rest_mode:
             from publishers.bootstrap_helpers import api_get, find_by_uid
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", self.system_uid)
+            self._ds_id = None
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", self.system_uid, no_cache=True)
             if not sys_id:
                 raise RuntimeError(f"System '{self.system_uid}' not found on server")
             ds_list = api_get(self._base_url, f"systems/{sys_id}/datastreams", self._auth)

publishers/ndbc/ndbc_buoycam_publisher.py

@@ -170,9 +170,10 @@ def _system_uid(self, station_id: str) -> str:
 
     def connect(self):
         """Resolve BuoyCAM datastream IDs for each camera-equipped station."""
+        self._ds_ids.clear()
         for st in self.stations:
             uid = self._system_uid(st["id"])
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {st['id']}")
                 continue

publishers/ndbc/ndbc_publisher.py

@@ -205,9 +205,10 @@ def _system_uid(self, station_id: str) -> str:
 
     def connect(self):
         """Resolve system and datastream IDs for each station via REST API."""
+        self._ds_ids.clear()
         for st in self.stations:
             uid = self._system_uid(st["id"])
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {st['id']}")
                 continue

publishers/nws/nws_publisher.py

@@ -176,9 +176,10 @@ def _system_uid(self, station_id: str) -> str:
 
     def connect(self):
         """Resolve system and datastream IDs for each station via REST API."""
+        self._ds_ids.clear()
         for st in self.stations:
             uid = self._system_uid(st["id"])
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {st['id']}")
                 continue

publishers/opensky/opensky_publisher.py

@@ -222,7 +222,8 @@ def __init__(self):
 
     def connect(self):
         """Resolve system and datastream ID via REST API."""
-        sys_id = find_by_uid(self._base_url, self._auth, "systems", SYSTEM_UID)
+        self._ds_id = None
+        sys_id = find_by_uid(self._base_url, self._auth, "systems", SYSTEM_UID, no_cache=True)
         if not sys_id:
             raise RuntimeError(f"System '{SYSTEM_UID}' not found on server")
 

publishers/usgs_eq/usgs_eq_publisher.py

@@ -210,7 +210,8 @@ def __init__(self):
 
     def connect(self):
         """Resolve system and datastream ID via REST API."""
-        sys_id = find_by_uid(self._base_url, self._auth, "systems", SYSTEM_UID)
+        self._ds_id = None
+        sys_id = find_by_uid(self._base_url, self._auth, "systems", SYSTEM_UID, no_cache=True)
         if not sys_id:
             raise RuntimeError(f"System '{SYSTEM_UID}' not found on server")
 

publishers/usgs_nims/usgs_nims_publisher.py

@@ -190,11 +190,12 @@ def _system_uid(self, nwis_id: str) -> str:
 
     def connect(self):
         """Resolve system and imagery datastream IDs for each camera via REST API."""
+        self._ds_ids.clear()
         connected = 0
         for cam in self.cameras:
             nwis_id = cam["nwisId"]
             uid = self._system_uid(nwis_id)
-            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid)
+            sys_id = find_by_uid(self._base_url, self._auth, "systems", uid, no_cache=True)
             if not sys_id:
                 print(f"  [WARN] System '{uid}' not found — skipping {nwis_id}")
                 continue