Add resource ids for every file in models.json

- allows mapping resources <-> models

Author: Acly

ai_diffusion/presets/models.json

@@ -29,14 +29,17 @@
       "name": "OmniSR Superscale",
       "files": [
         {
+          "id": "upscaler-fast_2x-all",
           "path": "models/upscale_models/OmniSR_X2_DIV2K.safetensors",
           "url": "https://huggingface.co/Acly/Omni-SR/resolve/main/OmniSR_X2_DIV2K.safetensors"
         },
         {
+          "id": "upscaler-fast_3x-all",
           "path": "models/upscale_models/OmniSR_X3_DIV2K.safetensors",
           "url": "https://huggingface.co/Acly/Omni-SR/resolve/main/OmniSR_X3_DIV2K.safetensors"
         },
         {
+          "id": "upscaler-fast_4x-all",
           "path": "models/upscale_models/OmniSR_X4_DIV2K.safetensors",
           "url": "https://huggingface.co/Acly/Omni-SR/resolve/main/OmniSR_X4_DIV2K.safetensors"
         }
@@ -107,10 +110,12 @@
       "name": "Fooocus Inpaint",
       "files": [
         {
+          "id": "inpaint-fooocus_head-sdxl",
           "path": "models/inpaint/fooocus_inpaint_head.pth",
           "url": "https://huggingface.co/lllyasviel/fooocus_inpaint/resolve/main/fooocus_inpaint_head.pth"
         },
         {
+          "id": "inpaint-fooocus_patch-sdxl",
           "path": "models/inpaint/inpaint_v26.fooocus.patch",
           "url": "https://huggingface.co/lllyasviel/fooocus_inpaint/resolve/main/inpaint_v26.fooocus.patch"
         }
@@ -357,10 +362,12 @@
       "name": "IP-Adapter Face (SD1.5)",
       "files": [
         {
+          "id": "ip_adapter-face-sd15",
           "path": "models/ipadapter/ip-adapter-faceid-plusv2_sd15.bin",
           "url": "https://huggingface.co/h94/IP-Adapter-FaceID/resolve/main/ip-adapter-faceid-plusv2_sd15.bin"
         },
         {
+          "id": "lora-face-sd15",
           "path": "models/loras/ip-adapter-faceid-plusv2_sd15_lora.safetensors",
           "url": "https://huggingface.co/h94/IP-Adapter-FaceID/resolve/main/ip-adapter-faceid-plusv2_sd15_lora.safetensors"
         }
@@ -382,10 +389,12 @@
       "name": "IP-Adapter Face (XL)",
       "files": [
         {
+          "id": "ip_adapter-face-sdxl",
           "path": "models/ipadapter/ip-adapter-faceid-plusv2_sdxl.bin",
           "url": "https://huggingface.co/h94/IP-Adapter-FaceID/resolve/main/ip-adapter-faceid-plusv2_sdxl.bin"
         },
         {
+          "id": "lora-face-sdxl",
           "path": "models/loras/ip-adapter-faceid-plusv2_sdxl_lora.safetensors",
           "url": "https://huggingface.co/h94/IP-Adapter-FaceID/resolve/main/ip-adapter-faceid-plusv2_sdxl_lora.safetensors"
         }
@@ -437,10 +446,12 @@
       "name": "Reference (Flux)",
       "files": [
         {
+          "id": "clip_vision-redux-flux",
           "path": "models/clip_vision/sigclip_vision_patch14_384.safetensors",
           "url": "https://huggingface.co/Comfy-Org/sigclip_vision_384/resolve/main/sigclip_vision_patch14_384.safetensors"
         },
         {
+          "id": "ip_adapter-reference-flux",
           "path": "models/style_models/flux1-redux-dev.safetensors",
           "url": "https://files.interstice.cloud/models/flux1-redux-dev.safetensors"
         }

ai_diffusion/resources.py

@@ -256,6 +256,12 @@ def text(self):
         return control.control_mode_text[self]
 
 
+def resource_id(kind: ResourceKind, arch: Arch, identifier: ControlMode | UpscalerName | str):
+    if isinstance(identifier, Enum):
+        identifier = identifier.name
+    return f"{kind.name}-{identifier}-{arch.name}"
+
+
 class ResourceId(NamedTuple):
     kind: ResourceKind
     arch: Arch
@@ -288,29 +294,44 @@ class ModelRequirements(Enum):
     insightface = 1
 
 
+class ModelFile(NamedTuple):
+    path: Path
+    url: str
+    id: ResourceId
+
+    @property
+    def name(self):
+        return self.path.name
+
+    @staticmethod
+    def parse(data: dict[str, Any], parent_id: ResourceId):
+        id = ResourceId.parse(data.get("id", parent_id.string))
+        return ModelFile(Path(data["path"]), data["url"], id)
+
+
 class ModelResource(NamedTuple):
     name: str
     id: ResourceId
-    files: dict[Path, str]
+    files: list[ModelFile]
     alternatives: list[Path] | None = None  # for backwards compatibility
     requirements: ModelRequirements = ModelRequirements.none
 
     @property
     def filename(self):
         assert len(self.files) == 1
-        return next(iter(self.files)).name
+        return self.files[0].name
 
     @property
     def folder(self):
-        return next(iter(self.files)).parent
+        return self.files[0].path.parent
 
     @property
     def url(self):
         assert len(self.files) == 1
-        return next(iter(self.files.values()))
+        return self.files[0].url
 
     def exists_in(self, path: Path):
-        exact = all((path / filepath).exists() for filepath in self.files.keys())
+        exact = all((path / file.path).exists() for file in self.files)
         alt = self.alternatives is not None and any((path / f).exists() for f in self.alternatives)
         return exact or alt
 
@@ -329,7 +350,14 @@ def as_dict(self):
         result = {
             "id": self.id.string,
             "name": self.name,
-            "files": [{"path": str(k.as_posix()), "url": v} for k, v in self.files.items()],
+            "files": [
+                {
+                    "id": f.id,
+                    "path": str(f.path.as_posix()),
+                    "url": f.url,
+                }
+                for f in self.files
+            ],
         }
         if self.alternatives:
             result["alternatives"] = [str(p.as_posix()) for p in self.alternatives]
@@ -340,7 +368,7 @@ def as_dict(self):
     @staticmethod
     def from_dict(data: dict[str, Any]):
         id = ResourceId.parse(data["id"])
-        files = {Path(f["path"]): f["url"] for f in data["files"]}
+        files = [ModelFile.parse(f, id) for f in data["files"]]
         alternatives = [Path(p) for p in data.get("alternatives", [])]
         requirements = (
             ModelRequirements[data["requirements"]]
@@ -417,12 +445,6 @@ def all_models(include_deprecated=False):
     return result
 
 
-def resource_id(kind: ResourceKind, arch: Arch, identifier: ControlMode | UpscalerName | str):
-    if isinstance(identifier, Enum):
-        identifier = identifier.name
-    return f"{kind.name}-{identifier}-{arch.name}"
-
-
 def find_resource(id: ResourceId, include_deprecated=False):
     return next((m for m in all_models(include_deprecated) if m.id == id), None)
 

ai_diffusion/server.py

@@ -319,10 +319,10 @@ def cb(stage: str, message: str | DownloadProgress):
             for resource in to_install:
                 if not resource.exists_in(self.path) and not resource.exists_in(self.comfy_dir):
                     await self._install_requirements(resource.requirements, network, cb)
-                    for filepath, url in resource.files.items():
-                        target_file = self.path / filepath
+                    for file in resource.files:
+                        target_file = self.path / file.path
                         target_file.parent.mkdir(parents=True, exist_ok=True)
-                        await _download_cached(resource.name, network, url, target_file, cb)
+                        await _download_cached(resource.name, network, file.url, target_file, cb)
         except Exception as e:
             log.exception(str(e))
             raise e

scripts/download_models.py

@@ -79,9 +79,9 @@ async def download(
     verbose=False,
     dry_run=False,
 ):
-    for filepath, url in model.files.items():
-        target_file = destination / filepath
-        url = _map_url(url)
+    for file in model.files:
+        target_file = destination / file.path
+        url = _map_url(file.url)
         if verbose:
             print(f"Looking for {target_file}")
         if target_file.exists():