Merge pull request LykosAI#1086 from ionite34/fix-swarm-sharing

Add SharedFolderThing for TextEncoders in SwarmUI …

(cherry picked from commit 2886449)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

CHANGELOG.md

@@ -12,7 +12,11 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1266](https://github.com/LykosAI/StabilityMatrix/issues/1266) - crash when moving or deleting Lora models in the Checkpoint Manager
 - Fixed [#1268](https://github.com/LykosAI/StabilityMatrix/issues/1268) - wrong torch index used for Nvidia 1000-series GPUs and older
 - Fixed [#1269](https://github.com/LykosAI/StabilityMatrix/issues/1269), [#1257](https://github.com/LykosAI/StabilityMatrix/issues/1257), [#1234](https://github.com/LykosAI/StabilityMatrix/issues/1234) - "no such file or directory" errors when updating certain packages after folder migration
+<<<<<<< HEAD
 - Fixed [#1274](https://github.com/LykosAI/StabilityMatrix/issues/1274), [#1276](https://github.com/LykosAI/StabilityMatrix/issues/1276) - incorrect torch installed when updating to InvokeAI v5.12+
+=======
+- Fixed missing shared folder links for SwarmUI's diffusion_models and clip folders
+>>>>>>> 28864495 (Merge pull request #1086 from ionite34/fix-swarm-sharing)
 ### Supporters
 #### 🌟 Visionaries
 Our deepest gratitude to the brilliant Visionary-tier Patrons: **Waterclouds**, **bluepopsicle**, **Bob S**, **Ibixat**, and **Corey T**! Your incredible backing is instrumental in shaping the future of Stability Matrix and empowering us to deliver cutting-edge features. Thank you for believing in our vision! 🙏

StabilityMatrix.Core/Models/Packages/Config/FdsConfigSharingStrategy.cs

@@ -99,12 +99,8 @@ ConfigSharingOptions options
 
             if (normalizedPaths.Count > 0)
             {
-                // FDS might store lists separated by newline or another char, or just the first path?
-                // Assuming SwarmUI expects a single path string per key, potentially the first one.
-                // If it supports lists (e.g., newline separated), adjust here.
-                // For now, let's assume it takes the first path if multiple are generated,
-                // or handles lists internally if the key implies it (needs SwarmUI knowledge).
-                pathsSection.Set(configPath, normalizedPaths.First());
+                // FDS lists are separated by semicolon
+                pathsSection.Set(configPath, string.Join(';', normalizedPaths));
 
                 // If FDS supports lists explicitly (e.g., via SetList), use that:
                 // pathsSection.SetList(configPath, normalizedPaths);

StabilityMatrix.Core/Models/Packages/StableSwarm.cs

@@ -66,8 +66,8 @@ public override List<ExtraPackageCommand> GetExtraCommands() =>
 
                     await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
                         .ConfigureAwait(false);
-                }
-            }
+                },
+            },
         ];
 
     public override List<LaunchOptionDefinition> LaunchOptions =>
@@ -77,46 +77,46 @@ await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
                 Name = "Host",
                 Type = LaunchOptionType.String,
                 DefaultValue = "127.0.0.1",
-                Options = ["--host"]
+                Options = ["--host"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Port",
                 Type = LaunchOptionType.String,
                 DefaultValue = "7801",
-                Options = ["--port"]
+                Options = ["--port"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Ngrok Path",
                 Type = LaunchOptionType.String,
-                Options = ["--ngrok-path"]
+                Options = ["--ngrok-path"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Ngrok Basic Auth",
                 Type = LaunchOptionType.String,
-                Options = ["--ngrok-basic-auth"]
+                Options = ["--ngrok-basic-auth"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Cloudflared Path",
                 Type = LaunchOptionType.String,
-                Options = ["--cloudflared-path"]
+                Options = ["--cloudflared-path"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Proxy Region",
                 Type = LaunchOptionType.String,
-                Options = ["--proxy-region"]
+                Options = ["--proxy-region"],
             },
             new LaunchOptionDefinition
             {
                 Name = "Launch Mode",
                 Type = LaunchOptionType.Bool,
-                Options = ["--launch-mode web", "--launch-mode webinstall"]
+                Options = ["--launch-mode web", "--launch-mode webinstall"],
             },
-            LaunchOptionDefinition.Extras
+            LaunchOptionDefinition.Extras,
         ];
 
     public override SharedFolderLayout SharedFolderLayout =>
@@ -126,44 +126,50 @@ await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
             ConfigFileType = ConfigFileType.Fds,
             Rules =
             [
-                new SharedFolderLayoutRule { IsRoot = true, ConfigDocumentPaths = ["ModelRoot"], },
+                new SharedFolderLayoutRule { IsRoot = true, ConfigDocumentPaths = ["ModelRoot"] },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.StableDiffusion],
                     TargetRelativePaths = ["Models/Stable-Diffusion"],
-                    ConfigDocumentPaths = ["SDModelFolder"]
+                    ConfigDocumentPaths = ["SDModelFolder"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.Lora, SharedFolderType.LyCORIS],
                     TargetRelativePaths = ["Models/Lora"],
-                    ConfigDocumentPaths = ["SDLoraFolder"]
+                    ConfigDocumentPaths = ["SDLoraFolder"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.VAE],
                     TargetRelativePaths = ["Models/VAE"],
-                    ConfigDocumentPaths = ["SDVAEFolder"]
+                    ConfigDocumentPaths = ["SDVAEFolder"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.Embeddings],
                     TargetRelativePaths = ["Models/Embeddings"],
-                    ConfigDocumentPaths = ["SDEmbeddingFolder"]
+                    ConfigDocumentPaths = ["SDEmbeddingFolder"],
                 },
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.ControlNet, SharedFolderType.T2IAdapter],
                     TargetRelativePaths = ["Models/controlnet"],
-                    ConfigDocumentPaths = ["SDControlNetsFolder"]
+                    ConfigDocumentPaths = ["SDControlNetsFolder"],
                 }, // Assuming Swarm maps T2I to ControlNet folder
                 new SharedFolderLayoutRule
                 {
                     SourceTypes = [SharedFolderType.ClipVision],
                     TargetRelativePaths = ["Models/clip_vision"],
-                    ConfigDocumentPaths = ["SDClipVisionFolder"]
+                    ConfigDocumentPaths = ["SDClipVisionFolder"],
+                },
+                new SharedFolderLayoutRule
+                {
+                    SourceTypes = [SharedFolderType.TextEncoders],
+                    TargetRelativePaths = ["Models/clip"],
+                    ConfigDocumentPaths = ["SDClipFolder"],
                 },
-            ]
+            ],
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>> SharedOutputFolders =>
@@ -178,7 +184,7 @@ await RebuildDotnetProject(installedPackage.FullPath, csprojName, null)
             PackagePrerequisite.Git,
             PackagePrerequisite.Dotnet,
             PackagePrerequisite.Python310,
-            PackagePrerequisite.VcRedist
+            PackagePrerequisite.VcRedist,
         ];
 
     private FilePath GetSettingsPath(string installLocation) =>
@@ -198,8 +204,8 @@ public override async Task InstallPackage(
     {
         progress?.Report(new ProgressReport(-1f, "Installing SwarmUI...", isIndeterminate: true));
 
-        var comfy = settingsManager.Settings.InstalledPackages.FirstOrDefault(
-            x => x.PackageName is nameof(ComfyUI) or "ComfyUI-Zluda"
+        var comfy = settingsManager.Settings.InstalledPackages.FirstOrDefault(x =>
+            x.PackageName is nameof(ComfyUI) or "ComfyUI-Zluda"
         );
 
         if (comfy == null)
@@ -217,7 +223,7 @@ await prerequisiteHelper
                         "source",
                         "https://api.nuget.org/v3/index.json",
                         "--name",
-                        "\"NuGet official package source\""
+                        "\"NuGet official package source\"",
                     ],
                     workingDirectory: installLocation,
                     onProcessOutput: onConsoleOutput
@@ -277,7 +283,7 @@ await prerequisiteHelper
                     SDClipVisionFolder = Path.Combine(
                         settingsManager.ModelsDirectory,
                         SharedFolderType.ClipVision.ToString()
-                    )
+                    ),
                 };
             }
 
@@ -315,9 +321,9 @@ await prerequisiteHelper
                 // Create a wrapper batch file that runs zluda.exe
                 var wrapperScriptPath = Path.Combine(installLocation, "Data", "zluda_wrapper.bat");
                 var scriptContent = $"""
-                                     @echo off
-                                     "{zludaPath}" {args}
-                                     """;
+                    @echo off
+                    "{zludaPath}" {args}
+                    """;
 
                 // Ensure the Data directory exists
                 Directory.CreateDirectory(Path.Combine(installLocation, "Data"));
@@ -334,7 +340,7 @@ await File.WriteAllTextAsync(wrapperScriptPath, scriptContent, cancellationToken
                         DisableInternalArgs = false,
                         AutoUpdate = false,
                         UpdateManagedNodes = "true",
-                        ExtraArgs = string.Empty // Arguments are already in the batch file
+                        ExtraArgs = string.Empty, // Arguments are already in the batch file
                     }.Save(true)
                 );
             }
@@ -348,7 +354,7 @@ await File.WriteAllTextAsync(wrapperScriptPath, scriptContent, cancellationToken
                         DisableInternalArgs = false,
                         AutoUpdate = false,
                         UpdateManagedNodes = "true",
-                        ExtraArgs = comfyArgs
+                        ExtraArgs = comfyArgs,
                     }.Save(true)
                 );
             }
@@ -371,7 +377,7 @@ public override async Task RunPackage(
         {
             ["ASPNETCORE_ENVIRONMENT"] = "Production",
             ["ASPNETCORE_URLS"] = "http://*:7801",
-            ["GIT"] = portableGitBin.JoinFile("git.exe")
+            ["GIT"] = portableGitBin.JoinFile("git.exe"),
         };
         aspEnvVars.Update(settingsManager.Settings.EnvironmentVariables);
 
@@ -400,6 +406,30 @@ void HandleConsoleOutput(ProcessOutput s)
             }
         }
 
+        var sharedDiffusionModelsPath = new DirectoryPath(
+            settingsManager.ModelsDirectory,
+            nameof(SharedFolderType.DiffusionModels)
+        );
+        var swarmDiffusionModelsPath = new DirectoryPath(settingsManager.ModelsDirectory, "diffusion_models");
+
+        try
+        {
+            swarmDiffusionModelsPath.Create();
+            await Helper
+                .SharedFolders.CreateOrUpdateLink(sharedDiffusionModelsPath, swarmDiffusionModelsPath)
+                .ConfigureAwait(false);
+        }
+        catch (Exception e)
+        {
+            onConsoleOutput?.Invoke(
+                new ProcessOutput
+                {
+                    Text =
+                        $"Failed to create symlink for {nameof(SharedFolderType.DiffusionModels)}: {e.Message}.",
+                }
+            );
+        }
+
         var releaseFolder = Path.Combine(installLocation, "src", "bin", "live_release");
         var dllName = "StableSwarmUI.dll";
         if (File.Exists(Path.Combine(releaseFolder, "SwarmUI.dll")))
@@ -409,7 +439,7 @@ void HandleConsoleOutput(ProcessOutput s)
 
         dotnetProcess = await prerequisiteHelper
             .RunDotnet(
-                args: [Path.Combine(releaseFolder, dllName), ..options.Arguments],
+                args: [Path.Combine(releaseFolder, dllName), .. options.Arguments],
                 workingDirectory: installLocation,
                 envVars: aspEnvVars,
                 onProcessOutput: HandleConsoleOutput,
@@ -509,7 +539,7 @@ await prerequisiteHelper
                     "--configuration",
                     "Release",
                     "-o",
-                    "src/bin/live_release"
+                    "src/bin/live_release",
                 ],
                 workingDirectory: installLocation,
                 onProcessOutput: onConsoleOutput
@@ -576,7 +606,7 @@ private Task SetupModelFoldersConfig(DirectoryPath installDirectory)
             SDClipVisionFolder = Path.Combine(
                 settingsManager.ModelsDirectory,
                 SharedFolderType.ClipVision.ToString()
-            )
+            ),
         };
 
         existingSettings.Save(true).SaveToFile(settingsPath);