Update models and model paths #195

- installer now uses .safetensors version of clip-vision
- use new models/ipadapter path instead of legacy custom node path
- keep backwards compatibility to old models/paths for now
- update docker image to v1.10.0

ai_diffusion/resources.py

@@ -120,6 +120,7 @@ class ModelResource(NamedTuple):
     folder: Path
     filename: str
     url: str
+    alternatives: list[Path] | None = None  # for backwards compatibility
 
 
 required_models = [
@@ -128,8 +129,9 @@ class ModelResource(NamedTuple):
         ResourceKind.clip_vision,
         SDVersion.all,
         Path("models/clip_vision/SD1.5"),
-        "pytorch_model.bin",
-        "https://huggingface.co/h94/IP-Adapter/resolve/main/models/image_encoder/pytorch_model.bin",
+        "model.safetensors",
+        "https://huggingface.co/h94/IP-Adapter/resolve/main/models/image_encoder/model.safetensors?download=true",
+        alternatives=[Path("models/clip_vision/SD1.5/pytorch_model.bin")],
     ),
     ModelResource(
         "NMKD Superscale model",
@@ -159,17 +161,23 @@ class ModelResource(NamedTuple):
         "IP-Adapter (SD1.5)",
         ResourceKind.ip_adapter,
         SDVersion.sd15,
-        Path("custom_nodes/ComfyUI_IPAdapter_plus/models"),
+        Path("models/ipadapter"),
         "ip-adapter_sd15.safetensors",
         "https://huggingface.co/h94/IP-Adapter/resolve/main/models/ip-adapter_sd15.safetensors",
+        alternatives=[
+            Path("custom_nodes/ComfyUI_IPAdapter_plus/models/ip-adapter_sd15.safetensors")
+        ],
     ),
     ModelResource(
         "IP-Adapter (SDXL)",
         ResourceKind.ip_adapter,
         SDVersion.sdxl,
-        Path("custom_nodes/ComfyUI_IPAdapter_plus/models"),
+        Path("models/ipadapter"),
         "ip-adapter_sdxl_vit-h.safetensors",
         "https://huggingface.co/h94/IP-Adapter/resolve/main/sdxl_models/ip-adapter_sdxl_vit-h.safetensors",
+        alternatives=[
+            Path("custom_nodes/ComfyUI_IPAdapter_plus/models/ip-adapter_sdxl_vit-h.safetensors")
+        ],
     ),
     ModelResource(
         "LCM-LoRA (SD1.5)",

ai_diffusion/server.py

@@ -101,16 +101,6 @@ def check_install(self):
         ]
         self.missing_resources += missing_nodes
 
-        def find_missing(
-            folder: Path, resources: list[ModelResource], ver: SDVersion | None = None
-        ):
-            return [
-                res.name
-                for res in resources
-                if (not ver or res.sd_version is ver)
-                and not (folder / res.folder / res.filename).exists()
-            ]
-
         self.missing_resources += find_missing(
             self.comfy_dir, resources.required_models, SDVersion.all
         )
@@ -590,6 +580,19 @@ def _decode_utf8_log_error(b: bytes):
         return result
 
 
+def find_missing(folder: Path, resources: list[ModelResource], ver: SDVersion | None = None):
+    def resource_exists(res: ModelResource):
+        return (folder / res.folder / res.filename).exists() or (
+            res.alternatives and any((folder / alt).exists() for alt in res.alternatives)
+        )
+
+    return [
+        res.name
+        for res in resources
+        if (not ver or res.sd_version is ver) and not resource_exists(res)
+    ]
+
+
 def rename_extracted_folder(name: str, path: Path, suffix: str):
     if path.exists() and path.is_dir() and not any(path.iterdir()):
         path.rmdir()

scripts/docker.py

@@ -12,12 +12,13 @@
 
 version = f"v{ai_diffusion.__version__}"
 docker_root = Path(__file__).parent / "docker"
+download_folder = docker_root / "downloads"
 
 
 def clean(models):
     expected = set(m.folder / m.filename for m in models)
-    for path in (docker_root / "models").glob("**/*"):
-        if path.is_file() and path.relative_to(docker_root) not in expected:
+    for path in (download_folder).glob("**/*"):
+        if path.is_file() and path.relative_to(download_folder) not in expected:
             print(f"- Deleting {path}")
             path.unlink()
 
@@ -27,7 +28,7 @@ async def main():
     clean(all_models())
 
     print("Downloading new models")
-    await download_models(docker_root)
+    await download_models(download_folder)
 
     print("Preparation complete.\n\nTo build run:")
     print(f"  docker build -t aclysia/sd-comfyui-krita:{version} scripts/docker")

scripts/docker/Dockerfile

@@ -70,12 +70,12 @@ RUN git clone https://github.com/ltdrdata/ComfyUI-Manager.git /ComfyUI/custom_no
     git clone https://github.com/Acly/comfyui-tooling-nodes /ComfyUI/custom_nodes/comfyui-tooling-nodes && \
     pip3 install -r /ComfyUI/custom_nodes/ComfyUI-Manager/requirements.txt && \
     pip3 install -r /ComfyUI/custom_nodes/comfyui_controlnet_aux/requirements.txt && \
-    pip3 cache purge
+    pip3 cache purge && \
+    echo v1.10.0 > .krita-ai-diffusion.version
 
 # Copy models
 RUN mkdir -p models
 COPY downloads/models/ /models/
-COPY downloads/custom_nodes/ComfyUI_IPAdapter_plus/models/* /ComfyUI/custom_nodes/ComfyUI_IPAdapter_plus/models/
 COPY extra_model_paths.yaml /ComfyUI/
 
 # Install Jupyter

scripts/docker/extra_model_paths.yaml

@@ -10,3 +10,4 @@ runpod:
     embeddings: embeddings
     hypernetworks: hypernetworks
     controlnet: controlnet
+    ipadapter: ipadapter