clan-vm-manager: Fix regression

pkgs/clan-cli/clan_cli/clan/inspect.py

@@ -14,7 +14,7 @@ from ..vms.inspect import VmConfig, inspect_vm
 
 @dataclass
 class FlakeConfig:
-    flake_url: str | Path
+    flake_url: FlakeId
     flake_attr: str
 
     clan_name: str
@@ -89,7 +89,7 @@ def inspect_flake(flake_url: str | Path, machine_name: str) -> FlakeConfig:
     meta = nix_metadata(flake_url)
     return FlakeConfig(
         vm=vm,
-        flake_url=flake_url,
+        flake_url=FlakeId(flake_url),
         clan_name=clan_name,
         flake_attr=machine_name,
         nar_hash=meta["locked"]["narHash"],

pkgs/clan-cli/clan_cli/history/add.py

@@ -62,7 +62,7 @@ def list_history() -> list[HistoryEntry]:
 
 def new_history_entry(url: str, machine: str) -> HistoryEntry:
     flake = inspect_flake(url, machine)
-    flake.flake_url = str(flake.flake_url)
+    flake.flake_url = flake.flake_url
     return HistoryEntry(
         flake=flake,
         last_used=datetime.datetime.now().isoformat(),

pkgs/clan-cli/clan_cli/history/update.py

@@ -16,7 +16,7 @@ def update_history() -> list[HistoryEntry]:
 
     for entry in logs:
         try:
-            meta = nix_metadata(entry.flake.flake_url)
+            meta = nix_metadata(str(entry.flake.flake_url))
         except ClanCmdError as e:
             print(f"Failed to update {entry.flake.flake_url}: {e}")
             continue
@@ -31,7 +31,7 @@ def update_history() -> list[HistoryEntry]:
                 machine_name=entry.flake.flake_attr,
             )
             flake = inspect_flake(uri.get_url(), uri.machine_name)
-            flake.flake_url = str(flake.flake_url)
+            flake.flake_url = flake.flake_url
             entry = HistoryEntry(
                 flake=flake, last_used=datetime.datetime.now().isoformat()
             )