From aa032e01b9b790d3c7016e14bb126df22bbf61d6 Mon Sep 17 00:00:00 2001 From: JT Date: Sat, 13 Apr 2024 22:52:12 -0700 Subject: [PATCH] actually do the thing --- CHANGELOG.md | 7 ++++--- StabilityMatrix.Core/Models/Packages/A3WebUI.cs | 6 ++++-- StabilityMatrix.Core/Models/Packages/SDWebForge.cs | 11 ----------- StabilityMatrix.Core/Models/SharedOutputType.cs | 1 + 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 55f4d905..8ac01ca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2 ## v2.10.1 ### Added -- Added SVD Shared Model Folder for Forge (fixes [#580](https://github.com/LykosAI/StabilityMatrix/issues/580)) +- Added SVD Shared Model & Output Folders for Forge (fixes [#580](https://github.com/LykosAI/StabilityMatrix/issues/580)) ### Changed -- Improved error message when logging in with a Lykos account fails due to incorrect email or password. +- Improved error message when logging in with a Lykos account fails due to incorrect email or password +- Model Browser & Workflow Browser now auto-load when first navigating to those pages ### Fixed - Fixed package launch not working when environment variable `SETUPTOOLS_USE_DISTUTILS` is set due to conflict with a default environment variable. User environment variables will now correctly override any default environment variables. -- Fixed "No refresh token found" error when failing to login with Lykos account in some cases. +- Fixed "No refresh token found" error when failing to login with Lykos account in some cases - Fixed blank entries appearing in the Categories dropdown on the Checkpoints page - Fixed crash when loading invalid connected model info files - Fixed [#585](https://github.com/LykosAI/StabilityMatrix/issues/585) - Crash when drag & drop source and destination are the same diff --git a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs index 8ae0f0f2..9e9b5b80 100644 --- a/StabilityMatrix.Core/Models/Packages/A3WebUI.cs +++ b/StabilityMatrix.Core/Models/Packages/A3WebUI.cs @@ -66,7 +66,8 @@ public class A3WebUI( [SharedFolderType.T2IAdapter] = new[] { "models/controlnet/T2IAdapter" }, [SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" }, [SharedFolderType.InvokeIpAdapters15] = new[] { "models/controlnet/DiffusersIpAdapters" }, - [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" } + [SharedFolderType.InvokeIpAdaptersXl] = new[] { "models/controlnet/DiffusersIpAdaptersXL" }, + [SharedFolderType.SVD] = new[] { "models/svd" } }; public override Dictionary>? SharedOutputFolders => @@ -77,7 +78,8 @@ public class A3WebUI( [SharedOutputType.Img2Img] = new[] { "output/img2img-images" }, [SharedOutputType.Text2Img] = new[] { "output/txt2img-images" }, [SharedOutputType.Img2ImgGrids] = new[] { "output/img2img-grids" }, - [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" } + [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" }, + [SharedOutputType.SVD] = new[] { "output/svd" } }; [SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")] diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs index a253b177..e3be760f 100644 --- a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs +++ b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs @@ -41,17 +41,6 @@ public class SDWebForge( public override string OutputFolderName => "output"; public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended; - public override Dictionary>? SharedOutputFolders => - new() - { - [SharedOutputType.Extras] = new[] { "output/extras-images" }, - [SharedOutputType.Saved] = new[] { "log/images" }, - [SharedOutputType.Img2Img] = new[] { "output/img2img-images" }, - [SharedOutputType.Text2Img] = new[] { "output/txt2img-images" }, - [SharedOutputType.Img2ImgGrids] = new[] { "output/img2img-grids" }, - [SharedOutputType.Text2ImgGrids] = new[] { "output/txt2img-grids" } - }; - public override List LaunchOptions => [ new LaunchOptionDefinition diff --git a/StabilityMatrix.Core/Models/SharedOutputType.cs b/StabilityMatrix.Core/Models/SharedOutputType.cs index d4dede8a..c533de49 100644 --- a/StabilityMatrix.Core/Models/SharedOutputType.cs +++ b/StabilityMatrix.Core/Models/SharedOutputType.cs @@ -8,6 +8,7 @@ public enum SharedOutputType Extras, Text2ImgGrids, Img2ImgGrids, + SVD, Saved, Consolidated }