das-cli 1.2.21__tar.gz → 1.2.24__tar.gz

{das_cli-1.2.21/das_cli.egg-info → das_cli-1.2.24}/PKG-INFO

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

{das_cli-1.2.21 → das_cli-1.2.24}/das/managers/entries_manager.py

@@ -350,64 +350,102 @@ class EntryManager:
         else:
             return source    
     
-    def __get_select_combobox_field_value(self, field, source: str) -> str:
+    def __get_select_combobox_field_value(self, field, source: str | list | dict) -> str | list | dict:
         """Helper method to get select combobox field value."""
 
         if not source:
             return None
 
+        # if is a dict return source as is
+        if isinstance(source, dict):
+            return source
+        elif isinstance(source, list):
+            return source
+
         attribute_id = -1
 
+        # convert all keys to lowercase
+        field = {str(k).lower(): v for k, v in field.items()}
+
         if field.get('column').isdigit():
             attribute_id = int(field.get('column'))
         elif field.get('column')[0].isalpha() and field.get('column')[1:].isdigit():
             attribute_id = int(field.get('column')[1:])
 
-        if attribute_id == -1:            
-            # then we need to check if the field has the property customdata
-            if not field.get('customdata', None) is None:
-                try:
-                    customdata = json.loads(field.get('customdata'))
-                    if (customdata is not None and isinstance(customdata, dict) and "datasource" in customdata):
-                        datasource = customdata.get("datasource")
-                        if (datasource is not None and isinstance(datasource, dict) and "attributeid" in datasource):
+        customdata = None
+        is_multiselect = False
+
+        if not field.get('customdata', None) is None and field.get('customdata') != "":
+            try:
+                customdata_string = field.get('customdata').lower()
+                customdata = json.loads(customdata_string)
+                if (customdata is not None and isinstance(customdata, dict) and "datasource" in customdata):
+                    datasource = customdata.get("datasource")
+                    if datasource is not None and isinstance(datasource, dict):
+                        if "attributeid" in datasource:
                             attribute_id = datasource.get("attributeid")
-                except json.JSONDecodeError:
-                    raise ValueError(f"Invalid customdata JSON: {field.get('customdata')}")             
+                        if "ismultiselect" in datasource:
+                            is_multiselect = datasource.get("ismultiselect")
+            except json.JSONDecodeError:
+                raise ValueError(f"Invalid customdata JSON: {field.get('customdata')}")
+
+        expected_max_result_count = 1
+        if is_multiselect:
+            expected_max_result_count = len(source.split(','))
 
         search_params = {
             "attributeId": attribute_id,            
-            "queryString": f"displayname({source});",
-            "maxResultCount": 1,
+            "queryString": self.__get_query_string(source, is_multiselect),
+            "maxResultCount": expected_max_result_count,
             "skipCount": 0
         }
+            
+        search_response = self.search_service.search_entries(**search_params)
 
-        # checks if source is GUID, if so, than we search by id   
-        if self.is_guid(source):
-            search_params['queryString'] = f"id({source});"
-            search_response = self.search_service.search_entries(**search_params)
+        if search_response.get('totalCount', 0) == 0:
+            raise ValueError(f"No results found for {field.get('displayName')}: {source}. Attribute ID: {attribute_id}")
+        result_list = []
+        if search_response and 'items' in search_response and len(search_response['items']) > 0:
+            for item in search_response['items']:
+                result = {}
+                result['id'] = item.get('entry', {}).get('id')
+                result['name'] = item.get('entry', {}).get('displayname')
+                result['code'] = item.get('entry', {}).get('code')            
+                result['alias'] = item.get('entry', {}).get('alias', None)
+                result['attributeid'] = attribute_id
+                result = {k: v for k, v in result.items() if v is not None}
+                result_list.append(result)
+            return json.dumps(result_list)
         else:
-            search_params['queryString'] = f"displayname({source});"
-            search_response = self.search_service.search_entries(**search_params)
+            return source                
+
+    def __get_query_string(self, source: str, is_multiselect: bool) -> str:
+
+        if not source:
+            return None
+
+        if not is_multiselect:
+            if self.is_guid(source):
+                return f"id({source});"
+            else:
+                return f"displayname({source}) or code({source});"
+        else:
+            values = source.split(',')
+            query_strings = []            
+            for value in values:
+                if self.is_guid(value):                    
+                    query_string = f"id({value}) "
+                else:
+                    query_string = f"displayname({value}) or code({value}) "
+                query_strings.append(query_string)
+            return f"{' or '.join(query_strings)}"
+            
+            
+                
+
 
-        search_response = self.search_service.search_entries(**search_params)
 
-        if search_response.get('totalCount', 0) == 0:
-            search_params['queryString'] = f"code({source});"
-            search_response = self.search_service.search_entries(**search_params)
 
-        if search_response and 'items' in search_response and len(search_response['items']) > 0:
-            result = {}
-            result['id'] = search_response['items'][0].get('entry', {}).get('id')
-            result['name'] = search_response['items'][0].get('entry', {}).get('displayname')
-            result['code'] = search_response['items'][0].get('entry', {}).get('code')            
-            result['alias'] = search_response['items'][0].get('entry', {}).get('alias', None)
-            result['attributeid'] = attribute_id
-            # Filter out None values from the result dictionary
-            result = {k: v for k, v in result.items() if v is not None}
-            return json.dumps([result])
-        else:           
-            return source
 
     def is_guid(self, source: str) -> bool:
         """Helper method to check if a string is a GUID."""

{das_cli-1.2.21 → das_cli-1.2.24/das_cli.egg-info}/PKG-INFO

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

{das_cli-1.2.21 → das_cli-1.2.24}/pyproject.toml

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