rebase + review

Signed-off-by: Ian Eaves <ian.k.eaves@gmail.com>

Author: ieaves

ramalama/cli.py

@@ -13,7 +13,6 @@
 from typing import Any, get_args
 from urllib.parse import urlparse
 
-from ramalama.benchmarks.errors import MissingStorageFolderError
 from ramalama.benchmarks.manager import BenchmarksManager
 
 # if autocomplete doesn't exist, just do nothing, don't break
@@ -28,12 +27,8 @@
 import ramalama.chat as chat
 from ramalama import engine
 from ramalama.arg_types import DefaultArgsType
-<<<<<<< HEAD
-from ramalama.chat_utils import default_prefix
-=======
 from ramalama.benchmarks.utilities import print_bench_results
-from ramalama.chat import default_prefix
->>>>>>> 8a473985 (adds benchmark metrics persistence)
+from ramalama.chat_utils import default_prefix
 from ramalama.cli_arg_normalization import normalize_pull_arg
 from ramalama.command.factory import assemble_command
 from ramalama.common import accel_image, get_accel, perror
@@ -659,13 +654,11 @@ def _list_models_from_store(args):
             size_sum += file.size
             last_modified = max(file.modified, last_modified)
 
-        ret.append(
-            {
-                "name": f"{model} (partial)" if is_partially_downloaded else model,
-                "modified": datetime.fromtimestamp(last_modified, tz=local_timezone).isoformat(),
-                "size": size_sum,
-            }
-        )
+        ret.append({
+            "name": f"{model} (partial)" if is_partially_downloaded else model,
+            "modified": datetime.fromtimestamp(last_modified, tz=local_timezone).isoformat(),
+            "size": size_sum,
+        })
 
     # sort the listed models according to the desired order
     ret.sort(key=lambda entry: entry[args.sort], reverse=args.order == "desc")

ramalama/config.py

@@ -47,17 +47,21 @@ def _get_default_config_dirs() -> list[Path]:
         # Windows-specific paths using APPDATA and LOCALAPPDATA
         appdata = os.getenv("APPDATA", os.path.expanduser("~/AppData/Roaming"))
         localappdata = os.getenv("LOCALAPPDATA", os.path.expanduser("~/AppData/Local"))
-        dirs.extend([
-            Path(os.path.join(localappdata, "ramalama")),
-            Path(os.path.join(appdata, "ramalama")),
-        ])
+        dirs.extend(
+            [
+                Path(os.path.join(localappdata, "ramalama")),
+                Path(os.path.join(appdata, "ramalama")),
+            ]
+        )
     else:
         # Unix-specific paths
-        dirs.extend([
-            Path("/etc/ramalama"),
-            Path(os.path.expanduser(os.path.join(os.getenv("XDG_DATA_HOME", "~/.local/share"), "ramalama"))),
-            Path(os.path.expanduser(os.path.join(os.getenv("XDG_CONFIG_HOME", "~/.config"), "ramalama"))),
-        ])
+        dirs.extend(
+            [
+                Path("/etc/ramalama"),
+                Path(os.path.expanduser(os.path.join(os.getenv("XDG_DATA_HOME", "~/.local/share"), "ramalama"))),
+                Path(os.path.expanduser(os.path.join(os.getenv("XDG_CONFIG_HOME", "~/.config"), "ramalama"))),
+            ]
+        )
 
     return dirs