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

das/cli.py

@@ -660,6 +660,78 @@ def get_entry(das_ctx, code=None, id=None):
     except Exception as e:
         click.secho(f"Error: {e}", fg="red")
 
+@entry.command("logs")
+@click.option('--id', 'entry_id', default=None, help='Entry ID (GUID)')
+@click.option('--code', default=None, help='Entry code (resolved to ID if --id not provided)')
+@click.option('--max-results', default=100, help='Maximum number of log items (default: 100)')
+@click.option('--skip', default=0, help='Number of items to skip for pagination (default: 0)')
+@click.option('--format', 'output_format', default='table', type=click.Choice(['table', 'json']), help='Output format (table or json)')
+@pass_das_context
+def entry_logs(das_ctx, entry_id, code, max_results, skip, output_format):
+    """Get change/audit logs for an entry by ID or code.
+
+    Examples:
+
+    \b
+    # By entry ID
+    das entry logs --id d7b99f36-5ccb-11f0-87f3-a84a63c8db73
+
+    \b
+    # By entry code with pagination
+    das entry logs --code ENT001 --max-results 50 --skip 0
+
+    \b
+    # JSON output
+    das entry logs --id d7b99f36-5ccb-11f0-87f3-a84a63c8db73 --format json
+    """
+    if not entry_id and not code:
+        raise click.UsageError("Please provide either --id or --code")
+    try:
+        das_ctx.get_client()
+        result = das_ctx.entry_manager.get_entry_logs(
+            entry_id=entry_id,
+            entry_code=code,
+            max_result_count=max_results,
+            skip_count=skip,
+        )
+        total_count = result.get("totalCount", 0)
+        items = result.get("items", [])
+        if output_format == "json":
+            click.echo(json.dumps(result, indent=2))
+            return
+        if not items:
+            click.secho("No log entries found.", fg="yellow")
+            return
+        click.secho(f"\nEntry logs ({total_count} total)", fg="blue")
+        headers = ["#", "Field", "From", "To", "Date/Time", "Modified by"]
+        table_data = []
+        for i, log in enumerate(items, 1):
+            # Truncate long valueFrom/valueTo for table display
+            v_from = (log.get("valueFrom") or "")[:40]
+            v_to = (log.get("valueTo") or "")[:40]
+            if (log.get("valueFrom") or "") and len(log.get("valueFrom", "")) > 40:
+                v_from += "..."
+            if (log.get("valueTo") or "") and len(log.get("valueTo", "")) > 40:
+                v_to += "..."
+            dt = log.get("logDateTime") or ""
+            if "T" in dt:
+                try:
+                    date_part, time_part = dt.split("T")[0], dt.split("T")[1].split(".")[0]
+                    dt = f"{date_part} {time_part}"
+                except Exception:
+                    pass
+            table_data.append([
+                i,
+                (log.get("fieldName") or "")[:35],
+                v_from,
+                v_to,
+                dt,
+                (log.get("modifierUserName") or "")[:25],
+            ])
+        click.echo(format_table(table_data, headers))
+    except Exception as e:
+        click.secho(f"Error: {e}", fg="red")
+
 @entry.command("chown")
 @click.option('--user', 'user_name', required=True, help='New owner username')
 @click.option('--code', '-c', multiple=True, required=True, help='Entry code to transfer. Can be used multiple times.')

das/managers/entries_manager.py

@@ -46,6 +46,43 @@ class EntryManager:
             raise ValueError("Entry ID is required")
             
         return self.get(id=entry_id)
+
+    def get_entry_logs(
+        self,
+        entry_id: str = None,
+        entry_code: str = None,
+        sorting: str = "",
+        max_result_count: int = 100,
+        skip_count: int = 0,
+    ):
+        """
+        Get change/audit logs for an entry by ID or code.
+
+        Args:
+            entry_id: Entry ID (GUID). Used directly if provided.
+            entry_code: Entry code. Resolves to ID via get(code=...) if entry_id is not provided.
+            sorting: Optional sort expression for the API.
+            max_result_count: Maximum number of log items to return (default 100).
+            skip_count: Number of items to skip for pagination (default 0).
+
+        Returns:
+            dict with 'totalCount' and 'items' (list of log entries with fieldName, valueFrom, valueTo, logDateTime, modifierUserName).
+        """
+        if not entry_id and not entry_code:
+            raise ValueError("Entry ID or code is required")
+        if entry_id:
+            id_to_use = entry_id
+        else:
+            entry = self.get(code=entry_code)
+            id_to_use = entry.get("ID") or entry.get("id")
+            if not id_to_use:
+                raise ValueError(f"Could not resolve entry ID for code: {entry_code}")
+        return self.entry_service.get_entry_logs(
+            id=id_to_use,
+            sorting=sorting,
+            max_result_count=max_result_count,
+            skip_count=skip_count,
+        )
         
     def get(self, id: str = None, code: str = None):
         """Get entry by id or code. The client parameter is not used but kept for backward compatibility."""
@@ -175,8 +212,6 @@ class EntryManager:
                     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)
     
@@ -275,7 +310,7 @@ class EntryManager:
         for field in fields:
 
             field_name = field.get("displayName").lower()
-            column_name = field.get("column").lower()
+            column_name = field.get("column").lower()        
 
             if field.get('inputType') == GROUP_BOX_INPUT:
                 # remove the column from the entry                
@@ -285,8 +320,6 @@ class EntryManager:
                     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)
     
@@ -303,8 +336,6 @@ class EntryManager:
                         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
 
@@ -322,6 +353,9 @@ class EntryManager:
     def __get_select_combobox_field_value(self, field, source: str) -> str:
         """Helper method to get select combobox field value."""
 
+        if not source:
+            return None
+
         attribute_id = -1
 
         if field.get('column').isdigit():

das/services/entries.py

@@ -156,6 +156,35 @@ class EntriesService():
         else:
             raise ValueError(response.get('error'))
 
+    def get_entry_logs(
+        self,
+        id: str,
+        sorting: str = "",
+        max_result_count: int = 100,
+        skip_count: int = 0,
+    ):
+        """Get change/audit logs for an entry by its ID."""
+        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}/GetEntryLogs"
+            f"?Id={id}&Sorting={sorting}&MaxResultCount={max_result_count}&SkipCount={skip_count}"
+        )
+
+        response = get_data(url, headers=headers)
+
+        if response.get('success') == True:
+            return response.get('result')
+        else:
+            raise ValueError(response.get('error'))
+
     def chown(self, new_user_id: int, entry_list_ids: list[str]):
         """Change the owner of a list of entries."""
         token = load_token()

{das_cli-1.2.12.dist-info → das_cli-1.2.19.dist-info}/METADATA

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

{das_cli-1.2.12.dist-info → das_cli-1.2.19.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=lh6RGqxACR4OOS7wrkhfD2yXli-Z7dsrch1_HNF05LM,51264
+das/cli.py,sha256=fu484Q5vZmVLi720tFFvWobyLE34s022p-gRD-ArtA4,54228
 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
@@ -13,20 +13,20 @@ 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=VEu_lIN4YCsBr1QOnhzZ5I_DWs76oHebCBn9yFLNSkY,22754
+das/managers/entries_manager.py,sha256=wnf4wqefi5WxY20y5KVB3C2iUXUku4XHpq_ySooI2gY,24038
 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=cn2eoiKEDRcINlzoLgw6mpN3VVLBBiccdFyuCO7TB2I,3709
-das/services/entries.py,sha256=Dzvzx4wOljfumjBBg4sboXmgDTQf3FNbTQp-sl9hAn0,5755
+das/services/entries.py,sha256=lNZY5OuMNtjkmoQjjtk9fADIoWzZmuq3ZWqK7RUUAP0,6589
 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.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.19.dist-info/licenses/LICENSE,sha256=4EDhysVgQWBlzo0rdUl_k89s-iVfgCcSa1gUx1TM1vA,1124
+das_cli-1.2.19.dist-info/METADATA,sha256=GMS6spfnE2UN4FU3zB6JfWbmrAYStq9voAOa5osWoD8,26210
+das_cli-1.2.19.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+das_cli-1.2.19.dist-info/entry_points.txt,sha256=ZrdMae7NcvogQhzM1zun8E8n_QwYq-LpZvoJCr2_I4g,36
+das_cli-1.2.19.dist-info/top_level.txt,sha256=OJsPEeJyJ2rJlpEn2DTPgbMSvYG-6FeD13_m5qLpw3E,4
+das_cli-1.2.19.dist-info/RECORD,,