das-cli 1.2.33__tar.gz → 1.3.0__tar.gz

{das_cli-1.2.33/das_cli.egg-info → das_cli-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.2.33
+Version: 1.3.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT
@@ -185,6 +185,16 @@ das entry update --attribute <AttributeName> [--code CODE] <file_path>
 das entry upload-digital-object --entry-code ENT001 --type Dataset --description "CTD raw" c:\data\ctd.zip
 ```
 
+#### Direct download a digital object
+
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
 #### Link or unlink digital objects
 
 ```bash
@@ -925,6 +935,39 @@ digital_object_id = digital_objects_manager.upload_digital_object(
 )
 ```
 
+#### Direct Download Digital Object
+
+**CLI:**
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
+**Manager Layer:**
+```python
+from das.managers.digital_objects_manager import DigitalObjectsManager
+
+digital_objects_manager = DigitalObjectsManager()
+
+# Download by codes
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_code="ENT001",
+    digital_object_code="DO001",
+    output_path="C:\\Downloads\\"
+)
+
+# Download by IDs
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_id="e1987f3e-7db7-11f0-a7e8-0edcca226f3d",
+    attribute_id=126,
+    digital_object_id="cf335b17-80e3-4151-aa80-40b69fe0567e",
+    output_path="C:\\Downloads\\file.bin"
+)
+```
+
 #### Link/Unlink Digital Objects
 
 **CLI:**

{das_cli-1.2.33 → das_cli-1.3.0}/README.md

@@ -162,6 +162,16 @@ das entry update --attribute <AttributeName> [--code CODE] <file_path>
 das entry upload-digital-object --entry-code ENT001 --type Dataset --description "CTD raw" c:\data\ctd.zip
 ```
 
+#### Direct download a digital object
+
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
 #### Link or unlink digital objects
 
 ```bash
@@ -902,6 +912,39 @@ digital_object_id = digital_objects_manager.upload_digital_object(
 )
 ```
 
+#### Direct Download Digital Object
+
+**CLI:**
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
+**Manager Layer:**
+```python
+from das.managers.digital_objects_manager import DigitalObjectsManager
+
+digital_objects_manager = DigitalObjectsManager()
+
+# Download by codes
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_code="ENT001",
+    digital_object_code="DO001",
+    output_path="C:\\Downloads\\"
+)
+
+# Download by IDs
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_id="e1987f3e-7db7-11f0-a7e8-0edcca226f3d",
+    attribute_id=126,
+    digital_object_id="cf335b17-80e3-4151-aa80-40b69fe0567e",
+    output_path="C:\\Downloads\\file.bin"
+)
+```
+
 #### Link/Unlink Digital Objects
 
 **CLI:**

{das_cli-1.2.33 → das_cli-1.3.0}/das/cli.py

@@ -724,6 +724,49 @@ def upload_digital_object(das_ctx, entry_code, digital_object_type, file_descrip
     except Exception as e:
         click.secho(f"Error: {e}", fg="red")
 
+@entry.command("direct-download-digital-object")
+@click.option('--entry-code', default=None, help='Entry code containing the digital object')
+@click.option('--entry-id', default=None, help='Entry ID containing the digital object')
+@click.option('--attribute-id', type=int, default=None, help='Attribute ID for the entry (required with --entry-id)')
+@click.option('--digital-object-code', default=None, help='Digital object code to download')
+@click.option('--digital-object-id', default=None, help='Digital object ID to download')
+@click.option('--out', 'output_path', required=True, help='Output file path or output directory')
+@pass_das_context
+def direct_download_digital_object(das_ctx, entry_code, entry_id, attribute_id, digital_object_code, digital_object_id, output_path):
+    """Directly download a digital object by codes or IDs.
+
+    Examples:
+
+    \b
+    # Download using entry and digital object codes
+    das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\\Downloads\\
+
+    \b
+    # Download using IDs
+    das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\\Downloads\\file.bin
+    """
+    try:
+        das_ctx.get_client()
+
+        if not entry_code and not entry_id:
+            raise click.UsageError("Please provide either --entry-code or --entry-id")
+        if not digital_object_code and not digital_object_id:
+            raise click.UsageError("Please provide either --digital-object-code or --digital-object-id")
+        if entry_id and not attribute_id:
+            raise click.UsageError("--attribute-id is required when using --entry-id")
+
+        saved_path = das_ctx.digital_objects_manager.direct_download_digital_object(
+            entry_code=entry_code,
+            entry_id=entry_id,
+            attribute_id=attribute_id,
+            digital_object_id=digital_object_id,
+            digital_object_code=digital_object_code,
+            output_path=output_path,
+        )
+        click.secho(f"✓ Digital object saved to: {saved_path}", fg="green")
+    except Exception as e:
+        click.secho(f"Error: {e}", fg="red")
+
 @entry.command("get")
 @click.option('--code', default=None, help='Entry code')
 @click.option('--id', type=int, default=None, help='Entry ID')

{das_cli-1.2.33 → das_cli-1.3.0}/das/managers/digital_objects_manager.py

@@ -78,6 +78,43 @@ class DigitalObjectsManager:
 
         return digital_object_id
 
+    
+    def direct_download_digital_object(self, 
+        entry_code: str = None, 
+        entry_id: str = None, 
+        attribute_id: int = None, 
+        digital_object_id: str = None, 
+        digital_object_code: str = None,         
+        output_path: str = None):
+        """Directly download a digital object from the digital object service."""
+        if not output_path:
+            raise ValueError("Output path is required")
+        if entry_code:
+            entry_response = self.entry_service.get_entry(entry_code)
+            if entry_response is None:
+                raise ValueError(f"Entry with code '{entry_code}' not found")
+            if entry_response.get('attributeId') is None:
+                raise ValueError(f"Entry with code '{entry_code}' has no attributeId")
+            entry_id = entry_response.get('entry').get('id')
+            attribute_id = entry_response.get('attributeId')
+        if digital_object_code:
+            digital_object_response = self.entry_service.get_entry(digital_object_code)
+            if digital_object_response is None:
+                raise ValueError(f"Digital object with code '{digital_object_code}' not found")
+            if digital_object_response.get('attributeId') is None:
+                raise ValueError(f"Digital object with code '{digital_object_code}' has no attributeId")
+            digital_object_id = digital_object_response.get('entry').get('id')
+            
+        if not entry_id or not attribute_id or not digital_object_id:
+            raise ValueError("Entry ID, attribute ID, and digital object ID are required")
+
+        return self.digital_objects_service.direct_download_digital_object(
+            entry_id=entry_id,
+            attribute_id=attribute_id,
+            digital_object_id=digital_object_id,
+            output_path=output_path
+        )
+
 
 if __name__ == "__main__":
     digital_objects_manager = DigitalObjectsManager()

{das_cli-1.2.33 → das_cli-1.3.0}/das/services/digital_objects.py

@@ -2,7 +2,7 @@ import os
 from math import ceil
 from os.path import exists
 import json
-from base64 import b64encode
+from base64 import b64encode, b64decode
 from das.common.api import post_data
 from das.common.config import load_verify_ssl
 from das.services.service_base import ServiceBase
@@ -123,3 +123,60 @@ class DigitalObjectsService(ServiceBase):
                 raise ValueError(f"Error uploading file: {response.status_code} - {response.text}")
         except requests.RequestException as e:
             raise ValueError(f"Error uploading file: {str(e)}")
+
+
+    def direct_download_digital_object(self, entry_id: str, attribute_id: int, digital_object_id: str, output_path: str):
+        """Directly download a digital object from the digital object service."""
+        headers = {**self.set_auth_headers(), "Content-Type": "application/json"}
+
+        url = f"{self.base_url}/GetDigitalObjectsFromEntry"
+
+        payload = {
+            "attributeId": attribute_id,
+            "entryId": entry_id,
+            "digitalObjectId": digital_object_id
+        }
+
+        response = post_data(url, data=payload, headers=headers)
+        if response.get("success") != True:
+            raise ValueError(response.get("error") or "Unknown error occurred")
+
+        result = response.get("result") or {}
+        digital_object_item = result.get("digitalObjectItem") or {}
+        data = digital_object_item.get("data")
+        display_name = digital_object_item.get("displayName")
+
+        if data is None:
+            raise ValueError("Digital object data was not returned by the API")
+
+        file_bytes = None
+        if isinstance(data, str):
+            try:
+                file_bytes = b64decode(data, validate=False)
+            except Exception as e:
+                raise ValueError(f"Invalid base64 digital object data: {str(e)}")
+        elif isinstance(data, (bytes, bytearray)):
+            file_bytes = bytes(data)
+        else:
+            raise ValueError("Unsupported digital object data format")
+
+        is_directory_target = (
+            output_path.endswith(os.sep)
+            or output_path.endswith("/")
+            or output_path.endswith("\\")
+            or os.path.isdir(output_path)
+        )
+
+        if is_directory_target:
+            if not display_name:
+                raise ValueError("Digital object displayName was not returned by the API")
+
+            os.makedirs(output_path, exist_ok=True)
+            final_output_path = os.path.join(output_path, display_name)
+        else:
+            final_output_path = output_path
+
+        with open(final_output_path, "wb") as file_handle:
+            file_handle.write(file_bytes)
+
+        return final_output_path

{das_cli-1.2.33 → das_cli-1.3.0/das_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.2.33
+Version: 1.3.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT
@@ -185,6 +185,16 @@ das entry update --attribute <AttributeName> [--code CODE] <file_path>
 das entry upload-digital-object --entry-code ENT001 --type Dataset --description "CTD raw" c:\data\ctd.zip
 ```
 
+#### Direct download a digital object
+
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
 #### Link or unlink digital objects
 
 ```bash
@@ -925,6 +935,39 @@ digital_object_id = digital_objects_manager.upload_digital_object(
 )
 ```
 
+#### Direct Download Digital Object
+
+**CLI:**
+```bash
+# Download by entry and digital object codes
+das entry direct-download-digital-object --entry-code ENT001 --digital-object-code DO001 --out C:\Downloads\
+
+# Download by IDs
+das entry direct-download-digital-object --entry-id e1987f3e-7db7-11f0-a7e8-0edcca226f3d --attribute-id 126 --digital-object-id cf335b17-80e3-4151-aa80-40b69fe0567e --out C:\Downloads\file.bin
+```
+
+**Manager Layer:**
+```python
+from das.managers.digital_objects_manager import DigitalObjectsManager
+
+digital_objects_manager = DigitalObjectsManager()
+
+# Download by codes
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_code="ENT001",
+    digital_object_code="DO001",
+    output_path="C:\\Downloads\\"
+)
+
+# Download by IDs
+saved_path = digital_objects_manager.direct_download_digital_object(
+    entry_id="e1987f3e-7db7-11f0-a7e8-0edcca226f3d",
+    attribute_id=126,
+    digital_object_id="cf335b17-80e3-4151-aa80-40b69fe0567e",
+    output_path="C:\\Downloads\\file.bin"
+)
+```
+
 #### Link/Unlink Digital Objects
 
 **CLI:**

{das_cli-1.2.33 → das_cli-1.3.0}/pyproject.toml

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