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

das/cli.py

@@ -290,38 +290,39 @@ def entry():
     pass
 
 @entry.command("update")
-@click.option('--attribute', required=True, help='Attribute name')
-@click.option('--code', help='Entry code to update (only used when --data is provided)')
+@click.option('--id', default=None, help='Entry ID to update (only used with --data for single entry)')
+@click.option('--code', default=None, help='Entry code to update (only used with --data for single entry)')
 @click.argument('file_path', required=False)
 @click.option('--data', help='Data string in format { "key1": "value1", "key2": "value2", ... } or a list of such objects')
 @pass_das_context
-def update_entry(das_ctx, attribute, code=None, file_path=None, data=None):
-    """Update entries from file or data string
+def update_entry(das_ctx, id, code, file_path, data):
+    """Update entries from file or data string by ID or code.
     
-    Each entry to update must contain a Code field that identifies the entry.
+    For single updates, provide either --id or --code (or Id/Code in the data).
+    For bulk updates, each entry must contain a Code or Id field.
     Files can contain multiple entries (rows in CSV/XLS or list of objects in JSON).
     
     Examples:
     
     \b
-    # Update entries from JSON file
-    das entry update --attribute core c:\\data\\entries.json
+    # Update by code from data string
+    das entry update --code ENT001 --data "{ 'Grant Public Access': 'Yes' }"
     
     \b
-    # Update entries from CSV file
-    das entry update --attribute core c:\\data\\entries.csv
+    # Update by ID from data string
+    das entry update --id 9b826efc-36f3-471c-ad18-9c1e00abe4fa --data "{ 'Name': 'Updated' }"
     
     \b
-    # Update entries from Excel file
-    das entry update --attribute core c:\\data\\entries.xls
+    # Update entries from JSON file (each object needs Code or Id)
+    das entry update c:\\data\\entries.json
     
     \b
-    # Update a single entry from data string
-    das entry update --attribute core --code ENT001 --data { 'Grant Public Access': Yes, ... }
+    # Update entries from CSV file
+    das entry update c:\\data\\entries.csv
     
     \b
     # Update multiple entries from data string
-    das entry update --attribute core --data [{ 'Code': 'ENT001', ... }, { 'Code': 'ENT002', ... }]
+    das entry update --data "[{ 'Code': 'ENT001', ... }, { 'Code': 'ENT002', ... }]"
     """
     try:
         # Ensure client and entry_manager are initialized
@@ -341,13 +342,14 @@ def update_entry(das_ctx, attribute, code=None, file_path=None, data=None):
                 is_bulk_update = True
                 click.echo(f"Found {len(entry_data)} entries to update")
             else:
-                # If we got a single object but no code was provided, check if it has a Code field
-                if not code:
-                    # Look for Code field (case-insensitive)
-                    entry_code = next((entry_data.get(key) for key in entry_data if key.lower() == 'code'), None)
-                    if not entry_code:
-                        raise click.UsageError("No code provided and entry data doesn't contain a Code field")
-                    code = entry_code
+                # If we got a single object but no id/code was provided, check if it has Id or Code in data
+                if not id and not code:
+                    data_id = next((entry_data.get(key) for key in entry_data if key.lower() == 'id'), None)
+                    data_code = next((entry_data.get(key) for key in entry_data if key.lower() == 'code'), None)
+                    if not data_id and not data_code:
+                        raise click.UsageError("No --id or --code provided and entry data doesn't contain an Id or Code field")
+                    id = id or data_id
+                    code = code or data_code
                     
         elif data:
             click.echo("Parsing data string")
@@ -357,19 +359,25 @@ def update_entry(das_ctx, attribute, code=None, file_path=None, data=None):
             if isinstance(entry_data, list):
                 is_bulk_update = True
                 click.echo(f"Found {len(entry_data)} entries to update")
-            elif not code:
-                # If we got a single object but no code was provided, check if it has a Code field
-                entry_code = next((entry_data.get(key) for key in entry_data if key.lower() == 'code'), None)
-                if not entry_code:
-                    raise click.UsageError("No code provided and data doesn't contain a Code field")
-                code = entry_code
+            elif not id and not code:
+                # If we got a single object but no id/code was provided, check if it has Id or Code in data
+                data_id = next((entry_data.get(key) for key in entry_data if key.lower() == 'id'), None)
+                data_code = next((entry_data.get(key) for key in entry_data if key.lower() == 'code'), None)
+                if not data_id and not data_code:
+                    raise click.UsageError("No --id or --code provided and data doesn't contain an Id or Code field")
+                id = id or data_id
+                code = code or data_code
                 
         if not entry_data:
             raise click.UsageError("No valid entry data found")
 
+        # For single entry update, require id or code
+        if not is_bulk_update and not id and not code:
+            raise click.UsageError("Please provide either --id or --code, or include Id or Code in the data")
+
         # Update the entries
         if is_bulk_update:
-            results = das_ctx.entry_manager.update(attribute=attribute, entries=entry_data)
+            results = das_ctx.entry_manager.update(entries=entry_data)
             
             # Display results
             success_count = sum(1 for result in results if result.get('status') == 'success')
@@ -385,13 +393,16 @@ def update_entry(das_ctx, attribute, code=None, file_path=None, data=None):
                 click.echo("\nFailed updates:")
                 for result in results:
                     if result.get('status') == 'error':
-                        click.echo(f"  Code: {result.get('code', 'Unknown')}, Error: {result.get('error', 'Unknown error')}")
+                        ident = result.get('code') or result.get('id') or 'Unknown'
+                        click.echo(f"  {ident}: {result.get('error', 'Unknown error')}")
         else:
             # Single entry update
-            results = das_ctx.entry_manager.update(attribute=attribute, code=code, entry=entry_data)
+            results = das_ctx.entry_manager.update(id=id, code=code, entry=entry_data)
             
             if results and results[0].get('status') == 'success':
-                click.secho(f"✓ Entry '{code}' updated successfully!", fg="green")
+                identifier = id or code
+                id_label = "ID" if id else "code"
+                click.secho(f"✓ Entry '{identifier}' ({id_label}) updated successfully!", fg="green")
                 click.echo(f"Entry ID: {results[0].get('id')}")
             else:
                 error_msg = results[0].get('error', 'No response from server') if results else 'No response from server'

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

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

{das_cli-1.2.4.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=RiometuuRNK4UZm17f7bfej8xhtS2yYufnKXOJsA4jw,50462
+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,11 +9,11 @@ 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
@@ -24,9 +24,9 @@ das/services/entry_fields.py,sha256=x2wUDkKNduj9pf4s56hRo0UW-eBhipkU9gFMEjFw5DA,
 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.4.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
-das_cli-1.2.4.dist-info/METADATA,sha256=SAesRnYIdcNA1LUpbnaLAisw9kzdy-KUNJhH27-xK_4,26209
-das_cli-1.2.4.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
-das_cli-1.2.4.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
-das_cli-1.2.4.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
-das_cli-1.2.4.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,,