cloudnet-api-client 0.10.0__tar.gz → 0.11.0__tar.gz

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test against dataportal backend
+name: Test and lint
 
 on: [push, pull_request]
 

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.11.0 – 2025-08-16
+
+- Adjust routes and responses
+- Improve tests
+
 ## 0.10.0 – 2025-08-13
 
 - Add `volatile` to metadata response

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnet-api-client
-Version: 0.10.0
+Version: 0.11.0
 Summary: Cloudnet API client
 Author-email: Simo Tukiainen <simo.tukiainen@fmi.fi>
 License-File: LICENSE
@@ -22,7 +22,9 @@ Requires-Dist: types-requests; extra == 'dev'
 Requires-Dist: types-tqdm; extra == 'dev'
 Provides-Extra: test
 Requires-Dist: mypy; extra == 'test'
+Requires-Dist: netcdf4; extra == 'test'
 Requires-Dist: pytest; extra == 'test'
+Requires-Dist: pytest-asyncio; extra == 'test'
 Description-Content-Type: text/markdown
 
 [![CI](https://github.com/actris-cloudnet/cloudnet-api-client/actions/workflows/test.yml/badge.svg)](https://github.com/actris-cloudnet/cloudnet-api-client/actions/workflows/test.yml)
@@ -128,13 +130,33 @@ Parameters:
 
 \* = only with `RawMetadata`
 
+### `APIClient().file()` &rarr; `ProductMetadata`
+
+Fetch metadata of a single file.
+
+Parameters:
+
+| name | type                 |
+| ---- | -------------------- |
+| uuid | `str` or `uuid.UUID` |
+
+### `APIClient().versions()` &rarr; `list[VersionMetadata]`
+
+Fetch information of all versions of a file.
+
+Parameters:
+
+| name | type                 |
+| ---- | -------------------- |
+| uuid | `str` or `uuid.UUID` |
+
 ### `APIClient().sites()` &rarr; `list[Site]`
 
 Fetch cloudnet sites.
 
 Parameters:
 
-| name    | type                 | Choices                                   | default |
+| name    | type                 | choices                                   | default |
 | ------- | -------------------- | ----------------------------------------- | ------- |
 | site_id | `str`                |                                           | `None`  |
 | type    | `str` or `list[str]` | "cloudnet", "campaign", "model", "hidden" | `None`  |
@@ -145,7 +167,7 @@ Fetch cloudnet products.
 
 Parameters:
 
-| name | type                 | Choices                                   | default |
+| name | type                 | choices                                   | default |
 | ---- | -------------------- | ----------------------------------------- | ------- |
 | type | `str` or `list[str]` | "instrument", "geophysical", "evaluation" | `None`  |
 

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/README.md

@@ -101,13 +101,33 @@ Parameters:
 
 \* = only with `RawMetadata`
 
+### `APIClient().file()` → `ProductMetadata`
+
+Fetch metadata of a single file.
+
+Parameters:
+
+| name | type                 |
+| ---- | -------------------- |
+| uuid | `str` or `uuid.UUID` |
+
+### `APIClient().versions()` → `list[VersionMetadata]`
+
+Fetch information of all versions of a file.
+
+Parameters:
+
+| name | type                 |
+| ---- | -------------------- |
+| uuid | `str` or `uuid.UUID` |
+
 ### `APIClient().sites()` → `list[Site]`
 
 Fetch cloudnet sites.
 
 Parameters:
 
-| name    | type                 | Choices                                   | default |
+| name    | type                 | choices                                   | default |
 | ------- | -------------------- | ----------------------------------------- | ------- |
 | site_id | `str`                |                                           | `None`  |
 | type    | `str` or `list[str]` | "cloudnet", "campaign", "model", "hidden" | `None`  |
@@ -118,7 +138,7 @@ Fetch cloudnet products.
 
 Parameters:
 
-| name | type                 | Choices                                   | default |
+| name | type                 | choices                                   | default |
 | ---- | -------------------- | ----------------------------------------- | ------- |
 | type | `str` or `list[str]` | "instrument", "geophysical", "evaluation" | `None`  |
 

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/cloudnet_api_client/client.py

@@ -3,12 +3,12 @@ import calendar
 import datetime
 import os
 import re
-import uuid
 from dataclasses import fields, is_dataclass
 from os import PathLike
 from pathlib import Path
 from typing import TypeVar, cast
 from urllib.parse import urljoin
+from uuid import UUID
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -25,6 +25,7 @@ from cloudnet_api_client.containers import (
     RawMetadata,
     RawModelMetadata,
     Site,
+    VersionMetadata,
 )
 from cloudnet_api_client.dl import download_files
 
@@ -42,6 +43,8 @@ class APIClient:
         base_url: str = "https://cloudnet.fmi.fi/api/",
         session: requests.Session | None = None,
     ) -> None:
+        if not base_url.endswith("/"):
+            base_url += "/"
         self.base_url = base_url
         self.session = session or _make_session()
 
@@ -74,7 +77,7 @@ class APIClient:
                 instrument_id=obj["instrument"]["id"],
                 model=obj["model"],
                 type=obj["type"],
-                uuid=uuid.UUID(obj["uuid"]),
+                uuid=UUID(obj["uuid"]),
                 pid=obj["pid"],
                 owners=obj["owners"],
                 serial_number=obj["serialNumber"],
@@ -83,6 +86,31 @@ class APIClient:
             for obj in res
         ]
 
+    def file(
+        self,
+        uuid: str | UUID,
+    ) -> ProductMetadata:
+        res = self._get_response(f"files/{uuid}")
+        return _build_meta_objects(res)[0]
+
+    def versions(self, uuid: str | UUID) -> list[VersionMetadata]:
+        res = self._get_response(
+            f"files/{uuid}/versions",
+            {"properties": ["pid", "dvasId", "legacy", "size", "checksum"]},
+        )
+        return [
+            VersionMetadata(
+                uuid=UUID(obj["uuid"]),
+                created_at=_parse_datetime(obj["createdAt"]),
+                pid=obj["pid"],
+                dvas_id=obj["dvasId"],
+                legacy=obj["legacy"],
+                size=int(obj["size"]),
+                checksum=obj["checksum"],
+            )
+            for obj in res
+        ]
+
     def metadata(
         self,
         site_id: QueryParam = None,
@@ -105,6 +133,10 @@ class APIClient:
             "product": product,
             "showLegacy": show_legacy,
         }
+        if show_legacy is not True:
+            # API shows legacy files with any value (even <False>)
+            del params["showLegacy"]
+
         _add_date_params(
             params, date, date_from, date_to, updated_at, updated_at_from, updated_at_to
         )
@@ -125,7 +157,8 @@ class APIClient:
             or (model_id is not None and (product is None or "model" in product))
         ):
             for key in ("showLegacy", "product", "instrument", "instrumentPid"):
-                del params[key]
+                if key in params:
+                    del params[key]
             params["model"] = model_id
             files_res += self._get_response("model-files", params)
 
@@ -418,7 +451,7 @@ def _build_meta_objects(res: list[dict]) -> list[ProductMetadata]:
             created_at=_parse_datetime(obj["createdAt"]),
             updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
-            uuid=uuid.UUID(obj["uuid"]),
+            uuid=UUID(obj["uuid"]),
             site=_create_site_object(obj["site"]),
         )
         for obj in res
@@ -437,7 +470,7 @@ def _build_raw_meta_objects(res: list[dict]) -> list[RawMetadata]:
             created_at=_parse_datetime(obj["createdAt"]),
             updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
-            uuid=uuid.UUID(obj["uuid"]),
+            uuid=UUID(obj["uuid"]),
             site=_create_site_object(obj["site"]),
         )
         for obj in res
@@ -456,7 +489,7 @@ def _build_raw_model_meta_objects(res: list[dict]) -> list[RawModelMetadata]:
             created_at=_parse_datetime(obj["createdAt"]),
             updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
-            uuid=uuid.UUID(obj["uuid"]),
+            uuid=UUID(obj["uuid"]),
             site=_create_site_object(obj["site"]),
         )
         for obj in res
@@ -498,10 +531,10 @@ def _create_site_object(metadata: dict) -> Site:
 
 def _create_instrument_object(metadata: dict) -> Instrument:
     return Instrument(
-        instrument_id=metadata["instrumentId"],
+        instrument_id=metadata.get("instrumentId"),  # not in api/files/:uuid
         model=metadata["model"],
         type=metadata["type"],
-        uuid=uuid.UUID(metadata["uuid"]),
+        uuid=UUID(metadata["uuid"]),
         pid=metadata["pid"],
         owners=metadata["owners"],
         serial_number=metadata["serialNumber"],

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/cloudnet_api_client/containers.py

@@ -35,7 +35,7 @@ class Product:
 
 @dataclass(frozen=True, slots=True)
 class Instrument:
-    instrument_id: str  # CLU internal identifier, e.g. "rpg-fmcw-94"
+    instrument_id: str | None  # CLU internal identifier, e.g. "rpg-fmcw-94"
     model: str  # From ACTRIS Vocabulary, e.g. "RPG-FMCW-94 DP"
     type: str  # From ACTRIS Vocabulary, e.g. "Doppler non-scanning cloud radar"
     name: str  # e.g. "FMI RPG-FMCW-94 (Pallas)"
@@ -87,3 +87,23 @@ class ProductMetadata(Metadata):
     instrument: Instrument | None
     model: Model | None
     volatile: bool
+    legacy: bool
+    pid: str
+    dvas_id: str | None
+    error_level: str | None
+    coverage: float
+    timeliness: str
+    format: str
+    start_time: datetime.datetime | None
+    stop_time: datetime.datetime | None
+
+
+@dataclass(frozen=True, slots=True)
+class VersionMetadata:
+    uuid: uuid.UUID
+    created_at: datetime.datetime
+    pid: str
+    checksum: str
+    legacy: bool
+    size: int
+    dvas_id: str | None

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/cloudnet_api_client/utils.py

@@ -1,3 +1,4 @@
+import base64
 import hashlib
 from os import PathLike
 from typing import Literal
@@ -7,13 +8,17 @@ def sha256sum(filename: str | PathLike) -> str:
     return _calc_hash_sum(filename, "sha256")
 
 
-def md5sum(filename: str | PathLike) -> str:
-    return _calc_hash_sum(filename, "md5")
+def md5sum(filename: str | PathLike, is_base64: bool = False) -> str:
+    return _calc_hash_sum(filename, "md5", is_base64)
 
 
-def _calc_hash_sum(filename: str | PathLike, method: Literal["sha256", "md5"]) -> str:
+def _calc_hash_sum(
+    filename: str | PathLike, method: Literal["sha256", "md5"], is_base64: bool = False
+) -> str:
     hash_sum = getattr(hashlib, method)()
     with open(filename, "rb") as f:
         for byte_block in iter(lambda: f.read(4096), b""):
             hash_sum.update(byte_block)
+    if is_base64:
+        return base64.b64encode(hash_sum.digest()).decode("utf-8")
     return hash_sum.hexdigest()

cloudnet_api_client-0.11.0/cloudnet_api_client/version.py

@@ -0,0 +1 @@
+__version__ = "0.11.0"

{cloudnet_api_client-0.10.0 → cloudnet_api_client-0.11.0}/pyproject.toml

@@ -22,12 +22,15 @@ dependencies = ["aiohttp", "numpy", "requests", "tqdm"]
 dynamic = ["version"]
 
 [project.optional-dependencies]
-test = ["mypy", "pytest"]
+test = ["mypy", "netCDF4", "pytest", "pytest-asyncio"]
 dev = ["pre-commit", "release-version", "types-requests", "types-tqdm"]
 
 [tool.hatch.version]
 path = "cloudnet_api_client/version.py"
 
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+
 [tool.release-version]
 filename = "cloudnet_api_client/version.py"
 pattern = ["__version__ = \"(?P<major>\\d+).(?P<minor>\\d+).(?P<patch>\\d+)\""]

cloudnet_api_client-0.11.0/tests/test_client.py

@@ -0,0 +1,359 @@
+import datetime
+import os
+from pathlib import Path
+from typing import NamedTuple
+from uuid import UUID
+
+import netCDF4
+import pytest
+import requests
+
+from cloudnet_api_client import APIClient
+from cloudnet_api_client.containers import (
+    Instrument,
+    Product,
+    ProductMetadata,
+    RawMetadata,
+    Site,
+    VersionMetadata,
+)
+from cloudnet_api_client.utils import md5sum, sha256sum
+
+
+class RawFile(NamedTuple):
+    filename: str
+    site: str
+    instrument: str
+    date: str
+    pid: str
+
+
+class File(NamedTuple):
+    filename: str
+    legacy: bool
+    volatile: bool
+
+
+@pytest.fixture(scope="session")
+def backend_url() -> str:
+    return os.getenv("BACKEND_URL", "http://localhost:3000")
+
+
+@pytest.fixture(scope="session")
+def client(backend_url) -> APIClient:
+    return APIClient(base_url=f"{backend_url}/api/")
+
+
+@pytest.fixture(scope="session")
+def data_path() -> Path:
+    return Path(__file__).parent / "data"
+
+
+@pytest.fixture(scope="session")
+def files_raw() -> list[RawFile]:
+    return [
+        RawFile(
+            filename="20250801_Magurele_CHM170137_000.nc",
+            site="bucharest",
+            instrument="chm15k",
+            date="2025-08-01",
+            pid="https://hdl.handle.net/21.12132/3.c60c931fac9d43f0",
+        ),
+        RawFile(
+            filename="20250808_Granada_CHM170119_0045_000.nc",
+            site="granada",
+            instrument="chm15k",
+            date="2025-08-08",
+            pid="https://hdl.handle.net/21.12132/3.77a75f3b32294855",
+        ),
+        RawFile(
+            filename="20250803_JOYCE_WST_01m.dat",
+            site="juelich",
+            instrument="weather-station",
+            date="2025-08-01",
+            pid="https://hdl.handle.net/21.12132/3.726b3b29de1949cc",
+        ),
+    ]
+
+
+@pytest.fixture(scope="session")
+def files_product() -> list[File]:
+    return [
+        File("20250814_bucharest_classification.nc", legacy=False, volatile=True),
+        File("20250808_hyytiala_iwc-Z-T-method.nc", legacy=False, volatile=False),
+        File("20140205_hyytiala_classification.nc", legacy=True, volatile=False),
+    ]
+
+
+@pytest.fixture(scope="session", autouse=True)
+def submit_raw_files(backend_url, data_path, files_raw):
+    for file_meta in files_raw:
+        _submit_raw_file(backend_url, data_path, file_meta)
+
+
+@pytest.fixture(scope="session", autouse=True)
+def submit_product_files(backend_url: str, data_path: Path, files_product: list[File]):
+    for file_meta in files_product:
+        _submit_product_file(backend_url, data_path, file_meta)
+
+
+class TestBasicMetadata:
+    def test_sites(self, client: APIClient):
+        sites = client.sites()
+        assert sites
+        assert isinstance(sites[0], Site)
+
+    def test_site_filter_cloudnet(self, client: APIClient):
+        sites = client.sites(type="cloudnet")
+        assert all("cloudnet" in site.type for site in sites)
+
+    def test_site_filter_hidden(self, client: APIClient):
+        sites = client.sites(type="hidden")
+        assert all("hidden" in site.type for site in sites)
+        assert all("cloudnet" not in site.type for site in sites)
+
+    def test_products(self, client: APIClient):
+        products = client.products()
+        assert products
+        assert isinstance(products[0], Product)
+
+    def test_product_type_filter(self, client: APIClient):
+        products = client.products("instrument")
+        assert all(product.type == ["instrument"] for product in products)
+
+    def test_product_type_filter_combo(self, client: APIClient):
+        products = client.products(["instrument", "geophysical"])
+        assert all(
+            product.type in [["instrument"], ["geophysical"]] for product in products
+        )
+
+    def test_instruments(self, client: APIClient):
+        instruments = client.instruments()
+        assert instruments
+        assert isinstance(instruments[0], Instrument)
+
+
+class TestDateParameterHandling:
+    """Test various date parameter formats and edge cases."""
+
+    def test_date_string_formats(self, client: APIClient):
+        meta1 = client.raw_metadata(date="2025-08-01")
+        meta2 = client.raw_metadata(date="2025-8-1")
+        assert len(meta1) == len(meta2)
+
+    def test_date_object_parameter(self, client: APIClient):
+        date_obj = datetime.date(2025, 8, 1)
+        meta = client.raw_metadata(date=date_obj)
+        assert len(meta) >= 0
+
+    def test_datetime_parameter(self, client: APIClient):
+        datetime_obj = datetime.datetime(2025, 8, 1, 12, 30)
+        meta = client.raw_metadata(updated_at=datetime_obj)
+        assert len(meta) >= 0
+
+    def test_invalid_date_format(self, client: APIClient):
+        with pytest.raises(ValueError):
+            client.raw_metadata(date="invalid-date")
+
+    def test_date_range_validation(self, client: APIClient):
+        # date_from > date_to should return empty results
+        meta = client.raw_metadata(date_from="2025-08-10", date_to="2025-08-01")
+        assert len(meta) == 0
+
+
+class TestRawMetadata:
+    def test_filter_by_site_and_date(self, client: APIClient):
+        meta = client.raw_metadata(site_id="bucharest", date="2025-08-01")
+        assert len(meta) == 1
+        assert isinstance(meta[0], RawMetadata)
+
+    def test_filter_by_date_only(self, client: APIClient):
+        meta = client.raw_metadata(date="2025-08-08")
+        assert len(meta) == 1
+
+    def test_filter_by_instrument_pid(self, client: APIClient):
+        pid = "https://hdl.handle.net/21.12132/3.77a75f3b32294855"
+        meta = client.raw_metadata(instrument_pid=pid)
+        assert len(meta) == 1
+
+    def test_filter_by_instrument_pid_no_match(self, client: APIClient):
+        pid = "https://hdl.handle.net/21.12132/3.77a75f3b32294855"
+        meta = client.raw_metadata(instrument_pid=pid, date="2022-01-01")
+        assert len(meta) == 0
+
+    def test_filter_by_date_range_from(self, client: APIClient):
+        meta = client.raw_metadata(date_from="2025-08-01")
+        assert len(meta) == 3
+
+    def test_filter_by_date_range_inclusive(self, client: APIClient):
+        meta = client.raw_metadata(date_from="2025-08-01", date_to="2025-08-08")
+        assert len(meta) == 3
+
+    def test_filter_by_date_range_exclusive(self, client: APIClient):
+        meta = client.raw_metadata(date_from="2025-08-01", date_to="2025-08-07")
+        assert len(meta) == 2
+
+    def test_filter_by_filename_prefix(self, client: APIClient):
+        meta = client.raw_metadata(filename_prefix="20250801")
+        assert len(meta) == 1
+
+    def test_filter_by_filename_suffix(self, client: APIClient):
+        meta = client.raw_metadata(filename_suffix="000.nc")
+        assert len(meta) == 2
+
+    def test_filter_by_instrument_id(self, client: APIClient):
+        meta = client.raw_metadata(instrument_id="weather-station")
+        assert len(meta) == 1
+
+    def test_instrument_id_vs_pid_exclusivity(self, client: APIClient):
+        meta1 = client.raw_metadata(instrument_id="chm15k")
+        pid = "https://hdl.handle.net/21.12132/3.c60c931fac9d43f0"
+        meta2 = client.raw_metadata(instrument_pid=pid)
+        assert len(meta1) > 1  # Multiple chm15k files
+        assert len(meta2) == 1  # Specific PID
+
+    def test_malformed_pid(self, client: APIClient):
+        meta = client.raw_metadata(instrument_pid="not-a-valid-pid")
+        assert len(meta) == 0
+
+
+class TestDownloadingFunctionality:
+    def test_downloading(self, client: APIClient, tmp_path: Path):
+        meta = client.raw_metadata(date_from="2025-08-01")
+        assert len(meta) == 3
+        paths = client.download(meta, output_directory=tmp_path, progress=False)
+        assert len(paths) == 3
+        for path in paths:
+            assert path.exists()
+
+    def test_download_with_custom_directory(self, client: APIClient, tmp_path: Path):
+        meta = client.raw_metadata(date="2025-08-01", site_id="bucharest")
+        custom_dir = tmp_path / "custom" / "nested"
+        paths = client.download(meta, output_directory=custom_dir, progress=False)
+        assert len(paths) == 1
+        assert paths[0].parent == custom_dir
+        assert paths[0].exists()
+
+    def test_download_existing_file_skip(self, client: APIClient, tmp_path: Path):
+        meta = client.raw_metadata(date="2025-08-01", site_id="bucharest")
+        paths1 = client.download(meta, output_directory=tmp_path, progress=False)
+        original_size = paths1[0].stat().st_size
+        paths2 = client.download(meta, output_directory=tmp_path, progress=False)
+        assert paths1 == paths2
+        assert paths2[0].stat().st_size == original_size
+
+    async def test_async_download(self, client: APIClient, tmp_path: Path):
+        meta = client.raw_metadata(date_from="2025-08-01")
+        assert len(meta) == 3
+        paths = await client.adownload(meta, output_directory=tmp_path, progress=False)
+        assert len(paths) == 3
+        for path in paths:
+            assert path.exists()
+
+
+class TestProductMeta:
+    def test_file_route(self, client: APIClient):
+        uuid = "8dcc865c-6920-49ce-a627-de045ec896e8"
+        meta = client.file(uuid)
+        assert isinstance(meta, ProductMetadata)
+        assert str(meta.uuid) == uuid
+
+    def test_versions_route(self, client: APIClient):
+        uuid = "8dcc865c-6920-49ce-a627-de045ec896e8"
+        meta = client.versions(uuid)
+        assert len(meta) == 1
+        assert isinstance(meta[0], VersionMetadata)
+        assert str(meta[0].uuid) == uuid
+
+    def test_product_option(self, client: APIClient):
+        meta = client.metadata(site_id="hyytiala", product="iwc")
+        assert len(meta) == 1
+
+    def test_show_legacy_option(self, client: APIClient):
+        meta = client.metadata(site_id="hyytiala", date="2014-02-05")
+        assert len(meta) == 0
+        meta = client.metadata(site_id="hyytiala", date="2014-02-05", show_legacy=True)
+        assert len(meta) == 1
+
+    def test_downloading(self, client: APIClient, tmp_path: Path):
+        meta = client.metadata(date_from="2025-08-01")
+        assert len(meta) == 2
+        paths = client.download(meta, output_directory=tmp_path, progress=False)
+        assert len(paths) == 2
+        for path in paths:
+            assert path.exists()
+
+
+class TestFilterCombinations:
+    def test_multiple_filters_combined(self, client: APIClient):
+        meta = client.raw_metadata(
+            site_id="bucharest",
+            instrument_id="chm15k",
+            date_from="2025-08-01",
+            date_to="2025-08-01",
+        )
+        assert len(meta) == 1
+        assert meta[0].site.id == "bucharest"
+
+    def test_contradictory_filters(self, client: APIClient):
+        meta = client.raw_metadata(site_id="bucharest", instrument_id="weather-station")
+        assert len(meta) == 0
+
+    def test_partial_filename_matches(self, client: APIClient):
+        meta = client.raw_metadata(filename_prefix="2025", filename_suffix=".nc")
+        assert len(meta) == 2
+
+
+def _submit_product_file(backend_url: str, data_path: Path, meta: File):
+    _date, site_id, product = meta.filename.removesuffix(".nc").split("_")
+    full_path = data_path / meta.filename
+    headers = {"content-md5": md5sum(full_path, is_base64=True)}
+    bucket = f"cloudnet-product{'-volatile' if meta.volatile else ''}"
+    url = f"http://localhost:5900/{bucket}/{meta.filename}"
+    with open(full_path, "rb") as f:
+        res = requests.put(url, data=f, auth=("test", "test"), headers=headers)
+        res.raise_for_status()
+        file_info = {
+            "version": res.json().get("version", ""),
+            "size": int(res.json()["size"]),
+        }
+    with netCDF4.Dataset(full_path, "r") as nc:
+        year, month, day = str(nc.year), str(nc.month).zfill(2), str(nc.day).zfill(2)
+        payload = {
+            "product": getattr(nc, "cloudnet_file_type", product),
+            "site": site_id,
+            "measurementDate": f"{year}-{month}-{day}",
+            "format": "HDF5 (NetCDF4)",
+            "checksum": sha256sum(full_path),
+            "volatile": meta.volatile,
+            "legacy": meta.legacy,
+            "uuid": str(UUID(nc.file_uuid)),
+            "pid": nc.pid,
+            **file_info,
+        }
+    url = f"{backend_url}/files/{meta.filename}"
+    res = requests.put(url, json=payload)
+    if res.status_code == 403:
+        return
+    res.raise_for_status()
+
+
+def _submit_raw_file(backend_url: str, data_path: Path, meta: RawFile):
+    auth = ("admin", "admin")
+    file_path = data_path / meta.filename
+    checksum = md5sum(file_path)
+    metadata = {
+        "filename": meta.filename,
+        "checksum": checksum,
+        "site": meta.site,
+        "instrument": meta.instrument,
+        "measurementDate": meta.date,
+        "instrumentPid": meta.pid,
+    }
+    res = requests.post(f"{backend_url}/upload/metadata/", json=metadata, auth=auth)
+    if res.status_code == 409:
+        return
+    res.raise_for_status()
+    with open(file_path, "rb") as f:
+        res = requests.put(f"{backend_url}/upload/data/{checksum}", data=f, auth=auth)
+        res.raise_for_status()

cloudnet_api_client-0.10.0/cloudnet_api_client/version.py

@@ -1 +0,0 @@
-__version__ = "0.10.0"

cloudnet_api_client-0.10.0/tests/test_client.py

@@ -1,139 +0,0 @@
-import hashlib
-from pathlib import Path
-
-import requests
-
-from cloudnet_api_client import APIClient
-from cloudnet_api_client.containers import Instrument, Product, RawMetadata, Site
-
-BACKEND_URL = "http://localhost:3000"
-DATA_PATH = Path(__file__).parent / "data"
-
-
-class TestFixtures:
-    def setup_method(self):
-        self.client = APIClient(base_url=f"{BACKEND_URL}/api/")
-
-    def test_sites(self):
-        sites = self.client.sites()
-        assert isinstance(sites[0], Site)
-
-    def test_site_filter_cloudnet(self):
-        sites = self.client.sites(type="cloudnet")
-        assert all("cloudnet" in site.type for site in sites)
-
-    def test_site_filter_hidden(self):
-        sites = self.client.sites(type="hidden")
-        assert all("hidden" in site.type for site in sites)
-        assert all("cloudnet" not in site.type for site in sites)
-
-    def test_products(self):
-        products = self.client.products()
-        assert isinstance(products[0], Product)
-
-    def test_instruments(self):
-        instruments = self.client.instruments()
-        assert isinstance(instruments[0], Instrument)
-
-
-class TestWithRawFiles:
-    def setup_method(self):
-        self.client = APIClient(base_url=f"{BACKEND_URL}/api/")
-        metadata_list = [
-            (
-                "20250801_Magurele_CHM170137_000.nc",
-                "bucharest",
-                "chm15k",
-                "2025-08-01",
-                "https://hdl.handle.net/21.12132/3.c60c931fac9d43f0",
-            ),
-            (
-                "20250808_Granada_CHM170119_0045_000.nc",
-                "granada",
-                "chm15k",
-                "2025-08-08",
-                "https://hdl.handle.net/21.12132/3.77a75f3b32294855",
-            ),
-            (
-                "20250803_JOYCE_WST_01m.dat",
-                "juelich",
-                "weather-station",
-                "2025-08-01",
-                "https://hdl.handle.net/21.12132/3.726b3b29de1949cc",
-            ),
-        ]
-
-        for item in metadata_list:
-            _submit_file(*item)
-
-    def test_raw_metadata_1(self):
-        meta = self.client.raw_metadata(site_id="bucharest", date="2025-08-01")
-        assert isinstance(meta, list)
-        assert len(meta) == 1
-        assert isinstance(meta[0], RawMetadata)
-
-    def test_raw_metadata_2(self):
-        meta = self.client.raw_metadata(date="2025-08-08")
-        assert len(meta) == 1
-
-    def test_raw_metadata_3(self):
-        pid = "https://hdl.handle.net/21.12132/3.77a75f3b32294855"
-        meta = self.client.raw_metadata(instrument_pid=pid)
-        assert len(meta) == 1
-
-    def test_raw_metadata_4(self):
-        pid = "https://hdl.handle.net/21.12132/3.77a75f3b32294855"
-        meta = self.client.raw_metadata(instrument_pid=pid, date="2022-01-01")
-        assert len(meta) == 0
-
-    def test_raw_metadata_5(self):
-        meta = self.client.raw_metadata(date_from="2025-08-01")
-        assert len(meta) == 3
-
-    def test_raw_metadata_6(self):
-        meta = self.client.raw_metadata(date_from="2025-08-01", date_to="2025-08-08")
-        assert len(meta) == 3
-
-    def test_raw_metadata_7(self):
-        meta = self.client.raw_metadata(date_from="2025-08-01", date_to="2025-08-07")
-        assert len(meta) == 2
-
-    def test_raw_metadata_8(self):
-        meta = self.client.raw_metadata(filename_prefix="20250801")
-        assert len(meta) == 1
-
-    def test_raw_metadata_9(self):
-        meta = self.client.raw_metadata(filename_suffix="000.nc")
-        assert len(meta) == 2
-
-    def test_raw_metadata_10(self):
-        meta = self.client.raw_metadata(instrument_id="weather-station")
-        assert len(meta) == 1
-
-
-def _submit_file(filename: str, site: str, instrument: str, date: str, pid: str):
-    auth = ("admin", "admin")
-    file_path = DATA_PATH / filename
-
-    with open(file_path, "rb") as f:
-        checksum = hashlib.md5(f.read()).hexdigest()
-
-    metadata = {
-        "filename": filename,
-        "checksum": checksum,
-        "site": site,
-        "instrument": instrument,
-        "measurementDate": date,
-        "instrumentPid": pid,
-    }
-
-    res = requests.post(f"{BACKEND_URL}/upload/metadata/", json=metadata, auth=auth)
-    if res.status_code not in (200, 409):
-        res.raise_for_status()
-
-    if res.status_code == 200:
-        with open(file_path, "rb") as f:
-            res = requests.put(
-                f"{BACKEND_URL}/upload/data/{checksum}", data=f, auth=auth
-            )
-            res.raise_for_status()