cloudnet-api-client 0.12.7__tar.gz → 0.12.9__tar.gz

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/.github/dataportal.env

@@ -8,8 +8,8 @@ TYPEORM_PORT=5432
 TYPEORM_SYNCHRONIZE=false
 TYPEORM_MIGRATIONS_RUN=true
 TYPEORM_LOGGING=false
-TYPEORM_ENTITIES=build/entity/*.js
-TYPEORM_MIGRATIONS=build/migration/*.js
+TYPEORM_ENTITIES=build/app/src/entity/*.js
+TYPEORM_MIGRATIONS=build/app/src/migration/*.js
 DP_SS_URL=http://storage-service:5900
 DP_SS_USER=test
 DP_SS_PASSWORD=test

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/.github/docker-compose.yml

@@ -15,7 +15,7 @@ services:
       [
         "sh",
         "-c",
-        "node build/fixtures.js /backend-fixtures/backend/fixtures TRUNCATE && node build/fixtures.js /dataportal-fixtures APPEND && npm run start",
+        "node build/app/src/fixtures.js /backend-fixtures/backend/fixtures TRUNCATE && node build/app/src/fixtures.js /dataportal-fixtures APPEND && npm run start",
       ]
   db:
     image: "postgres:16"

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/.github/workflows/publish.yml

@@ -12,9 +12,9 @@ jobs:
       contents: write
       id-token: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: "3.10"
       - name: Install dependencies
@@ -30,7 +30,7 @@ jobs:
           echo "name=cloudnet-api-client $version" >> $GITHUB_OUTPUT
         id: changelog
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           name: ${{ steps.changelog.outputs.name }}
           body_path: ${{ github.workspace }}-CHANGELOG.txt

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/.github/workflows/test.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Cache Python dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/pyproject.toml') }}
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Checkout fixtures
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: actris-cloudnet/dataportal
           sparse-checkout: backend/fixtures/
@@ -36,13 +36,13 @@ jobs:
           path: backend-fixtures
 
       - name: Checkout production fixtures
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: actris-cloudnet/dataportal-fixtures
           path: dataportal-fixtures
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Start dataportal
         run: docker compose -f .github/docker-compose.yml up -d --wait
@@ -62,3 +62,7 @@ jobs:
       - name: Shutdown backend
         if: always()
         run: docker compose -f .github/docker-compose.yml down
+
+      - name: Print logs
+        if: always()
+        run: docker compose -f .github/docker-compose.yml logs

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/CHANGELOG.md

@@ -5,6 +5,15 @@ 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.9 – 2026-04-14
+
+- Add s3key to file metadata
+
+## 0.12.8 – 2026-03-24
+
+- Support downloading of single metadata objects
+- Hide total progress bar when downloading a single file
+
 ## 0.12.7 – 2025-12-18
 
 - Adjust progress bars

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnet-api-client
-Version: 0.12.7
+Version: 0.12.9
 Summary: Cloudnet API client
 Author-email: Simo Tukiainen <simo.tukiainen@fmi.fi>
 License-File: LICENSE
@@ -51,7 +51,7 @@ sites = client.sites()
 site = client.site("hyytiala")
 
 products = client.products()
-product = client.products("classification")
+product = client.product("classification")
 
 models = client.models()
 model = client.model("ecmwf-open")
@@ -239,13 +239,13 @@ Download files from the fetched metadata.
 
 Parameters:
 
-| name              | type                                           | default           |
-| ----------------- | ---------------------------------------------- | ----------------- |
-| metadata          | `list[RawMetadata]` or `list[ProductMetadata]` |                   |
-| output_directory  | `PathLike` or `str`                            | Current directory |
-| concurrency_limit | `int`                                          | 5                 |
-| progress          | `bool` or `None`                               | `None`            |
-| validate_checksum | `bool`                                         | `False`           |
+| name              | type                                            | default           |
+| ----------------- | ----------------------------------------------- | ----------------- |
+| metadata          | `RawMetadata`, `ProductMetadata` or `list[...]` |                   |
+| output_directory  | `PathLike` or `str`                             | Current directory |
+| concurrency_limit | `int`                                           | 5                 |
+| progress          | `bool` or `None`                                | `None`            |
+| validate_checksum | `bool`                                          | `False`           |
 
 There's also an asynchronous version of this function:
 `cloudnet_api_client.adownload`. It's useful for usage inside Jupyter notebook.

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/README.md

@@ -22,7 +22,7 @@ sites = client.sites()
 site = client.site("hyytiala")
 
 products = client.products()
-product = client.products("classification")
+product = client.product("classification")
 
 models = client.models()
 model = client.model("ecmwf-open")
@@ -210,13 +210,13 @@ Download files from the fetched metadata.
 
 Parameters:
 
-| name              | type                                           | default           |
-| ----------------- | ---------------------------------------------- | ----------------- |
-| metadata          | `list[RawMetadata]` or `list[ProductMetadata]` |                   |
-| output_directory  | `PathLike` or `str`                            | Current directory |
-| concurrency_limit | `int`                                          | 5                 |
-| progress          | `bool` or `None`                               | `None`            |
-| validate_checksum | `bool`                                         | `False`           |
+| name              | type                                            | default           |
+| ----------------- | ----------------------------------------------- | ----------------- |
+| metadata          | `RawMetadata`, `ProductMetadata` or `list[...]` |                   |
+| output_directory  | `PathLike` or `str`                             | Current directory |
+| concurrency_limit | `int`                                           | 5                 |
+| progress          | `bool` or `None`                                | `None`            |
+| validate_checksum | `bool`                                          | `False`           |
 
 There's also an asynchronous version of this function:
 `cloudnet_api_client.adownload`. It's useful for usage inside Jupyter notebook.

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/cloudnet_api_client/client.py

@@ -322,7 +322,7 @@ class APIClient:
 
     def download(
         self,
-        metadata: MetadataList,
+        metadata: MetadataList | TMetadata,
         output_directory: str | PathLike = ".",
         concurrency_limit: int = 5,
         progress: bool | None = None,
@@ -340,7 +340,7 @@ class APIClient:
 
     async def adownload(
         self,
-        metadata: MetadataList,
+        metadata: MetadataList | TMetadata,
         output_directory: str | PathLike = ".",
         concurrency_limit: int = 5,
         progress: bool | None = None,

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/cloudnet_api_client/containers.py

@@ -131,6 +131,7 @@ class ProductMetadata(Metadata):
     format: str
     start_time: datetime.datetime | None
     stop_time: datetime.datetime | None
+    s3key: str | None
 
 
 @dataclass(frozen=True, slots=True)

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/cloudnet_api_client/dl.py

@@ -8,14 +8,22 @@ import aiohttp
 from tqdm import tqdm
 
 from cloudnet_api_client import utils
-from cloudnet_api_client.containers import Metadata, ProductMetadata
+from cloudnet_api_client.containers import (
+    Metadata,
+    ProductMetadata,
+)
 
 
 class BarConfig:
     def __init__(
-        self, disable: bool | None, max_workers: int, total_bytes: int
+        self,
+        disable: bool | None,
+        max_workers: int,
+        total_bytes: int,
+        n_files: int,
     ) -> None:
         self.disable = disable
+        self.single_file = n_files <= 1
         self.position_queue = self._init_position_queue(max_workers)
         self.total_amount = tqdm(
             total=total_bytes,
@@ -23,7 +31,7 @@ class BarConfig:
             unit="iB",
             unit_scale=True,
             unit_divisor=1024,
-            disable=self.disable,
+            disable=self.disable if not self.single_file else True,
             position=0,
             leave=False,
             colour="green",
@@ -32,7 +40,8 @@ class BarConfig:
 
     def _init_position_queue(self, max_workers: int) -> asyncio.Queue:
         queue: asyncio.Queue = asyncio.Queue()
-        for i in range(1, max_workers + 1):
+        start = 0 if self.single_file else 1
+        for i in range(start, start + max_workers):
             queue.put_nowait(i)
         return queue
 
@@ -49,17 +58,17 @@ class DlParams:
 
 async def download_files(
     base_url: str,
-    metadata: Iterable[Metadata],
+    metadata: Iterable[Metadata] | Metadata,
     output_path: Path,
     concurrency_limit: int,
     disable_progress: bool | None,
     validate_checksum: bool = False,
 ) -> list[Path]:
-    metas = list(metadata)
+    metas = list(metadata) if isinstance(metadata, Iterable) else [metadata]
     file_exists = _checksum_matches if validate_checksum else _size_and_name_matches
     semaphore = asyncio.Semaphore(concurrency_limit)
     total_bytes = sum(meta.size for meta in metas)
-    bar_config = BarConfig(disable_progress, concurrency_limit, total_bytes)
+    bar_config = BarConfig(disable_progress, concurrency_limit, total_bytes, len(metas))
     full_paths = []
     async with aiohttp.ClientSession() as session:
         tasks = []

cloudnet_api_client-0.12.9/cloudnet_api_client/version.py

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

{cloudnet_api_client-0.12.7 → cloudnet_api_client-0.12.9}/tests/test_client.py

@@ -462,6 +462,19 @@ class TestDownloadingFunctionality:
         assert paths1 == paths2
         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)
+        paths = client.download(meta, output_directory=tmp_path, progress=False)
+        assert len(paths) == 1
+        assert paths[0].exists()
+
+    def test_downloading_single_metadata_II(self, client: APIClient, tmp_path: Path):
+        meta = client.raw_files(date_from="2025-08-01")
+        assert len(meta) == 3
+        paths = client.download(meta[0], output_directory=tmp_path, progress=False)
+        assert len(paths) == 1
+
     async def test_async_download(self, client: APIClient, tmp_path: Path):
         meta = client.raw_files(date_from="2025-08-01")
         assert len(meta) == 3
@@ -523,6 +536,7 @@ def _submit_product_file(backend_url: str, data_path: Path, meta: File):
             "uuid": str(UUID(nc.file_uuid)),
             "pid": nc.pid,
             "instrumentPid": getattr(nc, "instrument_pid", None),
+            "s3key": None,
             **file_info,
         }
         payload["model"] = product if payload["product"] == "model" else None

cloudnet_api_client-0.12.7/cloudnet_api_client/version.py

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