clan-cli: Refactor the API to use the Flake object

pkgs/clan-cli/clan_lib/api/disk.py

@@ -2,12 +2,12 @@ import json
 import logging
 from collections.abc import Callable
 from dataclasses import dataclass
-from pathlib import Path
 from typing import Any, TypedDict
 from uuid import uuid4
 
 from clan_cli.dirs import TemplateType, clan_templates
 from clan_cli.errors import ClanError
+from clan_cli.flake import Flake
 from clan_cli.git import commit_file
 from clan_cli.machines.hardware import HardwareConfig, show_machine_hardware_config
 
@@ -75,7 +75,7 @@ templates: dict[str, dict[str, Callable[[dict[str, Any]], Placeholder]]] = {
 
 @API.register
 def get_disk_schemas(
-    base_path: Path, machine_name: str | None = None
+    flake: Flake, machine_name: str | None = None
 ) -> dict[str, DiskSchema]:
     """
     Get the available disk schemas
@@ -85,9 +85,7 @@ def get_disk_schemas(
     hw_report = {}
 
     if machine_name is not None:
-        hw_report_path = HardwareConfig.NIXOS_FACTER.config_path(
-            base_path, machine_name
-        )
+        hw_report_path = HardwareConfig.NIXOS_FACTER.config_path(flake, machine_name)
         if not hw_report_path.exists():
             msg = "Hardware configuration missing"
             raise ClanError(msg)
@@ -132,7 +130,7 @@ class MachineDiskMatter(TypedDict):
 
 @API.register
 def set_machine_disk_schema(
-    base_path: Path,
+    flake: Flake,
     machine_name: str,
     schema_name: str,
     # Placeholders are used to fill in the disk schema
@@ -144,8 +142,8 @@ def set_machine_disk_schema(
     Set the disk placeholders of the template
     """
     # Assert the hw-config must exist before setting the disk
-    hw_config = show_machine_hardware_config(base_path, machine_name)
-    hw_config_path = hw_config.config_path(base_path, machine_name)
+    hw_config = show_machine_hardware_config(flake, machine_name)
+    hw_config_path = hw_config.config_path(flake, machine_name)
 
     if not hw_config_path.exists():
         msg = "Hardware configuration must exist before applying disk schema"
@@ -162,7 +160,7 @@ def set_machine_disk_schema(
         raise ClanError(msg)
 
     # Check that the placeholders are valid
-    disk_schema = get_disk_schemas(base_path, machine_name)[schema_name]
+    disk_schema = get_disk_schemas(flake, machine_name)[schema_name]
     # check that all required placeholders are present
     for placeholder_name, schema_placeholder in disk_schema.placeholders.items():
         if schema_placeholder.required and placeholder_name not in placeholders:
@@ -223,6 +221,6 @@ def set_machine_disk_schema(
 
         commit_file(
             disko_file_path,
-            base_path,
+            flake.path,
             commit_message=f"Set disk schema of machine: {machine_name} to {schema_name}",
         )

pkgs/clan-cli/clan_lib/tests/test_create.py

@@ -209,7 +209,7 @@ def test_clan_create_api(
 
     # ===== CREATE BASE INVENTORY ======
     inventory = create_base_inventory(ssh_keys)
-    patch_inventory_with(dest_clan_dir, "services", inventory.services)
+    patch_inventory_with(Flake(str(dest_clan_dir)), "services", inventory.services)
 
     # Invalidate cache because of new inventory
     clan_dir_flake.invalidate_cache()
@@ -240,7 +240,7 @@ def test_clan_create_api(
     facter_json = test_lib_root / "assets" / "facter.json"
     assert facter_json.exists(), f"Source facter file not found: {facter_json}"
 
-    dest_dir = specific_machine_dir(clan_dir_flake.path, machine.name)
+    dest_dir = specific_machine_dir(Flake(str(clan_dir_flake.path)), machine.name)
     # specific_machine_dir should create the directory, but ensure it exists just in case
     dest_dir.mkdir(parents=True, exist_ok=True)
 
@@ -254,7 +254,8 @@ def test_clan_create_api(
 
     # ===== Create Disko Config ======
     facter_path = (
-        specific_machine_dir(clan_dir_flake.path, machine.name) / "facter.json"
+        specific_machine_dir(Flake(str(clan_dir_flake.path)), machine.name)
+        / "facter.json"
     )
     with facter_path.open("r") as f:
         facter_report = json.load(f)
@@ -264,9 +265,7 @@ def test_clan_create_api(
     assert disk_devs is not None
 
     placeholders = {"mainDisk": disk_devs[0]}
-    set_machine_disk_schema(
-        clan_dir_flake.path, machine.name, "single-disk", placeholders
-    )
+    set_machine_disk_schema(clan_dir_flake, machine.name, "single-disk", placeholders)
     clan_dir_flake.invalidate_cache()
 
     with pytest.raises(ClanError) as exc_info: