das-cli 1.3.15__tar.gz → 1.4.0__tar.gz

{das_cli-1.3.15/das_cli.egg-info → das_cli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.3.15
+Version: 1.4.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT
@@ -1201,3 +1201,11 @@ MIT License
 ## Maintainers
 
 This project is maintained by the Royal Netherlands Institute for Sea Research (NIOZ).
+
+## Debugging and Troubleshooting
+
+If you need to run the current module use:
+
+```bash
+ python -m das.cli login --api-url https://api.das-dev.nioz.nl/ --oauth
+```

{das_cli-1.3.15 → das_cli-1.4.0}/README.md

@@ -1178,3 +1178,11 @@ MIT License
 ## Maintainers
 
 This project is maintained by the Royal Netherlands Institute for Sea Research (NIOZ).
+
+## Debugging and Troubleshooting
+
+If you need to run the current module use:
+
+```bash
+ python -m das.cli login --api-url https://api.das-dev.nioz.nl/ --oauth
+```

{das_cli-1.3.15 → das_cli-1.4.0}/das/app.py

@@ -5,6 +5,7 @@ from das.services.entries import EntriesService
 from das.services.entry_fields import EntryFieldsService
 from das.services.hangfire import HangfireService
 from das.services.search import SearchService
+from das.services.das_elastic_search import DasElasticSearch
 from das.common.config import save_api_url
 
 #  $env:PYTHONPATH="C:\Workspace\das-cli"  
@@ -20,7 +21,8 @@ class Das:
         self.entries = EntriesService(base_url)
         self.hangfire = HangfireService(base_url)
         self.entry_fields = EntryFieldsService(base_url)
-        self.search = SearchService(base_url)        
+        self.search = SearchService(base_url)
+        self.elastic_search = DasElasticSearch(base_url)
 
     def authenticate(self, username: str, password: str) -> str:
         """

{das_cli-1.3.15 → das_cli-1.4.0}/das/cli.py

@@ -395,6 +395,69 @@ def sync_doi(das_ctx, id):
     except Exception as e:
         click.secho(f"Error: {e}", fg="red")
 
+# Elastic Search commands group
+@cli.group()
+def elastic():
+    """Commands for working with Elastic Search"""
+    pass
+
+@elastic.command("search-item")
+@click.option('--field', required=True, help='The field to search by (e.g., identifier)')
+@click.option('--value', required=True, help='The value to search for')
+@click.option('--format', 'output_format', type=click.Choice(['table', 'json', 'compact']), default='table', help='Output format (default: table)')
+@pass_das_context
+def elastic_search_item(das_ctx, field, value, output_format):
+    """Search for an item in Elastic Search by field and value"""
+    client = das_ctx.get_client()
+    try:
+        result = client.elastic_search.search_item(field, value)
+
+        if result is None:
+            click.secho(f"No results found for {field}={value}", fg="yellow")
+            return
+
+        if output_format == 'json':
+            click.echo(json.dumps(result, indent=2))
+        elif output_format == 'compact':
+            if isinstance(result, list):
+                for item in result:
+                    if isinstance(item, dict):
+                        click.echo(', '.join(f"{k}={v}" for k, v in item.items()))
+                    else:
+                        click.echo(str(item))
+            elif isinstance(result, dict):
+                click.echo(', '.join(f"{k}={v}" for k, v in result.items()))
+            else:
+                click.echo(str(result))
+        else:
+            # table format (default)
+            click.secho(f"\n  Search results for {field}={value}", fg="cyan", bold=True)
+            click.echo()
+
+            if isinstance(result, dict):
+                max_key_len = max(len(str(k)) for k in result.keys()) if result else 0
+                for key, val in result.items():
+                    if isinstance(val, (dict, list)):
+                        val_str = json.dumps(val, indent=2)
+                        click.echo(f"  {click.style(str(key).ljust(max_key_len), fg='green')}  {val_str}")
+                    else:
+                        click.echo(f"  {click.style(str(key).ljust(max_key_len), fg='green')}  {val}")
+            elif isinstance(result, list):
+                if result and isinstance(result[0], dict):
+                    headers = list(result[0].keys())
+                    rows = [[str(item.get(h, '')) for h in headers] for item in result]
+                    click.echo(format_table(rows, headers))
+                else:
+                    for item in result:
+                        click.echo(f"  {item}")
+            else:
+                click.echo(f"  {result}")
+
+        click.echo()
+        click.secho(f"✓ Search completed successfully", fg="green")
+    except Exception as e:
+        click.secho(f"Error: {e}", fg="red")
+
 # Entries commands group
 @cli.group()
 def entry():

{das_cli-1.3.15 → das_cli-1.4.0}/das/common/entry_fields_constants.py

@@ -2,3 +2,4 @@
 SELECT_COMBO_INPUT = 4
 DIGITAL_OBJECT_INPUT = 13
 GROUP_BOX_INPUT = 34
+SUB_FORM_RELATIONS = 33

{das_cli-1.3.15 → das_cli-1.4.0}/das/managers/entries_manager.py

@@ -2,9 +2,10 @@ import json
 from das.common.config import load_api_url
 from das.managers.search_manager import SearchManager
 from das.services.attributes import AttributesService
+from das.services.das_elastic_search import DasElasticSearch
 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, GROUP_BOX_INPUT
+from das.common.entry_fields_constants import DIGITAL_OBJECT_INPUT, SELECT_COMBO_INPUT, GROUP_BOX_INPUT, SUB_FORM_RELATIONS
 from das.services.search import SearchService
 from das.services.users import UsersService
 
@@ -22,6 +23,7 @@ class EntryManager:
         self.search_service = SearchService(base_url)
         self.attribute_service = AttributesService(base_url)
         self.user_service = UsersService(base_url)
+        self.das_elastic_search = DasElasticSearch(base_url)
 
     def delete(self, id: str = None, code: str = None) -> bool:
         """Delete an entry by its id or code."""
@@ -324,8 +326,9 @@ class EntryManager:
                 elif column_name in entry:
                     updated_entry[column_name] = self.__get_value(field, entry[column_name])
 
-        return self.entry_service.update(attribute_id=attribute_id, entry=updated_entry)
-    
+        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)
@@ -347,12 +350,78 @@ class EntryManager:
         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)
+        elif field.get('inputType') == GROUP_BOX_INPUT:            
             return None
+        elif field.get('inputType') == SUB_FORM_RELATIONS:
+            sub_form_relations_value = self.__get_sub_form_relations_field_value(field, source)
+            return sub_form_relations_value
         else:
-            return source    
+            return source
     
+    def __get_sub_form_relations_field_value(self, field, source: str | list | dict) -> str | list | dict:
+        if not source:
+            return None
+
+        if isinstance(source, (dict, list)):
+            return source
+
+        # convert all keys to lowercase
+        field = {str(k).lower(): v for k, v in field.items()}
+
+        tag = None
+        values = [v.strip() for v in source.split(',') if v.strip()]
+        relations = []
+
+        if field.get('customdata', None) is not None:
+            try:
+                customdata_string = field.get('customdata').lower()
+                customdata = json.loads(customdata_string)
+                if customdata is not None and isinstance(customdata, dict):
+                    if "tag" in customdata:
+                        tag = customdata.get("tag")
+                    if "relations" in customdata:
+                        relations = customdata.get("relations")
+            except json.JSONDecodeError:
+                raise ValueError(f"Invalid customdata JSON: {field.get('customdata')}")
+
+        result_list = []
+        for value in values:
+            response = self.das_elastic_search.search_item(field="identifier", value=value)
+            if response.get('item') is not None and isinstance(response.get('item'), dict):
+                if response.get('item').get('source') is not None and isinstance(response.get('item').get('source'), dict):
+                    source = response.get('item').get('source', {})
+                    # find the attribute id in the relation.attributeid using lambda and check if its the same as the source.attributeid, if not raise an error
+                    if relations and not any(rel.get('attributeid') == source.get('attributeid') for rel in relations):                    
+                        raise ValueError(f"Attribute ID {source.get('attributeid')} for value '{value}' is not allowed in the relations list")
+                    item = {
+                        "id": source.get('id'),
+                        "name": source.get('title'),
+                        "code": source.get('code'),
+                        "attributeId": source.get('attributeid'),
+                        "tag": tag,
+                        "acronym": None,
+                        "order": 0
+                    }
+                    # get the attribute name from the relations where the attribute id is the same as the source.attributeid using lambda
+                    attribute_name = next((attr.get('attributealias') for attr in relations if attr.get('attributeid') == source.get('attributeid')), None)
+
+                    # We need to check if the relation item already exists in the result list, if it does we need to append the item to the relations list of that item, if not we need to create a new item in the result list
+                    existing_item = next((i for i in result_list if i.get('attribute') == attribute_name), None)
+                    if existing_item:
+                        existing_item.get('relations', []).append(item)
+                        continue
+                                        
+                    item_relation = {
+                        "attribute": attribute_name,
+                        "relations": [item],
+                        "tag": tag
+                    }
+
+                    result_list.append(item_relation)
+
+        return json.dumps(result_list) if result_list else source
+
+
     def __get_select_combobox_field_value(self, field, source: str | list | dict) -> str | list | dict:
         """Helper method to get select combobox field value."""
 

das_cli-1.4.0/das/services/das_elastic_search.py

@@ -0,0 +1,26 @@
+from das.services.service_base import ServiceBase
+from das.common.api import post_data
+
+class DasElasticSearch(ServiceBase):
+    def __init__(self, base_url):
+        self.base_url = f"{base_url}/api/services/app/DataPortal"        
+
+    def search_item(self, field: str, value: str):
+        headers = {**self.set_auth_headers(), "Content-Type": "application/json"}
+        url = f"{self.base_url}/SearchItem"
+
+        payload = {
+            "field": field,
+            "value": value
+        }
+        
+        response = post_data(url, data=payload, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            error = response.get('error', 'Unknown error')
+            raw_content = response.get('raw_content', '')
+            if raw_content:
+                raise ValueError(f"{error}\nResponse content: {raw_content}")
+            raise ValueError(str(error))

{das_cli-1.3.15 → das_cli-1.4.0/das_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: das-cli
-Version: 1.3.15
+Version: 1.4.0
 Summary: DAS api client.
 Author: Royal Netherlands Institute for Sea Research
 License-Expression: MIT
@@ -1201,3 +1201,11 @@ MIT License
 ## Maintainers
 
 This project is maintained by the Royal Netherlands Institute for Sea Research (NIOZ).
+
+## Debugging and Troubleshooting
+
+If you need to run the current module use:
+
+```bash
+ python -m das.cli login --api-url https://api.das-dev.nioz.nl/ --oauth
+```

{das_cli-1.3.15 → das_cli-1.4.0}/das_cli.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ das/managers/entries_manager.py
 das/managers/search_manager.py
 das/services/attributes.py
 das/services/cache.py
+das/services/das_elastic_search.py
 das/services/digital_objects.py
 das/services/downloads.py
 das/services/entries.py

{das_cli-1.3.15 → das_cli-1.4.0}/pyproject.toml

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

{das_cli-1.3.15 → das_cli-1.4.0}/tests/entries_manager_test.py

@@ -78,6 +78,27 @@ class TestEntriesManager(unittest.TestCase):
         self.assertIsNotNone(created_event)
         self.assertRegex(created_event[0]['id'], r'^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$')
 
+    def test_create_analytical_run_entry(self):
+        """Test creating an analytical run entry"""
+
+        payload = {
+            'Alias': 'alias-test',
+            'Instrument': 'k.b.db',
+            'Date': '2024-06-01',
+            'Protocol(s)': 'zc.b.v,zc.b.t',
+            'Comment': 'This is a test comment',
+            'Operator': 'Wim Boer',
+            'Software': 'q.b.b',
+            'Sample(s)': "4.b.x3g,4.b.p3g,4.b.w3g,zb.b.bc,zb.b.lk,zb.b.k1",
+            'Standard(s)': "wc.b.4,wc.b.k"
+        }
+
+        created_entry_id = self.entry_manager.create(attribute="Analytical Run", entry=payload)
+
+        self.assertIsNotNone(created_entry_id)
+        # assert createrd entry id is an guid
+        self.assertRegex(created_entry_id[0]['id'], r'^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$')        
+
     def test_delete_entry(self):
         """Test deleting an entry"""