Merge pull request #416 from ionite34/fix-xl-clip-vision

fix SDXL clip vision download having same folder name as SD1.5 clip vision...

Author: mohnjiles

CHANGELOG.md

@@ -6,8 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
 ## v2.7.3
+### Added
+- Added missing IPAdapter and CLIP Vision folder links for ComfyUI
 ### Fixed
 - Fixed UnicodeDecodeError when using extra_model_paths.yaml in ComfyUI on certain locales
+- Fixed SDXL CLIP Vision model directory name conflict
 - Fixed [#334](https://github.com/LykosAI/StabilityMatrix/issues/334) - Win32Exception if Settings are opened
 
 ## v2.7.2

StabilityMatrix.Avalonia/Assets/hf-packages.json

@@ -351,7 +351,7 @@
       "config.json",
       "model.safetensors"
     ],
-    "Subfolder": "ip_adapter_sd_image_encoder",
+    "Subfolder": "ip_adapter_sdxl_image_encoder",
     "LicenseType": "Apache 2.0"
   },
   {

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -51,14 +51,17 @@ IPrerequisiteHelper prerequisiteHelper
             [SharedFolderType.Diffusers] = new[] { "models/diffusers" },
             [SharedFolderType.Lora] = new[] { "models/loras" },
             [SharedFolderType.CLIP] = new[] { "models/clip" },
+            [SharedFolderType.InvokeClipVision] = new[] { "models/clip_vision" },
             [SharedFolderType.TextualInversion] = new[] { "models/embeddings" },
             [SharedFolderType.VAE] = new[] { "models/vae" },
             [SharedFolderType.ApproxVAE] = new[] { "models/vae_approx" },
             [SharedFolderType.ControlNet] = new[] { "models/controlnet/ControlNet" },
             [SharedFolderType.GLIGEN] = new[] { "models/gligen" },
             [SharedFolderType.ESRGAN] = new[] { "models/upscale_models" },
             [SharedFolderType.Hypernetwork] = new[] { "models/hypernetworks" },
-            [SharedFolderType.IpAdapter] = new[] { "models/ipadapter" },
+            [SharedFolderType.IpAdapter] = new[] { "models/ipadapter/base" },
+            [SharedFolderType.InvokeIpAdapters15] = new[] { "models/ipadapter/sd15" },
+            [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/ipadapter/sdxl" },
             [SharedFolderType.T2IAdapter] = new[] { "models/controlnet/T2IAdapter" },
         };
 
@@ -323,9 +326,16 @@ private async Task SetupModelFoldersConfig(DirectoryPath installDirectory)
                 Path.Combine(modelsDir, "T2IAdapter")
             );
             nodeValue.Children["clip"] = Path.Combine(modelsDir, "CLIP");
+            nodeValue.Children["clip_vision"] = Path.Combine(modelsDir, "InvokeClipVision");
             nodeValue.Children["diffusers"] = Path.Combine(modelsDir, "Diffusers");
             nodeValue.Children["gligen"] = Path.Combine(modelsDir, "GLIGEN");
             nodeValue.Children["vae_approx"] = Path.Combine(modelsDir, "ApproxVAE");
+            nodeValue.Children["ipadapter"] = string.Join(
+                '\n',
+                Path.Combine(modelsDir, "IpAdapter"),
+                Path.Combine(modelsDir, "InvokeIpAdapters15"),
+                Path.Combine(modelsDir, "InvokeIpAdaptersXl")
+            );
         }
         else
         {
@@ -347,9 +357,19 @@ private async Task SetupModelFoldersConfig(DirectoryPath installDirectory)
                         string.Join('\n', Path.Combine(modelsDir, "ControlNet"), Path.Combine(modelsDir, "T2IAdapter"))
                     },
                     { "clip", Path.Combine(modelsDir, "CLIP") },
+                    { "clip_vision", Path.Combine(modelsDir, "InvokeClipVision") },
                     { "diffusers", Path.Combine(modelsDir, "Diffusers") },
                     { "gligen", Path.Combine(modelsDir, "GLIGEN") },
-                    { "vae_approx", Path.Combine(modelsDir, "ApproxVAE") }
+                    { "vae_approx", Path.Combine(modelsDir, "ApproxVAE") },
+                    {
+                        "ipadapter",
+                        string.Join(
+                            '\n',
+                            Path.Combine(modelsDir, "IpAdapter"),
+                            Path.Combine(modelsDir, "InvokeIpAdapters15"),
+                            Path.Combine(modelsDir, "InvokeIpAdaptersXl")
+                        )
+                    }
                 }
             );
         }