cloudnet-api-client 0.5.0__tar.gz → 0.6.0__tar.gz

{cloudnet_api_client-0.5.0 → cloudnet_api_client-0.6.0}/CHANGELOG.md

@@ -5,6 +5,16 @@ 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.6.0 – 2025-04-22
+
+- Fix datetime parsing for Python 3.10
+- Add Instrument and Model objects to metadata
+
+## 0.5.1 – 2025-04-04
+
+- Raise if downloading failed after retries
+- Adjust logging
+
 ## 0.5.0 – 2025-04-04
 
 - Add option to query one site

{cloudnet_api_client-0.5.0 → cloudnet_api_client-0.6.0}/PKG-INFO

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

{cloudnet_api_client-0.5.0 → cloudnet_api_client-0.6.0}/cloudnet_api_client/client.py

@@ -270,13 +270,13 @@ def _add_date_params(
         msg = "Cannot use 'date' with 'date_from' and 'date_to'"
         raise ValueError(msg)
     if date is not None:
-        start, stop = _parse_date(date)
+        start, stop = _parse_date_param(date)
         params["dateFrom"] = start.isoformat()
         params["dateTo"] = stop.isoformat()
     if date_from is not None:
-        params["dateFrom"] = _parse_date(date_from)[0].isoformat()
+        params["dateFrom"] = _parse_date_param(date_from)[0].isoformat()
     if date_to is not None:
-        params["dateTo"] = _parse_date(date_to)[1].isoformat()
+        params["dateTo"] = _parse_date_param(date_to)[1].isoformat()
 
     if updated_at is not None and (
         updated_at_from is not None or updated_at_to is not None
@@ -284,16 +284,16 @@ def _add_date_params(
         msg = "Cannot use 'updated_at' with 'updated_at_from' and 'updated_at_to'"
         raise ValueError(msg)
     if updated_at is not None:
-        start, stop = _parse_datetime(updated_at)
+        start, stop = _parse_datetime_param(updated_at)
         params["updatedAtFrom"] = start.isoformat()
         params["updatedAtTo"] = stop.isoformat()
     if updated_at_from is not None:
-        params["updatedAtFrom"] = _parse_datetime(updated_at_from)[0].isoformat()
+        params["updatedAtFrom"] = _parse_datetime_param(updated_at_from)[0].isoformat()
     if updated_at_to is not None:
-        params["updatedAtTo"] = _parse_datetime(updated_at_to)[1].isoformat()
+        params["updatedAtTo"] = _parse_datetime_param(updated_at_to)[1].isoformat()
 
 
-def _parse_date(date: DateParam) -> tuple[datetime.date, datetime.date]:
+def _parse_date_param(date: DateParam) -> tuple[datetime.date, datetime.date]:
     if isinstance(date, datetime.date):
         return date, date
     error = ValueError(f"Invalid date format: {date}")
@@ -316,7 +316,9 @@ def _parse_date(date: DateParam) -> tuple[datetime.date, datetime.date]:
     raise error
 
 
-def _parse_datetime(dt: DateTimeParam) -> tuple[datetime.datetime, datetime.datetime]:
+def _parse_datetime_param(
+    dt: DateTimeParam,
+) -> tuple[datetime.datetime, datetime.datetime]:
     if isinstance(dt, datetime.datetime):
         return dt, dt
     if isinstance(dt, datetime.date):
@@ -376,19 +378,49 @@ CONVERTED = {"measurement_date", "created_at", "updated_at", "size", "uuid"}
 
 
 def _build_meta_objects(res: list[dict]) -> list[ProductMetadata]:
-    field_names = {f.name for f in fields(ProductMetadata)} - CONVERTED - {"product"}
+    field_names = (
+        {f.name for f in fields(ProductMetadata)}
+        - CONVERTED
+        - {"product", "instrument", "model"}
+    )
     return [
         ProductMetadata(
             **{_to_snake(k): v for k, v in obj.items() if _to_snake(k) in field_names},
             product=Product(
                 id=obj["product"]["id"],
                 human_readable_name=obj["product"]["humanReadableName"],
-                type=[obj["product"]["type"][1:-1]],
+                type=obj["product"]["type"],
                 experimental=obj["product"]["experimental"],
             ),
+            instrument=Instrument(
+                instrument_id=obj["instrument"]["instrumentId"],
+                model=obj["instrument"]["model"],
+                type=obj["instrument"]["type"],
+                uuid=uuid.UUID(obj["instrument"]["uuid"]),
+                pid=obj["instrument"]["pid"],
+                owners=obj["instrument"]["owners"],
+                serial_number=obj["instrument"]["serialNumber"],
+                name=obj["instrument"]["name"],
+            )
+            if "instrument" in obj and obj["instrument"] is not None
+            else None,
+            model=Model(
+                model_id=obj["model"]["id"],
+                name=obj["model"]["humanReadableName"],
+                optimum_order=obj["model"]["optimumOrder"],
+                source_model_id=obj["model"]["sourceModelId"],
+                forecast_start=obj["model"]["forecastStart"]
+                if obj["model"]["forecastStart"] is not None
+                else None,
+                forecast_end=obj["model"]["forecastEnd"]
+                if obj["model"]["forecastEnd"] is not None
+                else None,
+            )
+            if "model" in obj and obj["model"] is not None
+            else None,
             measurement_date=datetime.date.fromisoformat(obj["measurementDate"]),
-            created_at=datetime.datetime.fromisoformat(obj["createdAt"]),
-            updated_at=datetime.datetime.fromisoformat(obj["updatedAt"]),
+            created_at=_parse_datetime(obj["createdAt"]),
+            updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
             uuid=uuid.UUID(obj["uuid"]),
         )
@@ -412,8 +444,8 @@ def _build_raw_meta_objects(res: list[dict]) -> list[RawMetadata]:
                 name=obj["instrumentInfo"]["name"],
             ),
             measurement_date=datetime.date.fromisoformat(obj["measurementDate"]),
-            created_at=datetime.datetime.fromisoformat(obj["createdAt"]),
-            updated_at=datetime.datetime.fromisoformat(obj["updatedAt"]),
+            created_at=_parse_datetime(obj["createdAt"]),
+            updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
             uuid=uuid.UUID(obj["uuid"]),
         )
@@ -439,8 +471,8 @@ def _build_raw_model_meta_objects(res: list[dict]) -> list[RawModelMetadata]:
                 else None,
             ),
             measurement_date=datetime.date.fromisoformat(obj["measurementDate"]),
-            created_at=datetime.datetime.fromisoformat(obj["createdAt"]),
-            updated_at=datetime.datetime.fromisoformat(obj["updatedAt"]),
+            created_at=_parse_datetime(obj["createdAt"]),
+            updated_at=_parse_datetime(obj["updatedAt"]),
             size=int(obj["size"]),
             uuid=uuid.UUID(obj["uuid"]),
         )
@@ -459,3 +491,7 @@ def _make_session() -> requests.Session:
     session.mount("https://", adapter)
     session.mount("http://", adapter)
     return session
+
+
+def _parse_datetime(dt: str) -> datetime.datetime:
+    return datetime.datetime.strptime(dt, "%Y-%m-%dT%H:%M:%S.%fZ")

{cloudnet_api_client-0.5.0 → cloudnet_api_client-0.6.0}/cloudnet_api_client/containers.py

@@ -83,3 +83,5 @@ class RawModelMetadata(Metadata):
 @dataclass(frozen=True, slots=True)
 class ProductMetadata(Metadata):
     product: Product
+    instrument: Instrument | None
+    model: Model | None

{cloudnet_api_client-0.5.0 → cloudnet_api_client-0.6.0}/cloudnet_api_client/dl.py

@@ -30,7 +30,7 @@ async def download_files(
             destination = output_path / meta.download_url.split("/")[-1]
             full_paths.append(destination)
             if destination.exists() and _file_checksum_matches(meta, destination):
-                logging.info(f"Already downloaded: {destination}")
+                logging.debug(f"Already downloaded: {destination}")
                 continue
             task = asyncio.create_task(
                 _download_file_with_retries(
@@ -61,6 +61,7 @@ async def _download_file_with_retries(
             logging.warning(f"Attempt {attempt} failed for {url}: {e}")
             if attempt == max_retries:
                 logging.error(f"Giving up on {url} after {max_retries} attempts.")
+                raise e
             else:
                 # Exponential backoff before retrying
                 await asyncio.sleep(2**attempt)
@@ -93,7 +94,7 @@ async def _download_file(
                         break
                     file_out.write(chunk)
                     bar.update(len(chunk))
-        logging.info(f"Downloaded: {destination}")
+        logging.debug(f"Downloaded: {destination}")
 
 
 def _file_checksum_matches(

cloudnet_api_client-0.6.0/cloudnet_api_client/version.py

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

cloudnet_api_client-0.5.0/cloudnet_api_client/version.py

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