das-cli 1.1.0__tar.gz → 1.2.0__tar.gz

{das_cli-1.1.0/das_cli.egg-info → das_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.1.0
+Version: 1.2.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.1.0 → das_cli-1.2.0}/das/cli.py

@@ -992,6 +992,38 @@ def create_download_request(das_ctx, name, entry, file, from_file, output_format
     except Exception as e:
         click.secho(f"Error: {e}", fg="red")
 
+@download.command("files")
+@click.argument('request_id', required=True)
+@click.option('--out', 'output_path', required=False, default='.', help='Output file path or directory (defaults to current directory)')
+@click.option('--force', is_flag=True, help='Overwrite existing file if present')
+@pass_das_context
+def download_files(das_ctx, request_id, output_path, force):
+    """
+    Download the completed bundle for a download request and save it to disk.
+
+    Examples:
+
+    \b
+    # Save into current directory with server-provided filename
+    das download files 6b0e68e6-00cd-43a7-9c51-d56c9c091123
+
+    \b
+    # Save to a specific folder
+    das download files 6b0e68e6-00cd-43a7-9c51-d56c9c091123 --out C:\\Downloads
+
+    \b
+    # Save to an explicit filename, overwriting if exists
+    das download files 6b0e68e6-00cd-43a7-9c51-d56c9c091123 --out C:\\Downloads\\bundle.zip --force
+    """
+    try:
+        das_ctx.get_client()
+        saved_path = das_ctx.download_manager.save_download(request_id=request_id, output_path=output_path, overwrite=force)
+        click.secho(f"✓ Download saved to: {saved_path}", fg="green")
+    except FileExistsError as e:
+        click.secho(str(e), fg="yellow")
+    except Exception as e:
+        click.secho(f"Error: {e}", fg="red")
+
 @download.command("delete-request")
 @click.argument('request_id', required=True)
 @pass_das_context

{das_cli-1.1.0 → das_cli-1.2.0}/das/common/api.py

@@ -27,6 +27,26 @@ def get_data(url, headers=None, params=None):
         print(f"Error fetching API data: {e}")
         return {"error": str(e)}
 
+def get_binary_response(url, headers=None, params=None, stream=True):
+    """
+    Perform a GET request expected to return binary content.
+
+    Returns the raw requests.Response so callers can inspect headers
+    and stream content to disk.
+    """
+    try:
+        response = requests.get(
+            url,
+            headers=headers,
+            params=params,
+            verify=load_verify_ssl(),
+            stream=stream,
+        )
+        response.raise_for_status()
+        return response
+    except requests.RequestException as e:
+        return {"error": str(e)}
+
 def post_data(url, headers=None, data=None):
     """
     Send data to a REST API endpoint.

{das_cli-1.1.0 → das_cli-1.2.0}/das/managers/download_manager.py

@@ -90,4 +90,46 @@ class DownloadManager:
 
     def get_my_requests(self):
         """Get all download requests for the current user."""
-        return self.download_request_service.get_my_requests()
+        return self.download_request_service.get_my_requests()
+
+    def download_files(self, request_id: str):
+        """Return streaming response for files of a download request."""
+        return self.download_request_service.download_files(request_id)
+
+    def save_download(self, request_id: str, output_path: str, overwrite: bool = False) -> str:
+        """
+        Download and save the request bundle to disk.
+
+        Returns the path to the saved file.
+        """
+        import os
+
+        resp = self.download_files(request_id)
+        # If an error structure was returned from lower layer
+        if isinstance(resp, dict) and resp.get('error'):
+            raise ValueError(resp['error'])
+
+        # Determine filename from headers if available
+        filename = f"download_{request_id}.zip"
+        try:
+            cd = resp.headers.get('Content-Disposition') if hasattr(resp, 'headers') else None
+            if cd and 'filename=' in cd:
+                filename = cd.split('filename=')[-1].strip('"')
+        except Exception:
+            pass
+
+        # If output_path is a directory, join with filename
+        target_path = output_path
+        if os.path.isdir(output_path) or output_path.endswith(os.path.sep):
+            target_path = os.path.join(output_path, filename)
+
+        if os.path.exists(target_path) and not overwrite:
+            raise FileExistsError(f"File already exists: {target_path}. Use overwrite to replace.")
+
+        # Stream to disk
+        with open(target_path, 'wb') as f:
+            for chunk in resp.iter_content(chunk_size=8192):
+                if chunk:
+                    f.write(chunk)
+
+        return target_path

{das_cli-1.1.0 → das_cli-1.2.0}/das/services/downloads.py

@@ -1,10 +1,11 @@
-from das.common.api import post_data, get_data
+from das.common.api import post_data, get_data, get_binary_response
 from das.common.config import load_token
 
 
 class DownloadRequestService:
     def __init__(self, base_url):
         self.base_url = f"{base_url}/api/services/app/DownloadRequest"
+        self.download_files_url = f"{base_url}/File/DownloadRequestSet"
 
     def create(self, request_data: list[dict]):
         """Create a new download request."""
@@ -81,4 +82,20 @@ class DownloadRequestService:
         error_msg = None
         if isinstance(response, dict):
             error_msg = response.get('error') or response.get('message')
-        raise ValueError(error_msg or 'Failed to fetch download requests')
+        raise ValueError(error_msg or 'Failed to fetch download requests')
+
+    def download_files(self, request_id: str):
+        """Return a streaming HTTP response for the download bundle of a request."""
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+            
+        headers = {
+            "Authorization": f"Bearer {token}"
+        }
+
+        url = f"{self.download_files_url}?requestId={request_id}"
+
+        response = get_binary_response(url, headers=headers, params=None, stream=True)
+        return response

{das_cli-1.1.0 → das_cli-1.2.0/das_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.1.0
+Version: 1.2.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT

{das_cli-1.1.0 → das_cli-1.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "das-cli"
-version = "1.1.0"
+version = "1.2.0"
 authors = [
   { name="Royal Netherlands Institute for Sea Research" },
 ]