refactor(ogc): pass the network-error host to _run_sync explicitly

`_run_sync` reported a connection failure against `_ogc_base_url.get()` — the
engine's request-builder base (`{base}/collections/{service}/items`).
`wateruse` builds its own NWDC requests and never uses that builder, so it was
wrapping its fan-out in `with _ogc_base_url(WATERUSE_URL)` purely to steer that
error message: borrowing an unrelated ambient and setting it to a `/data`
endpoint that would be nonsensical had the request-builder ever run in scope.

Give `_run_sync` an explicit `error_url` parameter (default `None` → the
scoped `_ogc_base_url`, unchanged for the OGC / NGWMN getters). `wateruse`
passes its endpoint directly and no longer touches the request-builder ambient.

Behavior-identical; surfaced by /simplify (altitude).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Sjb14HkwuCydKSKMsaXsgd

Author: thodson-usgs

dataretrieval/ogc/engine.py

@@ -945,6 +945,7 @@ def _run_sync(
     make_coro: Callable[[], Awaitable[tuple[pd.DataFrame, httpx.Response]]],
     *,
     service: str,
+    error_url: str | httpx.URL | None = None,
 ) -> tuple[pd.DataFrame, httpx.Response]:
     """Drive an async OGC fetch to completion from synchronous code.
 
@@ -957,6 +958,11 @@ def _run_sync(
     Shared by the non-chunked fetch paths; the chunked OGC getters
     drive their own portal
     inside :meth:`chunking.ChunkedCall.resume`.
+
+    A connection failure on the initial request is surfaced as a typed
+    ``NetworkError`` against ``error_url`` when given (callers that build their
+    own requests, e.g. ``wateruse``), else the request-builder base the caller
+    scoped via ``_ogc_base_url`` (the OGC / NGWMN getters).
     """
     with _progress.progress_context(service=service):
         with start_blocking_portal() as portal:
@@ -970,9 +976,15 @@ def _run_sync(
             except httpx.TransportError as exc:
                 # The initial-request connection failure ``_paginate`` lets
                 # through raw; mid-pagination failures are already typed.
-                # Report the base URL actually targeted (NGWMN/sibling APIs
-                # set their own via ``_ogc_base_url``), not a hardcoded host.
-                raise _network_error(_ogc_base_url.get(), exc) from exc
+                # Report the base URL actually targeted: callers that build
+                # their own requests (``wateruse``) pass ``error_url``; the OGC
+                # getters leave it unset and fall back to the request-builder
+                # base they scoped via ``_ogc_base_url`` (NGWMN/sibling APIs set
+                # their own), not a hardcoded host.
+                raise _network_error(
+                    error_url if error_url is not None else _ogc_base_url.get(),
+                    exc,
+                ) from exc
 
 
 # ``AGENCY-ID``: a hyphen-separated agency prefix and local id. The local id

dataretrieval/wateruse.py

@@ -53,7 +53,7 @@
 
 from dataretrieval.codes.states import to_state
 from dataretrieval.exceptions import DataRetrievalError
-from dataretrieval.ogc.engine import _ogc_base_url, _paginate, _run_sync
+from dataretrieval.ogc.engine import _paginate, _run_sync
 from dataretrieval.ogc.planning import _combine_chunk_frames, _combine_chunk_responses
 from dataretrieval.utils import (
     HTTPX_DEFAULTS,
@@ -234,12 +234,14 @@ def get_wateruse(
         for location in _resolve_locations(state, county, huc)
     ]
     # ``_run_sync`` drives the async fan-out via an anyio portal, so it is safe
-    # even inside an already-running event loop (e.g. a Jupyter notebook);
-    # ``_ogc_base_url`` sets the host reported in any connection-error message.
-    with _ogc_base_url(WATERUSE_URL):
-        df, response = _run_sync(
-            lambda: _fan_out(requests, headers, ssl_check), service="wateruse"
-        )
+    # even inside an already-running event loop (e.g. a Jupyter notebook).
+    # ``error_url`` is the host reported in any connection-error message (this
+    # module builds its own requests, so it has no OGC request-builder base).
+    df, response = _run_sync(
+        lambda: _fan_out(requests, headers, ssl_check),
+        service="wateruse",
+        error_url=WATERUSE_URL,
+    )
     return df, BaseMetadata(response)