das-cli 1.2.26__tar.gz → 1.2.28__tar.gz

{das_cli-1.2.26/das_cli.egg-info → das_cli-1.2.28}/PKG-INFO

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

{das_cli-1.2.26 → das_cli-1.2.28}/das/common/api.py

@@ -17,10 +17,10 @@ def get_data(url, headers=None, params=None):
     """
     try:
         response = requests.get(url, headers=headers, params=params, verify=load_verify_ssl())
-        response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
         except json.JSONDecodeError as json_err:
+            response.raise_for_status()
             print(f"Error decoding JSON response: {json_err}")
             return {"error": f"Invalid JSON response: {json_err}", "raw_content": response.text[:200]}
     except requests.RequestException as e:
@@ -61,10 +61,10 @@ def post_data(url, headers=None, data=None):
     """
     try:
         response = requests.post(url, headers=headers, json=data, verify=load_verify_ssl())
-        response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
         except json.JSONDecodeError as json_err:
+            response.raise_for_status()
             print(f"Error decoding JSON response: {json_err}")
             return {"error": f"Invalid JSON response: {json_err}", "raw_content": response.text[:200]}
     except requests.RequestException as e:
@@ -85,10 +85,10 @@ def put_data(url, headers=None, data=None):
     """
     try:
         response = requests.put(url, headers=headers, json=data, verify=load_verify_ssl())
-        response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
         except json.JSONDecodeError as json_err:
+            response.raise_for_status()
             print(f"Error decoding JSON response: {json_err}")
             return {"error": f"Invalid JSON response: {json_err}", "raw_content": response.text[:200]}
     except requests.RequestException as e:
@@ -109,10 +109,10 @@ def delete_data(url, headers=None, data=None):
     """
     try:
         response = requests.delete(url, headers=headers, json=data, verify=load_verify_ssl())
-        response.raise_for_status()  # Raise an error for HTTP errors
         try:
             return response.json()
         except json.JSONDecodeError as json_err:
+            response.raise_for_status()
             print(f"Error decoding JSON response: {json_err}")
             return {"error": f"Invalid JSON response: {json_err}", "raw_content": response.text[:200]}
     except requests.RequestException as e:

{das_cli-1.2.26 → das_cli-1.2.28}/das/managers/search_manager.py

@@ -2,7 +2,8 @@ from das.common.config import load_api_url
 from das.services.attributes import AttributesService
 from das.services.entry_fields import EntryFieldsService
 from das.services.search import SearchService
-
+from das.common.entry_fields_constants import DIGITAL_OBJECT_INPUT, GROUP_BOX_INPUT
+import json
 class SearchManager:
     def __init__(self):        
         base_url = load_api_url()
@@ -12,6 +13,21 @@ class SearchManager:
         self.attributes_service = AttributesService(base_url)
         self.entry_fields = EntryFieldsService(base_url)
 
+    def __convert_group_box_filter(self, entry_fields: list, filter: str) -> str:
+        """Converts user-friendly group box filter to API-compatible filter."""
+        for field in entry_fields:
+            if field.get('inputType') == GROUP_BOX_INPUT:
+                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'):
+                            display_name = field.get('displayName')
+                            column_name = field.get('column')
+                            if display_name and column_name:
+                                filter = filter.lower().replace(f"{display_name.lower()}(", f"{column_name.lower()}(")
+        return filter
+
     def __convert_filter(self, entry_fields: list, filter: str) -> str:
         """Converts user-friendly filter to API-compatible filter.""" 
         # The fileter will be in the format: name(*64*);Create at(>2023-01-01);Sampling Location(*North Sea*)       
@@ -19,6 +35,8 @@ class SearchManager:
         for field in entry_fields:
             display_name = field.get('displayName')
             column_name = field.get('column')
+            if field.get('inputType') == GROUP_BOX_INPUT:
+                filter = self.__convert_group_box_filter(entry_fields, filter)
             if display_name and column_name:
                 filter = filter.lower().replace(f"{display_name.lower()}(", f"{column_name.lower()}(")
         return filter

{das_cli-1.2.26 → das_cli-1.2.28}/das/services/entries.py

@@ -5,6 +5,14 @@ class EntriesService():
     def __init__(self, base_url):
         self.base_url = f"{base_url}/api/services/app/Entry"
 
+    def _raise_error(self, response: dict):
+        error = response.get('error') or {}
+        if isinstance(error, dict):
+            message = (error.get('message') or 'Unknown error occurred').strip()
+        else:
+            message = str(error).strip() or 'Unknown error occurred'
+        raise ValueError(message)
+
     def get_entry(self, code: str):
         """Get an entry by its code (raw key values)."""
         token = load_token()
@@ -23,7 +31,7 @@ class EntriesService():
         if response.get('success') == True:
             return response.get('result')
         else:
-            raise ValueError(response.get('error'))
+            self._raise_error(response)
 
     def get(self, id: str = None, code: str = None):
         token = load_token()
@@ -51,7 +59,7 @@ class EntriesService():
             raw_content = response.get('raw_content', '')
             raise ValueError(f"API returned invalid JSON: {response.get('error')}\nResponse content: {raw_content}")
         else:
-            raise ValueError(response.get('error') or "Unknown error occurred")
+            self._raise_error(response)
 
     def delete_by_id(self, id: str) -> bool:
         """Delete an entry by its id."""
@@ -77,7 +85,7 @@ class EntriesService():
         if response.get('success') == True:
             return True
         else:
-            raise ValueError(response.get('error'))
+            self._raise_error(response)
 
     def delete(self, code: str) -> bool:
         """Delete an entry by its code."""
@@ -102,7 +110,7 @@ class EntriesService():
         if response.get('success') == True:
             return True
         else:
-            raise ValueError(response.get('error'))     
+            self._raise_error(response)     
 
     def create(self, attribute_id: int, entry: dict):
         """Create a new entry."""
@@ -128,7 +136,7 @@ class EntriesService():
         if response.get('success') == True:
             return response.get('result')
         else:
-            raise ValueError(response.get('error')) 
+            self._raise_error(response) 
         
     def update(self, attribute_id: int, entry: dict):       
         """Update an existing entry."""
@@ -154,7 +162,7 @@ class EntriesService():
         if response.get('success') == True:
             return response.get('result')
         else:
-            raise ValueError(response.get('error'))
+            self._raise_error(response)
 
     def get_entry_logs(
         self,
@@ -183,7 +191,7 @@ class EntriesService():
         if response.get('success') == True:
             return response.get('result')
         else:
-            raise ValueError(response.get('error'))
+            self._raise_error(response)
 
     def chown(self, new_user_id: int, entry_list_ids: list[str]):
         """Change the owner of a list of entries."""
@@ -209,5 +217,5 @@ class EntriesService():
         if response.get('success') == True:
             return response.get('result')
         else:
-            raise ValueError(response.get('error'))
+            self._raise_error(response)
 

{das_cli-1.2.26 → das_cli-1.2.28/das_cli.egg-info}/PKG-INFO

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

{das_cli-1.2.26 → das_cli-1.2.28}/pyproject.toml

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