usdata 0.29.0__tar.gz → 0.30.0__tar.gz

{usdata-0.29.0 → usdata-0.30.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usdata
-Version: 0.29.0
+Version: 0.30.0
 Summary: Unified Python SDK and CLI for discovering, fetching, and tracking provenance of U.S. public scientific data
 Keywords: noaa,usgs,open-data,scientific-data,provenance,reproducible-research,weather,climate,meteorology
 Author: Jake Van Slyke

{usdata-0.29.0 → usdata-0.30.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usdata"
-version = "0.29.0"
+version = "0.30.0"
 description = "Unified Python SDK and CLI for discovering, fetching, and tracking provenance of U.S. public scientific data"
 readme = "README.md"
 license = "Apache-2.0"

{usdata-0.29.0 → usdata-0.30.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "usdata"
-version = "0.29.0"
+version = "0.30.0"
 description = "Unified Python SDK and CLI for discovering, fetching, and tracking provenance of U.S. public scientific data"
 readme = "README.md"
 license = "Apache-2.0"

{usdata-0.29.0 → usdata-0.30.0}/src/usdata/_fetch.py

@@ -234,6 +234,19 @@ def _fetch_with(
     ``staging`` is passed to each fetch; see ``_fetch_asset``.
     """
     assets = ordered(adapter.list_assets(query))
+    return _fetch_listed(adapter, dataset, assets, root=root, force=force, staging=staging)
+
+
+def _fetch_listed(
+    adapter: Provider,
+    dataset: Dataset,
+    assets: list[Asset],
+    *,
+    root: Path | None = None,
+    force: bool = False,
+    staging: Path | None = None,
+) -> list[FetchedAsset]:
+    """Fetch assets already listed and put in order, as the loop does once it has listed them."""
     _progress.batch([asset.size for asset in assets])
     return [
         _fetch_asset(dataset, a, adapter, root=root, force=force, staging=staging) for a in assets

{usdata-0.29.0 → usdata-0.30.0}/src/usdata/_grib.py

@@ -304,15 +304,19 @@ def base_name(short_name: str | None, parameter: Sequence[Any], source: str) ->
     return _product_name(source) or f"parameter_{discipline}_{category}_{number}"
 
 
-def _time(date: Any, time: Any) -> str | None:
+def _time(date: Any, time: Any, second: Any = None) -> str | None:
+    """An ecCodes date and ``HHMM`` time as ISO 8601 UTC, with the message's seconds.
+
+    ecCodes spells times to the minute and keeps the reference time's seconds
+    in a key of their own, which MRMS sets: a file stamped ``20:00:41`` would
+    otherwise read as ``20:00:00``. A validity time is the reference time plus
+    a whole-minute step, so it carries the same seconds.
+    """
     if date is None or time is None:
         return None
     try:
-        return (
-            datetime.strptime(f"{int(date):08d}{int(time):04d}", "%Y%m%d%H%M")
-            .replace(tzinfo=UTC)
-            .isoformat()
-        )
+        stamp = datetime.strptime(f"{int(date):08d}{int(time):04d}", "%Y%m%d%H%M")
+        return stamp.replace(second=int(second or 0), tzinfo=UTC).isoformat()
     except ValueError:
         return None
 
@@ -494,11 +498,12 @@ def open_grib2(
             # The file's own spelling stays beside the rewritten one, as cfgrib keeps it.
             attrs["GRIB_units"] = units
             attrs["units"] = plain
+        second = _get(eccodes, h, "second", int)
         for label, date_key, time_key in (
             ("reference_time", "dataDate", "dataTime"),
             ("valid_time", "validityDate", "validityTime"),
         ):
-            stamp = _time(attrs.get(date_key), attrs.get(time_key))
+            stamp = _time(attrs.get(date_key), attrs.get(time_key), second)
             if stamp:
                 attrs[label] = stamp
         message: dict[str, Any] = {

{usdata-0.29.0 → usdata-0.30.0}/src/usdata/cache.py

@@ -10,6 +10,8 @@ from pathlib import Path
 from usdata.models import Asset
 
 ENV_VAR = "USDATA_CACHE_DIR"
+SIDECAR_SUFFIX = ".provenance.json"
+"""What a provenance sidecar's name adds to its data file's; ``provenance`` names it from here."""
 
 
 def cache_dir() -> Path:
@@ -38,7 +40,9 @@ def cached_path(dataset_id: str, asset_id: str, root: Path | None = None) -> Pat
         The path the cache uses for that asset, whether or not it exists.
 
     Raises:
-        ValueError: Either id is unsafe, or the path would escape the cache root.
+        ValueError: Either id is unsafe, names a sidecar or temporary file, or the
+            path would escape the cache root. Symlinks inside the root are
+            followed like any directory, so part of the cache can live elsewhere.
     """
     provider, sep, name = dataset_id.partition(":")
     if not sep or any(
@@ -48,11 +52,16 @@ def cached_path(dataset_id: str, asset_id: str, root: Path | None = None) -> Pat
     safe_id = asset_id.replace("/", "_")
     if not safe_id or safe_id in {".", ".."} or "\\" in safe_id or "\x00" in safe_id:
         raise ValueError(f"unsafe asset id: {asset_id!r}")
+    # A file of this name would be taken for another asset's sidecar, or for a temporary file.
+    if safe_id.endswith(SIDECAR_SUFFIX) or (safe_id.startswith(".") and safe_id.endswith(".part")):
+        raise ValueError(f"asset id {asset_id!r} names a file the cache keeps for itself")
     base = (root or cache_dir()).expanduser().resolve()
-    path = base / provider / name / safe_id
-    for candidate in (path, path.with_name(path.name + ".provenance.json")):
-        if not candidate.resolve().is_relative_to(base):
-            raise ValueError(f"cache path escapes root: {candidate}")
+    home = base / provider / name
+    path = home / safe_id
+    # Checked on the path as written, so a directory the user symlinked elsewhere is still
+    # inside the cache; only an id that re-anchors the path, such as C:x on Windows, is not.
+    if path.parent != home:
+        raise ValueError(f"cache path escapes root: {path}")
     return path