Merge pull request #873 from benoitf/RAMALAMA-871

fix: use iso8601 for JSON modified field

Author: rhatdan

ramalama/cli.py

@@ -4,7 +4,7 @@
 import os
 import platform
 import subprocess
-import time
+from datetime import datetime, timezone
 from pathlib import Path
 
 import ramalama.oci
@@ -547,7 +547,8 @@ def _list_models(args):
             else:
                 name = str(path).replace("/", "://", 1)
             file_epoch = path.lstat().st_mtime
-            modified = int(time.time() - file_epoch)
+            # convert to iso format
+            modified = datetime.fromtimestamp(file_epoch, tz=timezone.utc).isoformat()
             size = get_size(path)
 
             # Store data for later use
@@ -607,26 +608,25 @@ def list_cli(args):
     size_width = len("SIZE")
     for model in sorted(models, key=lambda d: d['name']):
         try:
-            modified = human_duration(model["modified"]) + " ago"
+            delta = int(datetime.now(timezone.utc).timestamp() - datetime.fromisoformat(model["modified"]).timestamp())
+            modified = human_duration(delta) + " ago"
+            model["modified"] = modified
         except TypeError:
-            modified = model["modified"]
+            pass
         # update the size to be human readable
         model["size"] = human_readable_size(model["size"])
         name_width = max(name_width, len(model["name"]))
-        modified_width = max(modified_width, len(modified))
+        modified_width = max(modified_width, len(model["modified"]))
         size_width = max(size_width, len(model["size"]))
 
     if not args.quiet and not args.noheading and not args.json:
         print(f"{'NAME':<{name_width}} {'MODIFIED':<{modified_width}} {'SIZE':<{size_width}}")
 
     for model in models:
-        try:
-            modified = human_duration(model["modified"]) + " ago"
-        except TypeError:
-            modified = model["modified"]
         if args.quiet:
             print(model["name"])
         else:
+            modified = model['modified']
             print(f"{model['name']:<{name_width}} {modified:<{modified_width}} {model['size'].upper():<{size_width}}")
 
 

ramalama/oci.py

@@ -2,6 +2,7 @@
 import os
 import subprocess
 import tempfile
+from datetime import datetime
 
 import ramalama.annotations as annotations
 from ramalama.common import MNT_FILE, engine_version, exec_cmd, perror, run_cmd
@@ -112,6 +113,11 @@ def list_models(args):
             del model["id"]
 
     models += list_manifests(args)
+    for model in models:
+        # Convert to ISO 8601 format
+        parsed_date = datetime.fromisoformat(model["modified"].replace(" UTC", "").replace(" ", "T"))
+        model["modified"] = parsed_date.isoformat()
+
     return models