Merge pull request LykosAI#966 from ionite34/fixes-n-stuff

mohnjiles · mohnjiles · commit dc57952536f5 · 2025-01-21T17:42:33.000Z
Fixes n stuff (cherry picked from commit fb81ebb) # Conflicts: # CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,61 @@ 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).
 
+<<<<<<< HEAD
+=======
+## v2.14.0-dev.2
+### Added
+- Added Align Your Steps scheduler to Inference
+### Changed
+- Updated the Civitai Model Browser base model selector to match the new Checkpoint Manager filter UI 
+- FaceDetailers in Inference will now inherit the primary sampler/scheduler/etc. by default. You can still manually set these by enabling the options via the ⚙️ button on the FaceDetailer card
+- Slightly rearranged the FaceDetailer card layout due to the above change
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+- Fixed HiresFix Inference addon not inheriting sampler/scheduler properly
+- Fixed some plus (+) buttons getting cut off in the Inference UI
+- Fixed CFG Rescale addon interfering with refiner model in Inference
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+- Fixed ComfyUI-Zluda not respecting pip user overrides
+- Fixed issue with Checkpoint Manager not displaying any models
+### Supporters
+#### Visionaries
+- A huge thank you to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your generous support is greatly appreciated!
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+## v2.13.3
+### Changed
+- "Remove symbolic links on shutdown" option now also removes links from Output Sharing
+### Fixed
+- Fixed [#1083](https://github.com/LykosAI/StabilityMatrix/issues/1083) - "Show Nested Models" incorrectly displaying models from some non-nested folders
+- Fixed issue with InvokeAI model sharing when the host address is set to 0.0.0.0
+- Fixed issue when parsing index URLs in Python Dependencies Override menu
+
+>>>>>>> fb81ebbb (Merge pull request #966 from ionite34/fixes-n-stuff)
 ## v2.13.2
 ### Changed
 - Removed SimpleSDXL due to security concerns - thanks to @iwr-redmond for the detailed report. For more information please visit https://github.com/LykosAI/StabilityMatrix/security/advisories.
diff --git a/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs b/StabilityMatrix.Avalonia/Languages/Resources.Designer.cs
diff --git a/StabilityMatrix.Avalonia/Languages/Resources.resx b/StabilityMatrix.Avalonia/Languages/Resources.resx
@@ -418,10 +418,10 @@
     <value>Checkpoint Manager</value>
   </data>
   <data name="Label_RemoveSymlinksOnShutdown" xml:space="preserve">
-    <value>Remove shared checkpoints directory symbolic links on shutdown</value>
+    <value>Remove shared folder symbolic links on shutdown</value>
   </data>
   <data name="Label_RemoveSymlinksOnShutdown_Details" xml:space="preserve">
-    <value>Select this option if you&apos;re having problems moving Stability Matrix to another drive</value>
+    <value>Removes both model and output folder symbolic links when closing Stability Matrix. Select this option if you're having problems moving Stability Matrix to another drive</value>
   </data>
   <data name="Label_ResetCheckpointsCache" xml:space="preserve">
     <value>Reset Checkpoints Cache</value>
diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
@@ -1041,8 +1041,9 @@ private bool FilterModels(LocalModelFile file)
     {
         if (SelectedCategory?.Path is null || SelectedCategory?.Path == settingsManager.ModelsDirectory)
             return file.HasConnectedModel
-                ? SelectedBaseModels.Contains(file.ConnectedModelInfo.BaseModel ?? "Other")
-                : SelectedBaseModels.Contains("Other");
+                ? SelectedBaseModels.Count == 0
+                    || SelectedBaseModels.Contains(file.ConnectedModelInfo.BaseModel ?? "Other")
+                : SelectedBaseModels.Count == 0 || SelectedBaseModels.Contains("Other");
 
         var folderPath = Path.GetDirectoryName(file.RelativePath);
         var categoryRelativePath = SelectedCategory
@@ -1056,16 +1057,30 @@ private bool FilterModels(LocalModelFile file)
         if (
             (
                 file.HasConnectedModel
-                    ? SelectedBaseModels.Contains(file.ConnectedModelInfo?.BaseModel ?? "Other")
-                    : SelectedBaseModels.Contains("Other")
+                    ? SelectedBaseModels.Count == 0
+                        || SelectedBaseModels.Contains(file.ConnectedModelInfo?.BaseModel ?? "Other")
+                    : SelectedBaseModels.Count == 0 || SelectedBaseModels.Contains("Other")
             )
             is false
         )
             return false;
 
-        return ShowModelsInSubfolders
-            ? folderPath.StartsWith(categoryRelativePath)
-            : categoryRelativePath.Equals(folderPath);
+        // If not showing nested models, just check if the file is directly in this folder
+        if (!ShowModelsInSubfolders)
+            return categoryRelativePath.Equals(folderPath, StringComparison.OrdinalIgnoreCase);
+
+        // Split paths into segments
+        var categorySegments = categoryRelativePath.Split(Path.DirectorySeparatorChar);
+        var folderSegments = folderPath.Split(Path.DirectorySeparatorChar);
+
+        // Check if folder is a subfolder of category by comparing path segments
+        if (folderSegments.Length < categorySegments.Length)
+            return false;
+
+        // Compare each segment of the category path with the folder path
+        return !categorySegments
+            .Where((t, i) => !t.Equals(folderSegments[i], StringComparison.OrdinalIgnoreCase))
+            .Any();
     }
 
     private bool FilterCategories(CheckpointCategory category)
diff --git a/StabilityMatrix.Core/Helper/SharedFolders.cs b/StabilityMatrix.Core/Helper/SharedFolders.cs
@@ -195,6 +195,12 @@ public void RemoveLinksForAllPackages()
                     .RemoveModelFolderLinks(package.FullPath, sharedFolderMethod)
                     .GetAwaiter()
                     .GetResult();
+
+                // Remove output folder links if enabled
+                if (package.UseSharedOutputFolder)
+                {
+                    basePackage.RemoveOutputFolderLinks(package.FullPath).GetAwaiter().GetResult();
+                }
             }
             catch (Exception e)
             {
diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs
@@ -39,7 +39,7 @@ IPrerequisiteHelper prerequisiteHelper
         new("https://github.com/AUTOMATIC1111/stable-diffusion-webui/raw/master/screenshot.png");
     public string RelativeArgsDefinitionScriptPath => "modules.cmd_args";
 
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
 
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs b/StabilityMatrix.Core/Models/Packages/ComfyZluda.cs
@@ -71,6 +71,11 @@ await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
 
         pipArgs = pipArgs.AddArg("numpy==1.26.0");
 
+        if (installedPackage.PipOverrides != null)
+        {
+            pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
+        }
+
         progress?.Report(
             new ProgressReport(-1f, "Installing Package Requirements...", isIndeterminate: true)
         );
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -22,7 +22,7 @@ public class InvokeAI : BaseGitPackage
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
     private const string RelativeRootPath = "invokeai-root";
-    private string RelativeFrontendBuildPath = Path.Combine("invokeai", "frontend", "web", "dist");
+    private readonly string relativeFrontendBuildPath = Path.Combine("invokeai", "frontend", "web", "dist");
 
     public override string Name => "InvokeAI";
     public override string DisplayName { get; set; } = "InvokeAI";
@@ -35,7 +35,7 @@ public class InvokeAI : BaseGitPackage
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Nightmare;
 
     public override IReadOnlyList<string> ExtraLaunchCommands =>
-        new[] { "invokeai-db-maintenance", "invokeai-import-images", };
+        ["invokeai-db-maintenance", "invokeai-import-images"];
 
     public override Uri PreviewImageUri =>
         new("https://raw.githubusercontent.com/invoke-ai/InvokeAI/main/docs/assets/canvas_preview.png");
@@ -57,80 +57,50 @@ IPrerequisiteHelper prerequisiteHelper
     public override Dictionary<SharedFolderType, IReadOnlyList<string>> SharedFolders =>
         new()
         {
-            [SharedFolderType.StableDiffusion] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "main")
-            },
-            [SharedFolderType.Lora] = new[] { Path.Combine(RelativeRootPath, "autoimport", "lora") },
-            [SharedFolderType.TextualInversion] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "embedding")
-            },
-            [SharedFolderType.ControlNet] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "controlnet")
-            },
-            [SharedFolderType.InvokeIpAdapters15] = new[]
-            {
+            [SharedFolderType.StableDiffusion] = [Path.Combine(RelativeRootPath, "autoimport", "main")],
+            [SharedFolderType.Lora] = [Path.Combine(RelativeRootPath, "autoimport", "lora")],
+            [SharedFolderType.TextualInversion] = [Path.Combine(RelativeRootPath, "autoimport", "embedding")],
+            [SharedFolderType.ControlNet] = [Path.Combine(RelativeRootPath, "autoimport", "controlnet")],
+            [SharedFolderType.InvokeIpAdapters15] =
+            [
                 Path.Combine(RelativeRootPath, "models", "sd-1", "ip_adapter")
-            },
-            [SharedFolderType.InvokeIpAdaptersXl] = new[]
-            {
+            ],
+            [SharedFolderType.InvokeIpAdaptersXl] =
+            [
                 Path.Combine(RelativeRootPath, "models", "sdxl", "ip_adapter")
-            },
-            [SharedFolderType.InvokeClipVision] = new[]
-            {
+            ],
+            [SharedFolderType.InvokeClipVision] =
+            [
                 Path.Combine(RelativeRootPath, "models", "any", "clip_vision")
-            },
-            [SharedFolderType.T2IAdapter] = new[]
-            {
-                Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")
-            }
+            ],
+            [SharedFolderType.T2IAdapter] = [Path.Combine(RelativeRootPath, "autoimport", "t2i_adapter")]
         };
 
     public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
-        new() { [SharedOutputType.Text2Img] = new[] { Path.Combine("invokeai-root", "outputs", "images") } };
+        new() { [SharedOutputType.Text2Img] = [Path.Combine("invokeai-root", "outputs", "images")] };
 
     public override string OutputFolderName => Path.Combine("invokeai-root", "outputs", "images");
 
     // https://github.com/invoke-ai/InvokeAI/blob/main/docs/features/CONFIGURATION.md
     public override List<LaunchOptionDefinition> LaunchOptions =>
         [
-            new LaunchOptionDefinition
-            {
-                Name = "Host",
-                Type = LaunchOptionType.String,
-                DefaultValue = "localhost",
-                Options = ["--host"]
-            },
-            new LaunchOptionDefinition
+            new()
             {
-                Name = "Port",
+                Name = "Root Directory",
                 Type = LaunchOptionType.String,
-                DefaultValue = "9090",
-                Options = ["--port"]
+                Options = ["--root"]
             },
-            new LaunchOptionDefinition
+            new()
             {
-                Name = "Allow Origins",
-                Description =
-                    "List of host names or IP addresses that are allowed to connect to the "
-                    + "InvokeAI API in the format ['host1','host2',...]",
+                Name = "Config File",
                 Type = LaunchOptionType.String,
-                DefaultValue = "[]",
-                Options = ["--allow-origins"]
-            },
-            new LaunchOptionDefinition
-            {
-                Name = "Precision",
-                Type = LaunchOptionType.Bool,
-                Options = ["--precision auto", "--precision float16", "--precision float32"]
+                Options = ["--config"]
             },
             LaunchOptionDefinition.Extras
         ];
 
     public override IEnumerable<TorchIndex> AvailableTorchIndices =>
-        new[] { TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.Rocm, TorchIndex.Mps };
+        [TorchIndex.Cpu, TorchIndex.Cuda, TorchIndex.Rocm, TorchIndex.Mps];
 
     public override TorchIndex GetRecommendedTorchVersion()
     {
@@ -325,7 +295,7 @@ private async Task RunInvokeCommand(
         VenvRunner.UpdateEnvironmentVariables(env => GetEnvVars(env, installedPackagePath));
 
         // fix frontend build missing for people who updated to v3.6 before the fix
-        var frontendExistsPath = Path.Combine(installedPackagePath, RelativeFrontendBuildPath);
+        var frontendExistsPath = Path.Combine(installedPackagePath, relativeFrontendBuildPath);
         if (!Directory.Exists(frontendExistsPath))
         {
             await SetupAndBuildInvokeFrontend(
@@ -422,6 +392,11 @@ ProcessOutput s
     )
     {
         var invokeAiUrl = match.Value;
+        if (invokeAiUrl.Contains("0.0.0.0"))
+        {
+            invokeAiUrl = invokeAiUrl.Replace("0.0.0.0", "127.0.0.1");
+        }
+
         var invokeAiApi = RestService.For<IInvokeAiApi>(
             invokeAiUrl,
             new RefitSettings
diff --git a/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs b/StabilityMatrix.Core/Models/Packages/StableDiffusionDirectMl.cs
@@ -36,7 +36,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override TorchIndex GetRecommendedTorchVersion() =>
         HardwareHelper.PreferDirectMLOrZluda() ? TorchIndex.DirectMl : base.GetRecommendedTorchVersion();
 
-    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;
+    public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
     public override List<LaunchOptionDefinition> LaunchOptions
     {
diff --git a/StabilityMatrix.Core/Python/PipInstallArgs.cs b/StabilityMatrix.Core/Python/PipInstallArgs.cs
@@ -65,6 +65,11 @@ public PipInstallArgs WithUserOverrides(List<PipPackageSpecifierOverride> overri
             if (string.IsNullOrWhiteSpace(pipOverride.Name))
                 continue;
 
+            if (pipOverride.Name is "--extra-index-url" or "--index-url")
+            {
+                pipOverride.Constraint = "=";
+            }
+
             var pipOverrideArg = pipOverride.ToArgument();
 
             if (pipOverride.Action is PipPackageSpecifierOverrideAction.Update)

Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,12 @@ public void RemoveLinksForAllPackages()`
`195`	`195`	`.RemoveModelFolderLinks(package.FullPath, sharedFolderMethod)`
`196`	`196`	`.GetAwaiter()`
`197`	`197`	`.GetResult();`
	`198`	`+`
	`199`	`+ // Remove output folder links if enabled`
	`200`	`+ if (package.UseSharedOutputFolder)`
	`201`	`+ {`
	`202`	`+ basePackage.RemoveOutputFolderLinks(package.FullPath).GetAwaiter().GetResult();`
	`203`	`+ }`
`198`	`204`	`}`
`199`	`205`	`catch (Exception e)`
`200`	`206`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ IPrerequisiteHelper prerequisiteHelper`
`36`	`36`	`public override TorchIndex GetRecommendedTorchVersion() =>`
`37`	`37`	`HardwareHelper.PreferDirectMLOrZluda() ? TorchIndex.DirectMl : base.GetRecommendedTorchVersion();`
`38`	`38`
`39`		`- public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Recommended;`
	`39`	`+ public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;`
`40`	`40`
`41`	`41`	`public override List<LaunchOptionDefinition> LaunchOptions`
`42`	`42`	`{`