h5rdmtoolbox 2.6.1__tar.gz → 2.6.2__tar.gz

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2023 Scott Chacon and others
+Copyright (c) 2022-2026 h5rdmtoolbox contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h5rdmtoolbox
-Version: 2.6.1
+Version: 2.6.2
 Summary: Supporting a FAIR Research Data lifecycle using Python and HDF5.
 Author-email: Matthias Probst <matth.probst@gmail.com>
 License-Expression: MIT

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/catalog/__init__.py

@@ -117,7 +117,9 @@ def _download_catalog_datasets(
         f"Found {n_ttl_resources} TTL web resources to download. Downloading to {download_directory}..."
     )
     return download(
-        download_directory=download_directory, web_resources=list_of_ttl_web_resources
+        download_directory=download_directory,
+        web_resources=list_of_ttl_web_resources,
+        use_agent_header=True
     )
 
 

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/catalog/_initialization.py

@@ -84,5 +84,6 @@ def database_initialization(
         f"Found {len(list_of_ttl_web_resources)} TTL web resources to download. Downloading to {download_directory}...")
     return download(
         download_directory=download_directory,
-        web_resources=list_of_ttl_web_resources
+        web_resources=list_of_ttl_web_resources,
+        use_agent_header=True
     )

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/catalog/utils.py

@@ -17,6 +17,7 @@ from pydantic.v1 import HttpUrl
 from rdflib import Graph
 
 from .. import logger
+from .._version import __version__
 
 # --- minimal caster for common XSD datatypes ---
 _XSD = "http://www.w3.org/2001/XMLSchema#"
@@ -28,6 +29,10 @@ _NUM_DT = {
 _FLOAT_DT = {_XSD + "float", _XSD + "double"}
 _DEC_DT = {_XSD + "decimal"}
 
+USER_AGENT_HEADER = {
+    "User-Agent": f"h5rdmtoolbox/{__version__} (https://github.com/matthiasprobst/h5rdmtoolbox)",
+}
+
 
 def file_uri_or_path_to_path(value) -> pathlib.Path:
     # Keep behavior close to your code
@@ -190,40 +195,8 @@ def extract_record_id(value: str) -> str:
     raise ValueError(f"Could not extract a numeric record ID from '{value}'")
 
 
-def get_file_metadata(record: str, sandbox: bool = False) -> Iterator[Tuple[str, Dict]]:
-    """
-    Fetch the Zenodo record JSON and yield (filename, file-metadata-dict) tuples.
-    """
-    record_id = extract_record_id(record)
-    base_url = "https://sandbox.zenodo.org/api/records" if sandbox else "https://zenodo.org/api/records"
-    url = f"{base_url}/{record_id}"
-
-    resp = requests.get(url)
-    if resp.status_code != 200:
-        raise RuntimeError(
-            f"Failed to fetch record {record_id}: HTTP {resp.status_code} - {resp.text}"
-        )
 
-    data = resp.json()
 
-    # Zenodo records normally have 'files' at the top level
-    files = data.get("files", [])
-
-    if not files:
-        # Some records may store file info differently; handle gracefully
-        raise RuntimeError(f"No files found in record {record_id} (or unexpected schema).")
-
-    for f in files:
-        # Common fields in Zenodo API
-        name = f.get("key") or f.get("filename") or "<unknown>"
-        yield name, f
-
-
-def _is_sandbox_doi(doi: str) -> bool:
-    """Return True if the provided doi string looks like a sandbox URL/DOI."""
-    if "10.5281/zenodo" in doi:
-        return True
-    return False
 
 
 def download_and_verify_file(file_meta: Dict, dest_dir: pathlib.Path) -> Tuple[pathlib.Path, bool, str, str]:
@@ -312,7 +285,8 @@ def parse_checksum(raw: str) -> Tuple[str, str]:
     return algo.lower(), val.lower()
 
 
-def download(download_directory: pathlib.Path, web_resources: List[WebResource]) -> List[DownloadStatus]:
+def download(download_directory: pathlib.Path, web_resources: List[WebResource], use_agent_header=True) -> List[
+    DownloadStatus]:
     """Download and verify a list of WebResource items.
 
     For each resource:
@@ -403,7 +377,11 @@ def download(download_directory: pathlib.Path, web_resources: List[WebResource])
         # stream download to tmp file while computing md5
         tmp_path = record_dir / (filename + ".tmp")
         try:
-            resp = requests.get(url, stream=True, timeout=60)
+            if use_agent_header:
+                kwargs_request = {"headers": USER_AGENT_HEADER}
+            else:
+                kwargs_request = {}
+            resp = requests.get(url, stream=True, timeout=60, **kwargs_request)
             resp.raise_for_status()
 
             md5 = hashlib.md5()

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/convention/references.py

@@ -1,5 +1,11 @@
 import requests
 
+from h5rdmtoolbox import __version__
+
+USER_AGENT_HEADER = {
+    "User-Agent": f"h5rdmtoolbox/{__version__} (https://github.com/matthiasprobst/h5rdmtoolbox)",
+}
+
 
 def validate_url(url: str) -> bool:
     """Validate URL
@@ -15,7 +21,7 @@ def validate_url(url: str) -> bool:
         True if URL
     """
     try:
-        response = requests.get(url)
+        response = requests.get(url, headers=USER_AGENT_HEADER)
     except requests.exceptions.MissingSchema:
         return False
     if response.status_code == 200:

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/protocols.py

@@ -149,6 +149,8 @@ class H5TbxAttributeManager(Protocol):
     def parent(self):
         ...
 
+    def items(self):
+        pass
 
 class H5TbxHLObject(Protocol):
     name: str

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox/repository/zenodo/core.py

@@ -221,7 +221,7 @@ class ZenodoRecord(RepositoryInterface):
             return r.json()
 
         record_url = url.replace("deposit/depositions/", "records/")
-        r = requests.get(record_url)
+        r = requests.get(record_url, headers=USER_AGENT_HEADER)
         if r.status_code == 404:
             access_token = self.access_token
             r = requests.get(url, params={"access_token": access_token})

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/h5rdmtoolbox.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: h5rdmtoolbox
-Version: 2.6.1
+Version: 2.6.2
 Summary: Supporting a FAIR Research Data lifecycle using Python and HDF5.
 Author-email: Matthias Probst <matth.probst@gmail.com>
 License-Expression: MIT

{h5rdmtoolbox-2.6.1 → h5rdmtoolbox-2.6.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "h5rdmtoolbox"
-version = "2.6.1"
+version = "2.6.2"
 description = "Supporting a FAIR Research Data lifecycle using Python and HDF5."
 readme = "README.md"
 requires-python = ">=3.9, <3.14"