fix: search subdeployments under parent, fix USGS Water station key

Author: Sam-Bolling

publishers/bootstrap_helpers.py

@@ -349,7 +349,12 @@ def ensure_deployment(base_url: str, auth: str, uid: str, body: dict,
                       parent_id: str | None = None,
                       *, dry_run: bool = False, stats: dict = None) -> str | None:
     """Create a deployment node if it doesn't exist. Returns server ID."""
+    # Check top-level deployments first
     existing = find_by_uid(base_url, auth, "deployments", uid)
+    if not existing and parent_id:
+        # Go server only lists subdeployments under parent endpoint
+        existing = find_by_uid(base_url, auth,
+                               f"deployments/{parent_id}/subdeployments", uid)
     if existing:
         print(f"  [SKIP] Deployment {uid} already exists (id={existing})")
         if stats:

publishers/usgs_water/bootstrap_usgs_water.py

@@ -840,14 +840,14 @@ def bootstrap(*, clean: bool = False, clean_only: bool = False,
             if "00060" in st.get("parameterCodes", []):
                 ensure_datastream(base_url, auth, sys_id or "pending",
                                   DS_DISCHARGE_OUTPUT,
-                                  _discharge_datastream_schema(st["id"]),
+                                  _discharge_datastream_schema(nwis_id),
                                   dry_run=dry_run, stats=stats)
 
             # Create gage height datastream
             if "00065" in st.get("parameterCodes", []):
                 ensure_datastream(base_url, auth, sys_id or "pending",
                                   DS_GAGE_HEIGHT_OUTPUT,
-                                  _gage_height_datastream_schema(st["id"]),
+                                  _gage_height_datastream_schema(nwis_id),
                                   dry_run=dry_run, stats=stats)
 
     # -- Deployment tree --