cloudnet-api-client 0.12.0__tar.gz → 0.12.2__tar.gz

{cloudnet_api_client-0.12.0 → cloudnet_api_client-0.12.2}/CHANGELOG.md

@@ -5,6 +5,14 @@ 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.2 – 2025-08-25
+
+- Fix product type filter bug
+
+## 0.12.1 – 2025-08-25
+
+- Fix tag subset filters
+
 ## 0.12.0 – 2025-08-25
 
 - Adjust routes and responses

{cloudnet_api_client-0.12.0 → cloudnet_api_client-0.12.2}/PKG-INFO

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

{cloudnet_api_client-0.12.0 → cloudnet_api_client-0.12.2}/cloudnet_api_client/client.py

@@ -60,7 +60,7 @@ class APIClient:
         self,
         type: SITE_TYPE | list[SITE_TYPE] | None = None,
     ) -> list[Site]:
-        validate_type(type, SITE_TYPE)
+        type = validate_type(type, SITE_TYPE)
         res = self._get("sites", {"type": type})
         return _build_objects(res, Site)
 
@@ -71,7 +71,7 @@ class APIClient:
     def products(
         self, type: PRODUCT_TYPE | list[PRODUCT_TYPE] | None = None
     ) -> list[Product]:
-        validate_type(type, PRODUCT_TYPE)
+        type = validate_type(type, PRODUCT_TYPE)
         data = self._get("products")
         if type is not None:
             data = [obj for obj in data if any(t in obj["type"] for t in type)]
@@ -373,16 +373,13 @@ class APIClient:
             metadata = [
                 m
                 for m in metadata
-                if isinstance(m, RawMetadata)
-                and m.tags
-                and include_tag_subset.issubset(m.tags)
+                if isinstance(m, RawMetadata) and include_tag_subset.issubset(m.tags)
             ]
         if exclude_tag_subset:
             metadata = [
                 m
                 for m in metadata
                 if isinstance(m, RawMetadata)
-                and m.tags
                 and not exclude_tag_subset.issubset(m.tags)
             ]
         return metadata
@@ -677,7 +674,7 @@ def _check_params(params: dict, ignore: tuple = ()) -> None:
         raise TypeError("At least one of the parameters must be set.")
 
 
-def validate_type(type, values) -> None:
+def validate_type(type, values) -> list | None:
     if type is not None:
         if not isinstance(type, str | list):
             raise ValueError(f"Invalid type: {type}")
@@ -685,3 +682,4 @@ def validate_type(type, values) -> None:
         for t in type:
             if t not in get_args(values):
                 raise ValueError(f"Invalid type: {t}")
+    return type

{cloudnet_api_client-0.12.0 → cloudnet_api_client-0.12.2}/cloudnet_api_client/containers.py

@@ -91,7 +91,7 @@ class Metadata:
 class RawMetadata(Metadata):
     status: STATUS
     instrument: Instrument
-    tags: frozenset[str] | None
+    tags: frozenset[str]
 
 
 @dataclass(frozen=True, slots=True)

cloudnet_api_client-0.12.2/cloudnet_api_client/version.py

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

{cloudnet_api_client-0.12.0 → cloudnet_api_client-0.12.2}/tests/test_client.py

@@ -153,10 +153,12 @@ class TestProducts:
 
     def test_products_route_with_type_filter(self, client: APIClient):
         products = client.products("instrument")
+        assert len(products) > 5
         assert all(product.type == {"instrument"} for product in products)
 
     def test_products_route_with_type_filter_combo(self, client: APIClient):
         products = client.products(["instrument", "geophysical"])
+        assert len(products) > 5
         assert all(
             product.type in [{"instrument"}, {"geophysical"}] for product in products
         )

cloudnet_api_client-0.12.0/cloudnet_api_client/version.py

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