das-cli 1.2.7__py3-none-any.whl → 1.2.12__py3-none-any.whl

das/common/entry_fields_constants.py

@@ -1,3 +1,4 @@
 # Constants for Entry Fields - Input Types
+SELECT_COMBO_INPUT = 4
 DIGITAL_OBJECT_INPUT = 13
-SELECT_COMBO_INPUT = 4
+GROUP_BOX_INPUT = 34

das/managers/entries_manager.py

@@ -4,7 +4,7 @@ from das.managers.search_manager import SearchManager
 from das.services.attributes import AttributesService
 from das.services.entry_fields import EntryFieldsService
 from das.services.entries import EntriesService
-from das.common.entry_fields_constants import DIGITAL_OBJECT_INPUT, SELECT_COMBO_INPUT
+from das.common.entry_fields_constants import DIGITAL_OBJECT_INPUT, SELECT_COMBO_INPUT, GROUP_BOX_INPUT
 from das.services.search import SearchService
 from das.services.users import UsersService
 
@@ -161,15 +161,23 @@ class EntryManager:
 
         new_entry = {}
 
+        # all keys must be strings and lowercase
+        entry = {str(k).lower(): v for k, v in entry.items()}
+        
         for field in fields:
-            field_name = field.get("displayName")
+            field_name = field.get("displayName").lower()
             column_name = field.get("column").lower()
 
-            if field_name in entry:
-                new_entry[column_name] = self.__get_value(field, entry[field_name])
+            if field.get('inputType') == GROUP_BOX_INPUT:
+                new_entry = self.__set_group_box_field_value(new_entry, field, entry)
             else:
-                new_entry[column_name] = None
-
+                if field_name in entry:
+                    new_entry[column_name] = self.__get_value(field, entry[field_name])
+                elif column_name in entry:
+                    new_entry[column_name] = self.__get_value(field, entry[column_name])
+                else:
+                    new_entry[column_name] = None
+                
         return self.entry_service.create(attribute_id=attribute_id, entry=new_entry)
     
     def update(self, id: str = None, code: str = None, entry: dict = None, entries: list = None) -> list:
@@ -246,8 +254,8 @@ class EntryManager:
 
         attribute_id = existing_entry_response.get("attributeId")
         
-        # make all keys lowercase
-        entry = {k.lower(): v for k, v in entry.items()}
+        # all keys must be strings and lowercase
+        entry = {str(k).lower(): v for k, v in entry.items()}
 
         if not attribute_id:
             raise ValueError("Attribute ID is missing in the existing entry")
@@ -265,24 +273,49 @@ class EntryManager:
         updated_entry = existing_entry_response.get('entry', {})
 
         for field in fields:
-            field_name = field.get("displayName")
+
+            field_name = field.get("displayName").lower()
             column_name = field.get("column").lower()
 
-            if field_name in entry:
-                updated_entry[column_name] = self.__get_value(field, entry[field_name])
-            elif column_name in entry:
-                updated_entry[column_name] = self.__get_value(field, entry[column_name])
+            if field.get('inputType') == GROUP_BOX_INPUT:
+                # remove the column from the entry                
+                updated_entry = self.__set_group_box_field_value(updated_entry, field, entry)
             else:
-                updated_entry[column_name] = None
+                if field_name in entry:
+                    updated_entry[column_name] = self.__get_value(field, entry[field_name])
+                elif column_name in entry:
+                    updated_entry[column_name] = self.__get_value(field, entry[column_name])
+                else:
+                    updated_entry[column_name] = None
 
         return self.entry_service.update(attribute_id=attribute_id, entry=updated_entry)
     
+    def __set_group_box_field_value(self, current_entry: dict, field, entry: dict) -> dict:
+        """Helper method to set group box field value."""
+        custom_data = field.get('customData', None)
+        if custom_data is not None:
+            custom_data = json.loads(custom_data)
+            if custom_data.get('fields') is not None:
+                for field in custom_data.get('fields'):
+                    field_name = field.get("displayName").lower()
+                    column_name = field.get("column").lower()
+                    if field_name in entry:
+                        current_entry[column_name] = self.__get_value(field, entry[field_name])
+                    elif column_name in entry:
+                        current_entry[column_name] = self.__get_value(field, entry[column_name])
+                    else:
+                        current_entry[column_name] = None
+
+        return current_entry
 
     def __get_value(self, field, source: str):
         """Helper method to get field value based on its type."""
         if field.get('inputType') == SELECT_COMBO_INPUT:  # SELECT_COMBO_INPUT
             select_value = self.__get_select_combobox_field_value(field, source)
             return select_value
+        elif field.get('inputType') == GROUP_BOX_INPUT:
+            # group_box_value = self.__get_group_box_field_value(entry_raw, field)
+            return None
         else:
             return source    
     

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.7.dist-info → das_cli-1.2.12.dist-info}/METADATA

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

{das_cli-1.2.7.dist-info → das_cli-1.2.12.dist-info}/RECORD

@@ -1,32 +1,32 @@
 das/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 das/app.py,sha256=kKxN4Vn84SA5Ph3zY13avMG2vrUp-ffpdDkhwYR9Bho,1475
-das/cli.py,sha256=hl5-QofwNwloXuCdGlCg2Nb7RffQqS2mccyN-hGbkro,50019
+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
 das/authentication/secure_input.py,sha256=P-NpbFeHrp2uIOMqip55cGn_NqqpswhnknAF1t7c2_U,1911
 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/entry_fields_constants.py,sha256=719tx8ZINbmb-qrrRM-O9AKcyy-vrPiW8tKGqom_MqY,117
 das/common/enums.py,sha256=jS0frv6717duG_wZNockXMTZ-VfsGu_f8_-lgYGnrcY,1745
 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=UEl4iI-W4OuIxYTIKVCckXOTe1pvPVoKluMrT-EcLxY,20873
+das/managers/entries_manager.py,sha256=VEu_lIN4YCsBr1QOnhzZ5I_DWs76oHebCBn9yFLNSkY,22754
 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.7.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
-das_cli-1.2.7.dist-info/METADATA,sha256=Z-cJYhyRzw7gzOP9JmDIiwfkGr6J5tJkYGsBTDhaleo,26209
-das_cli-1.2.7.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-das_cli-1.2.7.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
-das_cli-1.2.7.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
-das_cli-1.2.7.dist-info/RECORD,,
+das_cli-1.2.12.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
+das_cli-1.2.12.dist-info/METADATA,sha256=ID1WVX6J2tyCuZXUyH1uGELD7nOO8j3mrFM1lAXORW0,26210
+das_cli-1.2.12.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+das_cli-1.2.12.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
+das_cli-1.2.12.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
+das_cli-1.2.12.dist-info/RECORD,,

{das_cli-1.2.7.dist-info → das_cli-1.2.12.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.10.1)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any