cloudnet-api-client 0.12.10__tar.gz → 0.12.11__tar.gz

{cloudnet_api_client-0.12.10 → cloudnet_api_client-0.12.11}/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.12.11 – 2026-06-17
+
+- Add model_id filtering to files() query
+
 ## 0.12.10 – 2026-06-09
 
 - Update site types

{cloudnet_api_client-0.12.10 → cloudnet_api_client-0.12.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnet-api-client
-Version: 0.12.10
+Version: 0.12.11
 Summary: Cloudnet API client
 Author-email: Simo Tukiainen <simo.tukiainen@fmi.fi>
 License-File: LICENSE

{cloudnet_api_client-0.12.10 → cloudnet_api_client-0.12.11}/cloudnet_api_client/client.py

@@ -171,6 +171,7 @@ class APIClient:
             "instrument": instrument_id,
             "instrumentPid": instrument_pid,
             "product": product_id,
+            "model": model_id,
             "showLegacy": show_legacy,
         }
         if show_legacy is not True:
@@ -181,7 +182,7 @@ class APIClient:
             params, date, date_from, date_to, updated_at, updated_at_from, updated_at_to
         )
 
-        _check_params({**params, "model": model_id}, ("showLegacy",))
+        _check_params(params, ("showLegacy",))
 
         no_instrument = instrument_id is None and instrument_pid is None
 
@@ -199,7 +200,6 @@ class APIClient:
             for key in ("showLegacy", "product", "instrument", "instrumentPid"):
                 if key in params:
                     del params[key]
-            params["model"] = model_id
             files_res += self._get("model-files", params, expected_code=400)
 
         return _build_meta_objects(files_res)

cloudnet_api_client-0.12.11/cloudnet_api_client/version.py

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

{cloudnet_api_client-0.12.10 → cloudnet_api_client-0.12.11}/tests/test_client.py

@@ -24,6 +24,16 @@ from cloudnet_api_client.containers import (
 )
 from cloudnet_api_client.utils import CloudnetAPIError, md5sum, sha256sum
 
+# Product file UUIDs (submitted by the files_product fixture).
+CLASSIFICATION_UUID = "8dcc865c-6920-49ce-a627-de045ec896e8"
+PARSIVEL_UUID = "ab872770-9136-4e61-8958-31e62abdfb1b"
+ECMWF_OPEN_UUID = "277d54f0-d376-4448-a784-f1c8b819b46a"
+
+# Raw file instrument PIDs (submitted by the files_raw fixture).
+BUCHAREST_CHM15K_PID = "https://hdl.handle.net/21.12132/3.c60c931fac9d43f0"
+GRANADA_CHM15K_PID = "https://hdl.handle.net/21.12132/3.77a75f3b32294855"
+JUELICH_WST_PID = "https://hdl.handle.net/21.12132/3.726b3b29de1949cc"
+
 
 class RawFile(NamedTuple):
     filename: str
@@ -35,8 +45,9 @@ class RawFile(NamedTuple):
 
 class File(NamedTuple):
     filename: str
-    legacy: bool
     volatile: bool
+    legacy: bool = False
+    model: str | None = None
 
 
 @pytest.fixture(scope="session")
@@ -62,21 +73,21 @@ def files_raw() -> list[RawFile]:
             site="bucharest",
             instrument="chm15k",
             date="2025-08-01",
-            pid="https://hdl.handle.net/21.12132/3.c60c931fac9d43f0",
+            pid=BUCHAREST_CHM15K_PID,
         ),
         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",
+            pid=GRANADA_CHM15K_PID,
         ),
         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",
+            pid=JUELICH_WST_PID,
         ),
     ]
 
@@ -84,11 +95,18 @@ def files_raw() -> list[RawFile]:
 @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),
-        File("20250821_limassol_parsivel_41582c49.nc", legacy=False, volatile=False),
-        File("20250822_leipzig-lim_ecmwf-open.nc", legacy=False, volatile=True),
+        File("20250814_bucharest_classification.nc", volatile=True),
+        File("20250808_hyytiala_iwc-Z-T-method.nc", volatile=False),
+        File("20140205_hyytiala_classification.nc", volatile=False, legacy=True),
+        File("20250821_limassol_parsivel_41582c49.nc", volatile=False),
+        File("20250822_leipzig-lim_ecmwf-open.nc", volatile=True),
+        File("20250711_kenttarova_l3-cf_ecmwf.nc", volatile=True, model="ecmwf"),
+        File(
+            "20250711_kenttarova_l3-cf_era5-1-12.nc", volatile=True, model="era5-1-12"
+        ),
+        File(
+            "20250711_kenttarova_l3-cf_era5-7-18.nc", volatile=True, model="era5-7-18"
+        ),
     ]
 
 
@@ -286,34 +304,30 @@ class TestInstruments:
 
 class TestProductFiles:
     def test_file_route_with_geophysical_product(self, client: APIClient):
-        uuid = "8dcc865c-6920-49ce-a627-de045ec896e8"
-        meta = client.file(uuid)
+        meta = client.file(CLASSIFICATION_UUID)
         assert isinstance(meta, ProductMetadata)
-        assert str(meta.uuid) == uuid
+        assert str(meta.uuid) == CLASSIFICATION_UUID
         assert meta.instrument is None
         assert meta.model is None
         assert meta.product.id == "classification"
 
     def test_file_route_with_instrument_product(self, client: APIClient):
-        uuid = "ab872770-9136-4e61-8958-31e62abdfb1b"
-        meta = client.file(uuid)
+        meta = client.file(PARSIVEL_UUID)
         assert meta.model is None
         assert isinstance(meta.instrument, Instrument)
         assert meta.instrument.instrument_id == "parsivel"
 
     def test_file_route_with_model_product(self, client: APIClient):
-        uuid = "277d54f0-d376-4448-a784-f1c8b819b46a"
-        meta = client.file(uuid)
+        meta = client.file(ECMWF_OPEN_UUID)
         assert meta.instrument is None
         assert isinstance(meta.model, Model)
         assert meta.model.id == "ecmwf-open"
 
     def test_versions_route(self, client: APIClient):
-        uuid = "8dcc865c-6920-49ce-a627-de045ec896e8"
-        meta = client.versions(uuid)
+        meta = client.versions(CLASSIFICATION_UUID)
         assert len(meta) == 1
         assert isinstance(meta[0], VersionMetadata)
-        assert str(meta[0].uuid) == uuid
+        assert str(meta[0].uuid) == CLASSIFICATION_UUID
 
     def test_product_option(self, client: APIClient):
         meta = client.files(site_id="hyytiala", product_id="iwc")
@@ -333,13 +347,28 @@ class TestProductFiles:
         meta = client.files(instrument_id="parsivel")
         assert len(meta) == 1
 
+    def test_model_filter_on_l3_product(self, client: APIClient):
+        models = ("ecmwf", "era5-1-12", "era5-7-18")
+        all_l3 = client.files(site_id="kenttarova", product_id="l3-cf")
+        assert {m.model.id for m in all_l3 if m.model} == set(models)
+        for model_id in models:
+            meta = client.files(
+                site_id="kenttarova", product_id="l3-cf", model_id=model_id
+            )
+            assert len(meta) == 1
+            assert meta[0].model is not None
+            assert meta[0].model.id == model_id
+        no_match = client.files(
+            site_id="kenttarova", product_id="l3-cf", model_id="ecmwf-open"
+        )
+        assert len(no_match) == 0
+
     def test_files_route_with_invalid_input(self, client: APIClient):
         with pytest.raises(CloudnetAPIError):
             client.files(site_id="invalid-site")
 
     def test_file_is_hashable(self, client: APIClient):
-        uuid = "8dcc865c-6920-49ce-a627-de045ec896e8"
-        meta = client.file(uuid)
+        meta = client.file(CLASSIFICATION_UUID)
         hash(meta)
 
 
@@ -355,13 +384,11 @@ class TestRawFiles:
         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_files(instrument_pid=pid)
+        meta = client.raw_files(instrument_pid=GRANADA_CHM15K_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_files(instrument_pid=pid, date="2022-01-01")
+        meta = client.raw_files(instrument_pid=GRANADA_CHM15K_PID, date="2022-01-01")
         assert len(meta) == 0
 
     def test_filter_by_date_range_from(self, client: APIClient):
@@ -390,8 +417,7 @@ class TestRawFiles:
 
     def test_instrument_id_vs_pid_exclusivity(self, client: APIClient):
         meta1 = client.raw_files(instrument_id="chm15k")
-        pid = "https://hdl.handle.net/21.12132/3.c60c931fac9d43f0"
-        meta2 = client.raw_files(instrument_pid=pid)
+        meta2 = client.raw_files(instrument_pid=BUCHAREST_CHM15K_PID)
         assert len(meta1) > 1  # Multiple chm15k files
         assert len(meta2) == 1  # Specific PID
 
@@ -463,8 +489,7 @@ class TestDownloadingFunctionality:
         assert paths2[0].stat().st_size == original_size
 
     def test_downloading_single_metadata(self, client: APIClient, tmp_path: Path):
-        uuid = "ab872770-9136-4e61-8958-31e62abdfb1b"
-        meta = client.file(uuid)
+        meta = client.file(PARSIVEL_UUID)
         paths = client.download(meta, output_directory=tmp_path, progress=False)
         assert len(paths) == 1
         assert paths[0].exists()
@@ -534,12 +559,15 @@ def _submit_product_file(backend_url: str, data_path: Path, meta: File):
             "volatile": meta.volatile,
             "legacy": meta.legacy,
             "uuid": str(UUID(nc.file_uuid)),
-            "pid": nc.pid,
+            "pid": getattr(nc, "pid", ""),
             "instrumentPid": getattr(nc, "instrument_pid", None),
             "s3key": None,
             **file_info,
         }
-        payload["model"] = product if payload["product"] == "model" else None
+        if payload["product"] == "model":
+            payload["model"] = product
+        else:
+            payload["model"] = meta.model
     url = f"{backend_url}/files/{meta.filename}"
     res = requests.put(url, json=payload)
     if res.status_code == 403:

cloudnet_api_client-0.12.10/cloudnet_api_client/version.py

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