From 381c190ba21c99ab7da756ff9d7abd395f6fc2c2 Mon Sep 17 00:00:00 2001
From: Johannes Kirschbauer <hsjobeki@gmail.com>
Date: Sun, 21 Sep 2025 16:25:54 +0200
Subject: [PATCH] clan_lib: inventory store use structured keys

---
 pkgs/clan-cli/clan_lib/machines/delete.py     |  2 +-
 .../clan_lib/persist/inventory_store.py       | 26 ++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/clan-cli/clan_lib/machines/delete.py b/pkgs/clan-cli/clan_lib/machines/delete.py
index 79114f908..6a389aa65 100644
--- a/pkgs/clan-cli/clan_lib/machines/delete.py
+++ b/pkgs/clan-cli/clan_lib/machines/delete.py
@@ -35,7 +35,7 @@ def delete_machine(machine: Machine) -> None:
     inventory_store = InventoryStore(machine.flake)
     try:
         inventory_store.delete(
-            {f"machines.{machine.name}"},
+            {("machines", machine.name)},
         )
     except KeyError as exc:
         # louis@(2025-03-09): test infrastructure does not seem to set the
diff --git a/pkgs/clan-cli/clan_lib/persist/inventory_store.py b/pkgs/clan-cli/clan_lib/persist/inventory_store.py
index d0895e01d..94e5339f2 100644
--- a/pkgs/clan-cli/clan_lib/persist/inventory_store.py
+++ b/pkgs/clan-cli/clan_lib/persist/inventory_store.py
@@ -13,13 +13,21 @@ from clan_lib.nix_models.clan import (
     InventoryMetaType,
     InventoryTagsType,
 )
+from clan_lib.persist.static_data import (
+    PathTuple,
+    WriteabilityResult,
+    calc_patches,
+    delete_by_path_tuple,
+    determine_writeability,
+    set_value_by_path_tuple,
+)
 
 from .util import (
-    calc_patches,
-    delete_by_path,
-    determine_writeability,
     path_match,
-    set_value_by_path,
+    # calc_patches,
+    # delete_by_path,
+    # determine_writeability,
+    # set_value_by_path,
 )
 
 
@@ -79,7 +87,7 @@ def sanitize(data: Any, whitelist_paths: list[str], current_path: list[str]) ->
 
 @dataclass
 class WriteInfo:
-    writeables: dict[str, set[str]]
+    writeables: WriteabilityResult
     data_eval: "InventorySnapshot"
     data_disk: "InventorySnapshot"
 
@@ -229,12 +237,12 @@ class InventoryStore:
         """
         return self._load_merged_inventory()
 
-    def delete(self, delete_set: set[str], commit: bool = True) -> None:
+    def delete(self, delete_set: set[PathTuple], commit: bool = True) -> None:
         """Delete keys from the inventory"""
         data_disk = dict(self._get_persisted())
 
         for delete_path in delete_set:
-            delete_by_path(data_disk, delete_path)
+            delete_by_path_tuple(data_disk, delete_path)
 
         with self.inventory_file.open("w") as f:
             json.dump(data_disk, f, indent=2)
@@ -265,10 +273,10 @@ class InventoryStore:
 
         persisted = dict(write_info.data_disk)
         for patch_path, data in patchset.items():
-            set_value_by_path(persisted, patch_path, data)
+            set_value_by_path_tuple(persisted, patch_path, data)
 
         for delete_path in delete_set:
-            delete_by_path(persisted, delete_path)
+            delete_by_path_tuple(persisted, delete_path)
 
         def post_write() -> None:
             if commit: