Merge branch 'main' of https://github.com/ionite34/StabilityMatrix

Author: ionite34

CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to Stability Matrix will be documented in this file.
 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.2.1
+### Fixed
+- Fixed SD.Next shared folders config not working with new config format, reverted to Junctions / Symlinks
+
 ## v2.2.0
 ### Added
 - Added option to search by Base Model in the Model Browser

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -193,23 +193,4 @@ void HandleConsoleOutput(ProcessOutput s)
 
         VenvRunner.RunDetached(args.TrimEnd(), HandleConsoleOutput, OnExit);
     }
-
-    public override Task SetupModelFolders(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders
-            .SetupLinks(SharedFolders, SettingsManager.ModelsDirectory, installDirectory);
-        return Task.CompletedTask;
-    }
-
-    public override async Task UpdateModelFolders(DirectoryPath installDirectory)
-    {
-        await StabilityMatrix.Core.Helper.SharedFolders.UpdateLinksForPackage(this,
-            SettingsManager.ModelsDirectory, installDirectory).ConfigureAwait(false);
-    }
-
-    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(this, installDirectory);
-        return Task.CompletedTask;
-    }
 }

StabilityMatrix.Core/Models/Packages/BaseGitPackage.cs

@@ -5,6 +5,7 @@
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Helper.Cache;
 using StabilityMatrix.Core.Models.Database;
+using StabilityMatrix.Core.Models.FileInterfaces;
 using StabilityMatrix.Core.Models.Progress;
 using StabilityMatrix.Core.Python;
 using StabilityMatrix.Core.Services;
@@ -265,6 +266,34 @@ public override async Task<string> Update(InstalledPackage installedPackage,
         return latestCommit.Sha;
     }
 
+    public override Task SetupModelFolders(DirectoryPath installDirectory)
+    {
+        if (SharedFolders is { } folders)
+        {
+            StabilityMatrix.Core.Helper.SharedFolders
+                .SetupLinks(folders, SettingsManager.ModelsDirectory, installDirectory);
+        }
+        return Task.CompletedTask;
+    }
+
+    public override async Task UpdateModelFolders(DirectoryPath installDirectory)
+    {
+        if (SharedFolders is not null)
+        {
+            await StabilityMatrix.Core.Helper.SharedFolders.UpdateLinksForPackage(this,
+                SettingsManager.ModelsDirectory, installDirectory).ConfigureAwait(false);
+        }
+    }
+
+    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory)
+    {
+        if (SharedFolders is not null)
+        {
+            StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(this, installDirectory);
+        }
+        return Task.CompletedTask;
+    }
+
     // Send input to the running process.
     public virtual void SendInput(string input)
     {

StabilityMatrix.Core/Models/Packages/InvokeAI.cs

@@ -327,25 +327,6 @@ void HandleConsoleOutput(ProcessOutput s)
         }
     }
 
-    public override Task SetupModelFolders(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders
-            .SetupLinks(SharedFolders, SettingsManager.ModelsDirectory, installDirectory);
-        return Task.CompletedTask;
-    }
-
-    public override async Task UpdateModelFolders(DirectoryPath installDirectory)
-    {
-        await StabilityMatrix.Core.Helper.SharedFolders.UpdateLinksForPackage(this,
-            SettingsManager.ModelsDirectory, installDirectory).ConfigureAwait(false);
-    }
-
-    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(this, installDirectory);
-        return Task.CompletedTask;
-    }
-
     private Dictionary<string, string> GetEnvVars(DirectoryPath installPath)
     {
         // Set additional required environment variables

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@@ -245,61 +245,6 @@ void HandleExit(int i)
         VenvRunner.RunDetached(args.TrimEnd(), HandleConsoleOutput, HandleExit);
     }
 
-    public override Task SetupModelFolders(DirectoryPath installDirectory)
-    {
-        var configJsonPath = installDirectory + "config.json";
-        var exists = File.Exists(configJsonPath);
-        JsonObject? configRoot;
-        if (exists)
-        {
-            var configJson = File.ReadAllText(configJsonPath);
-            try
-            {
-                configRoot = JsonSerializer.Deserialize<JsonObject>(configJson) ?? new JsonObject();
-            }
-            catch (JsonException)
-            {
-                configRoot = new JsonObject();
-            }
-        }
-        else
-        {
-            configRoot = new JsonObject();
-        }
-
-        configRoot["ckpt_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "StableDiffusion");
-        configRoot["diffusers_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "Diffusers");
-        configRoot["vae_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "VAE");
-        configRoot["lora_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "Lora");
-        configRoot["lyco_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "LyCORIS");
-        configRoot["embeddings_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "TextualInversion");
-        configRoot["hypernetwork_dir"] = Path.Combine(SettingsManager.ModelsDirectory, "Hypernetwork");
-        configRoot["codeformer_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "Codeformer");
-        configRoot["gfpgan_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "GFPGAN");
-        configRoot["bsrgan_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "BSRGAN");
-        configRoot["esrgan_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "ESRGAN");
-        configRoot["realesrgan_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "RealESRGAN");
-        configRoot["scunet_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "ScuNET");
-        configRoot["swinir_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "SwinIR");
-        configRoot["ldsr_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "LDSR");
-        configRoot["clip_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "CLIP");
-        configRoot["control_net_models_path"] = Path.Combine(SettingsManager.ModelsDirectory, "ControlNet");
-        
-        var configJsonStr = JsonSerializer.Serialize(configRoot, new JsonSerializerOptions
-        {
-            WriteIndented = true
-        });
-        File.WriteAllText(configJsonPath, configJsonStr);
-
-        return Task.CompletedTask;
-    }
-
-    public override Task UpdateModelFolders(DirectoryPath installDirectory) =>
-        SetupModelFolders(installDirectory);
-
-    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory) =>
-        Task.CompletedTask;
-
     public override async Task<string> Update(InstalledPackage installedPackage,
         IProgress<ProgressReport>? progress = null, bool includePrerelease = false)
     {

StabilityMatrix.Core/Models/Packages/VoltaML.cs

@@ -178,23 +178,4 @@ void HandleConsoleOutput(ProcessOutput s)
 
         VenvRunner.RunDetached(args.TrimEnd(), HandleConsoleOutput, OnExit);
     }
-
-    public override Task SetupModelFolders(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders.SetupLinks(SharedFolders,
-            SettingsManager.ModelsDirectory, installDirectory);
-        return Task.CompletedTask;
-    }
-
-    public override async Task UpdateModelFolders(DirectoryPath installDirectory)
-    {
-        await StabilityMatrix.Core.Helper.SharedFolders.UpdateLinksForPackage(this,
-            SettingsManager.ModelsDirectory, installDirectory).ConfigureAwait(false);
-    }
-
-    public override Task RemoveModelFolderLinks(DirectoryPath installDirectory)
-    {
-        StabilityMatrix.Core.Helper.SharedFolders.RemoveLinksForPackage(this, installDirectory);
-        return Task.CompletedTask;
-    }
 }