das-cli 1.0.4__py3-none-any.whl → 1.2.4__py3-none-any.whl

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/services/entries.py

@@ -52,8 +52,34 @@ class EntriesService():
             raise ValueError(f"API returned invalid JSON: {response.get('error')}\nResponse content: {raw_content}")
         else:
             raise ValueError(response.get('error') or "Unknown error occurred")
-        
-    def delete(self, code: str):
+
+    def delete_by_id(self, id: str) -> bool:
+        """Delete an entry by its id."""
+
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}"
+        }
+
+        response_entry = self.get(id=id)
+
+        if response_entry is None:
+            raise ValueError(f"Entry with id {id} not found")
+
+        url = f"{self.base_url}/Delete?Id={response_entry.get('entry',{}).get('id')}&AttributeId={response_entry.get('attributeId')}"
+
+        response = delete_data(url, headers=headers)
+
+        if response.get('success') == True:
+            return True
+        else:
+            raise ValueError(response.get('error'))
+
+    def delete(self, code: str) -> bool:
         """Delete an entry by its code."""
         token = load_token()
 
@@ -74,7 +100,7 @@ class EntriesService():
         response = delete_data(url, headers=headers)
 
         if response.get('success') == True:
-            return response
+            return True
         else:
             raise ValueError(response.get('error'))