API|CLI: Added argument 'flake_name' to all CLI and API endpoints. Tests missing.

pkgs/clan-cli/clan_cli/config/__init__.py

@@ -9,10 +9,9 @@ import sys
 from pathlib import Path
 from typing import Any, Optional, Tuple, get_origin
 
-from clan_cli.dirs import get_clan_flake_toplevel
+from clan_cli.dirs import get_clan_flake_toplevel, machine_settings_file
 from clan_cli.errors import ClanError
 from clan_cli.git import commit_file
-from clan_cli.machines.folders import machine_settings_file
 from clan_cli.nix import nix_eval
 
 script_dir = Path(__file__).parent
@@ -172,7 +171,7 @@ def get_or_set_option(args: argparse.Namespace) -> None:
         # compute settings json file location
         if args.settings_file is None:
             get_clan_flake_toplevel()
-            settings_file = machine_settings_file(args.machine)
+            settings_file = machine_settings_file(args.flake, args.machine)
         else:
             settings_file = args.settings_file
         # set the option with the given value
@@ -305,7 +304,11 @@ def register_parser(
 
     # inject callback function to process the input later
     parser.set_defaults(func=get_or_set_option)
-
+    parser.add_argument(
+        "flake",
+        type=str,
+        help="name of the flake to set machine options for",
+    )
     parser.add_argument(
         "--machine",
         "-m",

pkgs/clan-cli/clan_cli/config/machine.py

@@ -2,38 +2,41 @@ import json
 import subprocess
 import sys
 from pathlib import Path
-from typing import Optional
 
 from fastapi import HTTPException
 
-from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs_source
+from clan_cli.dirs import (
+    get_flake_path,
+    machine_settings_file,
+    nixpkgs_source,
+    specific_machine_dir,
+)
 from clan_cli.git import commit_file, find_git_repo_root
-from clan_cli.machines.folders import machine_folder, machine_settings_file
 from clan_cli.nix import nix_eval
 
 
-def config_for_machine(machine_name: str) -> dict:
+def config_for_machine(flake_name: str, machine_name: str) -> dict:
     # read the config from a json file located at {flake}/machines/{machine_name}/settings.json
-    if not machine_folder(machine_name).exists():
+    if not specific_machine_dir(flake_name, machine_name).exists():
         raise HTTPException(
             status_code=404,
             detail=f"Machine {machine_name} not found. Create the machine first`",
         )
-    settings_path = machine_settings_file(machine_name)
+    settings_path = machine_settings_file(flake_name, machine_name)
     if not settings_path.exists():
         return {}
     with open(settings_path) as f:
         return json.load(f)
 
 
-def set_config_for_machine(machine_name: str, config: dict) -> None:
+def set_config_for_machine(flake_name: str, machine_name: str, config: dict) -> None:
     # write the config to a json file located at {flake}/machines/{machine_name}/settings.json
-    if not machine_folder(machine_name).exists():
+    if not specific_machine_dir(flake_name, machine_name).exists():
         raise HTTPException(
             status_code=404,
             detail=f"Machine {machine_name} not found. Create the machine first`",
         )
-    settings_path = machine_settings_file(machine_name)
+    settings_path = machine_settings_file(flake_name, machine_name)
     settings_path.parent.mkdir(parents=True, exist_ok=True)
     with open(settings_path, "w") as f:
         json.dump(config, f)
@@ -43,9 +46,9 @@ def set_config_for_machine(machine_name: str, config: dict) -> None:
         commit_file(settings_path, repo_dir)
 
 
-def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
-    if flake is None:
-        flake = get_clan_flake_toplevel()
+def schema_for_machine(flake_name: str, machine_name: str) -> dict:
+    flake = get_flake_path(flake_name)
+
     # use nix eval to lib.evalModules .#nixosModules.machine-{machine_name}
     proc = subprocess.run(
         nix_eval(