das-cli 1.2.5__py3-none-any.whl → 1.2.6__py3-none-any.whl

das/common/file_utils.py

@@ -67,6 +67,9 @@ def load_csv_file(file_path: str) -> List[Dict[str, Any]]:
             
             if not headers:
                 raise ValueError("CSV file is empty or has no headers")
+
+            # Strip leading/trailing whitespace from column headers
+            headers = [h.strip() for h in headers]
             
             result = []
             for row in reader:

das/managers/entries_manager.py

@@ -172,7 +172,7 @@ class EntryManager:
 
         return self.entry_service.create(attribute_id=attribute_id, entry=new_entry)
     
-    def update(self, attribute: str, code: str = None, entry: dict = None, entries: list = None) -> list:
+    def update(self, id: str = None, code: str = None, entry: dict = None, entries: list = None) -> list:
         """
         Update one or more existing entries.
         
@@ -180,7 +180,7 @@ class EntryManager:
         If 'entries' is provided, updates multiple entries based on the code in each entry.
         
         Args:
-            attribute (str): The attribute name
+            id (str, optional): The entry ID for single entry update
             code (str, optional): The entry code for single entry update
             entry (dict, optional): The entry data for single entry update
             entries (list, optional): List of entry data for multiple updates
@@ -206,34 +206,40 @@ class EntryManager:
                 
                 # Each entry must have a Code field
                 entry_code = next((entry_data.get(key) for key in entry_data if key.lower() == 'code'), None)
+                entry_id = next((entry_data.get(key) for key in entry_data if key.lower() == 'id'), None)   
                 if not entry_code:
-                    raise ValueError(f"Entry code is missing in entry data: {entry_data}")
+                    entry_data['code'] = code
+                if not entry_id:
+                    entry_data['id'] = id
                 
                 try:
-                    result = self._update_single_entry(attribute, entry_code, entry_data)
+                    result = self._update_single_entry(id=id, code=code, entry=entry_data)
                     results.append({"code": entry_code, "id": result, "status": "success"})
                 except Exception as e:
                     results.append({"code": entry_code, "error": str(e), "status": "error"})
             
             return results
         
-        elif code and entry:
+        elif (code or id) and entry:
             # Single entry update
-            result = self._update_single_entry(attribute, code, entry)
+            result = self._update_single_entry(id=id, code=code, entry=entry)
             return [{"code": code, "id": result, "status": "success"}]
         
         else:
-            raise ValueError("Either 'code' and 'entry' or 'entries' must be provided")
+            raise ValueError("Either 'id', 'code' and 'entry' or 'entries' must be provided")
     
-    def _update_single_entry(self, attribute: str, code: str, entry: dict) -> str:
+    def _update_single_entry(self, id: str = None, code: str = None, entry: dict = None) -> str:
         """Internal method to update a single entry."""
-        if not code:
-            raise ValueError("Entry code is required")
-
-        if not entry or not isinstance(entry, dict):
-            raise ValueError("Entry data must be a non-empty dictionary")
-
-        existing_entry_response = self.entry_service.get_entry(code=code)
+        if not id and not code:
+            raise ValueError("Entry ID or code is required")
+        if id:
+            if not entry:
+                raise ValueError("Entry data is required")
+            existing_entry_response = self.entry_service.get(id=id)
+        elif code:
+            existing_entry_response = self.entry_service.get(code=code)
+        else:
+            raise ValueError("Entry ID or code is required")
 
         if not existing_entry_response or not isinstance(existing_entry_response, dict):
             raise ValueError(f"Invalid existing entry response: {existing_entry_response}")

das/services/downloads.py

@@ -1,101 +1,101 @@
-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."""
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}",
-            "Content-Type": "application/json"
-        }
-
-        url = f"{self.base_url}/Create"
-
-        response = post_data(url, data=request_data, headers=headers)
-
-        if response.get('success') == True:
-            return response.get('result')
-        else:
-            raise ValueError(response.get('error'))        
-        
-    def delete(self, request_id: str):
-        """Delete a download request by ID."""
-
-        #check if request_id is valid uuid
-        if not isinstance(request_id, str) or len(request_id) != 36:
-            raise ValueError("Invalid request ID")
-
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}",
-            "Content-Type": "application/json"
-        }
-
-        url = f"{self.base_url}/Delete?downloadRequestId={request_id}"
-
-        response = post_data(url, data={}, headers=headers)
-
-        if response.get('success') == True:
-            return response.get('result')
-        else:
-            raise ValueError(response.get('error'))
-
-    def get_my_requests(self):
-        """Get all download requests for the current user."""
-        token = load_token()
-
-        if (token is None or token == ""):
-            raise ValueError("Authorization token is required")
-
-        headers = {
-            "Authorization": f"Bearer {token}"
-        }
-        
-        url = f"{self.base_url}/GetMyRequests"
-        response = get_data(url, headers=headers)
-
-        # Expected API response shape:
-        # { success: true, result: { totalCount: number, items: [...] }, ... }
-        if isinstance(response, dict) and response.get('success') is True:
-            return response.get('result')
-        # Some backends might already return the result without 'success'
-        if isinstance(response, dict) and 'result' in response and 'success' not in response:
-            return response.get('result')
-        # If the API directly returns the payload (result), pass it through
-        if isinstance(response, dict) and 'items' in response and 'totalCount' in response:
-            return response
-        # Otherwise raise a meaningful error
-        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')
-
-    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)
+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."""
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
+
+        url = f"{self.base_url}/Create"
+
+        response = post_data(url, data=request_data, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            raise ValueError(response.get('error'))        
+        
+    def delete(self, request_id: str):
+        """Delete a download request by ID."""
+
+        #check if request_id is valid uuid
+        if not isinstance(request_id, str) or len(request_id) != 36:
+            raise ValueError("Invalid request ID")
+
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}",
+            "Content-Type": "application/json"
+        }
+
+        url = f"{self.base_url}/Delete?downloadRequestId={request_id}"
+
+        response = post_data(url, data={}, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            raise ValueError(response.get('error'))
+
+    def get_my_requests(self):
+        """Get all download requests for the current user."""
+        token = load_token()
+
+        if (token is None or token == ""):
+            raise ValueError("Authorization token is required")
+
+        headers = {
+            "Authorization": f"Bearer {token}"
+        }
+        
+        url = f"{self.base_url}/GetMyRequests"
+        response = get_data(url, headers=headers)
+
+        # Expected API response shape:
+        # { success: true, result: { totalCount: number, items: [...] }, ... }
+        if isinstance(response, dict) and response.get('success') is True:
+            return response.get('result')
+        # Some backends might already return the result without 'success'
+        if isinstance(response, dict) and 'result' in response and 'success' not in response:
+            return response.get('result')
+        # If the API directly returns the payload (result), pass it through
+        if isinstance(response, dict) and 'items' in response and 'totalCount' in response:
+            return response
+        # Otherwise raise a meaningful error
+        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')
+
+    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.2.5.dist-info → das_cli-1.2.6.dist-info}/METADATA

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

{das_cli-1.2.5.dist-info → das_cli-1.2.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 das/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 das/app.py,sha256=kKxN4Vn84SA5Ph3zY13avMG2vrUp-ffpdDkhwYR9Bho,1475
-das/cli.py,sha256=LBZMuI3xFuWT3uUK3zvevgJDHnG4QTm1UqOQAa2r_gM,49228
+das/cli.py,sha256=lh6RGqxACR4OOS7wrkhfD2yXli-Z7dsrch1_HNF05LM,51264
 das/ai/plugins/dasai.py,sha256=1P-0q4ReAnmJxliGAPMxR1aij9RWKxyTIHJzWTwLZLo,2459
 das/ai/plugins/entries/entries_plugin.py,sha256=Dhv6PrguQj5mzxBW6DlCzkmwucszazLQfzwlp9EhIGk,608
 das/authentication/auth.py,sha256=DTtH66Ft6nuuMe7EYvrr3GqGVEGGxE7GmD2fO7vRv4s,1501
@@ -9,24 +9,24 @@ das/common/api.py,sha256=GNY1nF5B8JgFDAGifC2jR2ZTtKt4GLd7W20ARky4wcY,4501
 das/common/config.py,sha256=VQi_tJ7hvIa--gvx9VCBkfVI9p0ptOvifIu08tc8kEs,6127
 das/common/entry_fields_constants.py,sha256=5Yh4Ujt70HEF-FsnwVBPBm3DB3HHzQWSWR-9Upt7C5I,93
 das/common/enums.py,sha256=jS0frv6717duG_wZNockXMTZ-VfsGu_f8_-lgYGnrcY,1745
-das/common/file_utils.py,sha256=-zePjYsj8iRpQssVQMHDK3Mh5q8FooKJCUCKCXKS6_Y,7006
+das/common/file_utils.py,sha256=Mb1uV9OAHle4zPSQFrythsU_8fzYV5grjgc1p9cmeA4,7129
 das/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 das/managers/digital_objects_manager.py,sha256=v7VAYfKoDpmWJGVgpVoSyk6hqGMiQJeOX5rgm65xE5U,3677
 das/managers/download_manager.py,sha256=bZuRX5yoKC_n00Tbjn_aRHgHLeq6SjI0TqDqgjttOQU,5431
-das/managers/entries_manager.py,sha256=UVJdAjLfqPcMYIuOcFH51jhlhd-Y_qHy2u1LDvyCi3E,20523
+das/managers/entries_manager.py,sha256=UEl4iI-W4OuIxYTIKVCckXOTe1pvPVoKluMrT-EcLxY,20873
 das/managers/search_manager.py,sha256=vXf0JmK5oW-xEGUdDnppfc1-6HdH1hfiZR7L2bCz9u0,4263
 das/services/attributes.py,sha256=78E9f1wNZYxG9Hg5HfX_h1CFmACaMjwD2Y6Ilb7PJGY,2616
 das/services/cache.py,sha256=g-vY51gqGV_1Vpza476PkMqGpuDNo1NbTwQWIIsvO0s,1932
 das/services/digital_objects.py,sha256=ww1KHVLNmm_ffzgqP4Jt4wCbHMVfhD2FJWahlSPFaes,4935
-das/services/downloads.py,sha256=gauyQUhu4TmClLbnBf1N9k86c0PWm8ZlMIvxoE5cOB8,3609
+das/services/downloads.py,sha256=cn2eoiKEDRcINlzoLgw6mpN3VVLBBiccdFyuCO7TB2I,3709
 das/services/entries.py,sha256=Dzvzx4wOljfumjBBg4sboXmgDTQf3FNbTQp-sl9hAn0,5755
 das/services/entry_fields.py,sha256=x2wUDkKNduj9pf4s56hRo0UW-eBhipkU9gFMEjFw5DA,1290
 das/services/hangfire.py,sha256=hidmVP9yb4znzBaJJRyKawYx7oYaBv5OVL-t0BhvN_A,818
 das/services/search.py,sha256=3X_KPb9fs024FhxoTr4j-xY5ymm5rvvzlekxuh8tLdg,1374
 das/services/users.py,sha256=iNijO2UPIEtcpPy8Tkemdxxym9rYLCUyckQHIQj68W0,795
-das_cli-1.2.5.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
-das_cli-1.2.5.dist-info/METADATA,sha256=GbKacAx0MU0EmgHy-rSQTgvTrnunAoh0sFyM5yzLfRs,26209
-das_cli-1.2.5.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-das_cli-1.2.5.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
-das_cli-1.2.5.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
-das_cli-1.2.5.dist-info/RECORD,,
+das_cli-1.2.6.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
+das_cli-1.2.6.dist-info/METADATA,sha256=u4cqs0vje7GcJSFi9OX-9c_PIkSCVU0z-Ez2beawnOA,26209
+das_cli-1.2.6.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+das_cli-1.2.6.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
+das_cli-1.2.6.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
+das_cli-1.2.6.dist-info/RECORD,,