Browse Source

actually do the thing

pull/629/head
JT 7 months ago
parent
commit
aa032e01b9
  1. 7
      CHANGELOG.md
  2. 6
      StabilityMatrix.Core/Models/Packages/A3WebUI.cs
  3. 11
      StabilityMatrix.Core/Models/Packages/SDWebForge.cs
  4. 1
      StabilityMatrix.Core/Models/SharedOutputType.cs

7
CHANGELOG.md

@ -7,12 +7,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
## v2.10.1 ## v2.10.1
### Added ### 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 ### 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
- 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 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 blank entries appearing in the Categories dropdown on the Checkpoints page
- Fixed crash when loading invalid connected model info files - 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 - Fixed [#585](https://github.com/LykosAI/StabilityMatrix/issues/585) - Crash when drag & drop source and destination are the same

6
StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@ -66,7 +66,8 @@ public class A3WebUI(
[SharedFolderType.T2IAdapter] = new[] { "models/controlnet/T2IAdapter" }, [SharedFolderType.T2IAdapter] = new[] { "models/controlnet/T2IAdapter" },
[SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" }, [SharedFolderType.IpAdapter] = new[] { "models/controlnet/IpAdapter" },
[SharedFolderType.InvokeIpAdapters15] = new[] { "models/controlnet/DiffusersIpAdapters" }, [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<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders => public override Dictionary<SharedOutputType, IReadOnlyList<string>>? SharedOutputFolders =>
@ -77,7 +78,8 @@ public class A3WebUI(
[SharedOutputType.Img2Img] = new[] { "output/img2img-images" }, [SharedOutputType.Img2Img] = new[] { "output/img2img-images" },
[SharedOutputType.Text2Img] = new[] { "output/txt2img-images" }, [SharedOutputType.Text2Img] = new[] { "output/txt2img-images" },
[SharedOutputType.Img2ImgGrids] = new[] { "output/img2img-grids" }, [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")] [SuppressMessage("ReSharper", "ArrangeObjectCreationWhenTypeNotEvident")]

11
StabilityMatrix.Core/Models/Packages/SDWebForge.cs

@ -41,17 +41,6 @@ public class SDWebForge(
public override string OutputFolderName => "output"; public override string OutputFolderName => "output";
public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended; public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended;
public override Dictionary<SharedOutputType, IReadOnlyList<string>>? 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<LaunchOptionDefinition> LaunchOptions => public override List<LaunchOptionDefinition> LaunchOptions =>
[ [
new LaunchOptionDefinition new LaunchOptionDefinition

1
StabilityMatrix.Core/Models/SharedOutputType.cs

@ -8,6 +8,7 @@ public enum SharedOutputType
Extras, Extras,
Text2ImgGrids, Text2ImgGrids,
Img2ImgGrids, Img2ImgGrids,
SVD,
Saved, Saved,
Consolidated Consolidated
} }

Loading…
Cancel
Save