Merge pull request LykosAI#902 from ionite34/fix-package-images

ionite34 · ionite34 · commit 929ec2c9622f · 2024-12-04T20:59:48.000Z
(cherry picked from commit 746ee01) # Conflicts: # CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,13 +5,83 @@ 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.13.0-pre.1
+### Added
+- Added file sizes to the Checkpoint Manager tab
+### Changed
+- Improved Packages Page grid layout to dynamically stretch to fill available space
+### Fixed
+- Fixed missing package thumbnails due to moved or inaccessible urls
+
+## v2.13.0-dev.3
+### Added
+- Added support for SD3.5 in Inference
+- Added CLIP_G to HuggingFace model browser
+- Added search bar to the Installed Workflows tab
+- Added "Search with Google" and "Search with ChatGPT" to the package console output & install progress console output context menus
+- Added "Date Created" and "Date Last Modified" sorting options to the Checkpoints tab
+### Changed
+- Text Encoder / CLIP selection in Inference is now enabled via the cogwheel ⚙️ button next to the model selector 
+- Added more base model types to the CivitAI Model Browser & Checkpoint Manager
+- Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
+- Updated Civitai model descriptions to properly render the interactive elements
+- Updated Russian translations thanks to @vanja-san
+- Updated Simplified Chinese translations thanks to @QL-boy
+- (Internal) Updated to Avalonia 11.2.0
+### Fixed
+- Fixed some instances of Civitai model browser not loading new results
+- Fixed "Unsupported Torch Version: Cuda" errors when installing a1111
+- Fixed crash when clicking "Remind me Later" on the update dialog
+- Fixed some cases of crashing when GitHub API rate limits are exceeded
+- Fixed Git missing from env vars when running SwarmUI
+### Supporters
+#### Visionaries
+- Big shoutout to our amazing Visionary-tier Patreon supporter, **Waterclouds**! We are very grateful for your continued support!
+
+## v2.13.0-dev.2
+### Added
+- Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!
+- Added new package - [FluxGym](https://github.com/cocktailpeanut/fluxgym) - many thanks to @NullDev for the contribution!
+- Added a new "Extension Packs" section to the extension manager, allowing you to create packs for easier installation of multiple extensions at once
+- Added "Search by Creator" command to Civitai browser context menu
+- Added Beta scheduler to the scheduler selector in Inference
+- Added zipping of log files and "Show Log in Explorer" button on exceptions dialog for easier support
+- Added max concurrent downloads option & download queueing for most downloads
+### Changed
+- (Internal) Updated to Avalonia 11.1.4
+- Adjusted the Branch/Release toggle during package install flow to be a little more obvious
+- Updated the Dock library used for Inference - fixes some weirdness with resizing / rearranging panels
+### Fixed
+- Fixed ComfyUI NF4 extension not installing properly when prompted in Inference
+- Fixed [#932](https://github.com/LykosAI/StabilityMatrix/issues/932), [#935](https://github.com/LykosAI/StabilityMatrix/issues/935), [#939](https://github.com/LykosAI/StabilityMatrix/issues/939) - InvokeAI failing to update
+- Fixed repeated nested folders being created in `Models/StableDiffusion` when using Forge in Symlink mode in certain conditions. Existing folders will be repaired to their original structure on launch.
+- Fixed minimize button not working on macOS
+- Fixed InvokeAI model sharing spamming the console with "This may take awhile" in certain conditions
+- Fixed text alignment issues in the Downloads tab for certain long names / progress infos
+### Supporters
+#### Visionaries
+- A big thank you to our amazing Visionary-tier Patreon supporter, **Waterclouds**! Your continued support is invaluable!
+
+## v2.13.0-dev.1
+### Added
+- Added the ability to change the Models directory separately from the rest of the Data directory. This can be set in `Settings > Select new Models Folder`
+- Added "Copy" menu to the Inference gallery context menu, allowing you to copy the image or the seed (other params coming soon™️)
+- Added InvokeAI model sharing option
+### Supporters
+#### Visionaries
+- A heartfelt thank you to our incredible Visionary-tier Patreon supporter, **Waterclouds**! Your ongoing support means a lot to us, and we’re grateful to have you with us on this journey!
+
+>>>>>>> 746ee01a (Merge pull request #902 from ionite34/fix-package-images)
 ## v2.12.4
 ### Changed
 - Model browser base model types are now loaded dynamically from CivitAI, reducing the need for updates to add new types
 ### Fixed
 - Fixed crash when clicking "Remind me Later" on the update dialog
 - Fixed some cases of crashing when GitHub API rate limits are exceeded
 - Fixed Git missing from env vars when running SwarmUI
+- Fixed missing package thumbnails due to moved or inaccessible urls
 ### Supporters
 #### Visionaries
 - A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,4 +2,10 @@
     <PropertyGroup>
         <AvaloniaVersion>11.1.4</AvaloniaVersion>
     </PropertyGroup>
+    
+    <PropertyGroup>
+        <!--Some bug with SDK 8.0.403 
+        https://github.com/dotnet/sdk/issues/44026-->
+        <NoWarn>$(NoWarn);CsWinRT1028</NoWarn>
+    </PropertyGroup>
 </Project>
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -37,8 +37,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "A powerful and modular stable diffusion GUI and backend";
     public override string LaunchCommand => "main.py";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/comfyanonymous/ComfyUI/raw/master/comfyui_screenshot.png");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/comfyui/preview.webp");
     public override bool ShouldIgnoreReleases => true;
     public override bool IsInferenceCompatible => true;
     public override string OutputFolderName => "output";
diff --git a/StabilityMatrix.Core/Models/Packages/KohyaSs.cs b/StabilityMatrix.Core/Models/Packages/KohyaSs.cs
@@ -27,10 +27,7 @@ IPyRunner runner
     public override string LicenseUrl => "https://github.com/bmaltais/kohya_ss/blob/master/LICENSE.md";
     public override string LaunchCommand => "kohya_gui.py";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://camo.githubusercontent.com/5154eea62c113d5c04393e51a0d0f76ef25a723aad29d256dcc85ead1961cd41/68747470733a2f2f696d672e796f75747562652e636f6d2f76692f6b35696d713031757655592f302e6a7067"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/kohyass/preview.webp");
     public override string OutputFolderName => string.Empty;
 
     public override bool IsCompatible => HardwareHelper.HasNvidiaGpu();
diff --git a/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs b/StabilityMatrix.Core/Models/Packages/Mashb1tFooocus.cs
@@ -23,8 +23,5 @@ IPrerequisiteHelper prerequisiteHelper
 
     public override string LicenseUrl => "https://github.com/mashb1t/Fooocus/blob/main/LICENSE";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/lllyasviel/Fooocus/assets/19834515/483fb86d-c9a2-4c20-997c-46dafc124f25");
-
     public override bool ShouldIgnoreReleases => false;
 }
diff --git a/StabilityMatrix.Core/Models/Packages/Reforge.cs b/StabilityMatrix.Core/Models/Packages/Reforge.cs
@@ -21,10 +21,7 @@ IPrerequisiteHelper prerequisiteHelper
         "Stable Diffusion WebUI reForge is a platform on top of Stable Diffusion WebUI (based on Gradio) to make development easier, optimize resource management, speed up inference, and study experimental features.";
     public override string LicenseUrl =>
         "https://github.com/Panchovix/stable-diffusion-webui-reForge/blob/main/LICENSE.txt";
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/lllyasviel/stable-diffusion-webui-forge/assets/19834515/de1a2d05-344a-44d7-bab8-9ecc0a58a8d3"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/reforge/preview.webp");
 
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.ReallyRecommended;
 }
diff --git a/StabilityMatrix.Core/Models/Packages/SDWebForge.cs b/StabilityMatrix.Core/Models/Packages/SDWebForge.cs
@@ -29,10 +29,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string LicenseUrl =>
         "https://github.com/lllyasviel/stable-diffusion-webui-forge/blob/main/LICENSE.txt";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/lllyasviel/stable-diffusion-webui-forge/assets/19834515/ca5e05ed-bd86-4ced-8662-f41034648e8c"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/sdwebforge/preview.webp");
 
     public override string MainBranch => "main";
     public override bool ShouldIgnoreReleases => true;
diff --git a/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs b/StabilityMatrix.Core/Models/Packages/SimpleSDXL.cs
@@ -24,8 +24,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb =>
         "Enhanced version of Fooocus for SDXL, more suitable for Chinese and Cloud. Supports Flux.";
     public override string LicenseUrl => "https://github.com/metercai/SimpleSDXL/blob/SimpleSDXL/LICENSE";
-    public override Uri PreviewImageUri =>
-        new("https://github.com/user-attachments/assets/98715a4d-9f4a-4846-ae62-eb8d69793d31");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/simplesdxl/preview.webp");
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Expert;
     public override IEnumerable<SharedFolderMethod> AvailableSharedFolderMethods =>
         [SharedFolderMethod.Configuration, SharedFolderMethod.Symlink, SharedFolderMethod.None];
diff --git a/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs b/StabilityMatrix.Core/Models/Packages/VladAutomatic.cs
@@ -36,8 +36,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "Stable Diffusion implementation with advanced features and modern UI";
     public override string LaunchCommand => "launch.py";
 
-    public override Uri PreviewImageUri =>
-        new("https://github.com/vladmandic/automatic/raw/master/html/screenshot-modernui.jpg");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/vladautomatic/preview.webp");
     public override bool ShouldIgnoreReleases => true;
 
     public override SharedFolderMethod RecommendedSharedFolderMethod => SharedFolderMethod.Symlink;
diff --git a/StabilityMatrix.Core/Models/Packages/VoltaML.cs b/StabilityMatrix.Core/Models/Packages/VoltaML.cs
@@ -26,10 +26,7 @@ IPrerequisiteHelper prerequisiteHelper
     public override string Blurb => "Fast Stable Diffusion with support for AITemplate";
     public override string LaunchCommand => "main.py";
 
-    public override Uri PreviewImageUri =>
-        new(
-            "https://github.com/LykosAI/StabilityMatrix/assets/13956642/d9a908ed-5665-41a5-a380-98458f4679a8"
-        );
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/voltaml/preview.webp");
 
     public override PackageDifficulty InstallerSortOrder => PackageDifficulty.Simple;
 
diff --git a/StabilityMatrix.Tests/Models/Packages/PackageHelper.cs b/StabilityMatrix.Tests/Models/Packages/PackageHelper.cs
@@ -0,0 +1,42 @@
+﻿using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using NSubstitute;
+using StabilityMatrix.Core.Helper;
+using StabilityMatrix.Core.Helper.Cache;
+using StabilityMatrix.Core.Models.Packages;
+using StabilityMatrix.Core.Python;
+using StabilityMatrix.Core.Services;
+
+namespace StabilityMatrix.Tests.Models.Packages;
+
+public static class PackageHelper
+{
+    /// <summary>
+    /// Get all BasePackage implementations in the assembly.
+    /// </summary>
+    public static IEnumerable<BasePackage> GetPackages()
+    {
+        var services = new ServiceCollection();
+        services
+            .AddSingleton(Substitute.For<IGithubApiCache>())
+            .AddSingleton(Substitute.For<ISettingsManager>())
+            .AddSingleton(Substitute.For<IDownloadService>())
+            .AddSingleton(Substitute.For<IPyRunner>())
+            .AddSingleton(Substitute.For<IPrerequisiteHelper>());
+
+        var assembly = typeof(BasePackage).Assembly;
+        var packageTypes = assembly
+            .GetTypes()
+            .Where(t => t.IsSubclassOf(typeof(BasePackage)) && !t.IsAbstract)
+            .Where(t => t != typeof(DankDiffusion) && t != typeof(UnknownPackage))
+            .ToList();
+
+        // Register all package types
+        services.TryAddEnumerable(
+            packageTypes.Select(t => ServiceDescriptor.Singleton(typeof(BasePackage), t))
+        );
+
+        var serviceProvider = services.BuildServiceProvider();
+        return serviceProvider.GetServices<BasePackage>();
+    }
+}
diff --git a/StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs b/StabilityMatrix.Tests/Models/Packages/PackageLinkTests.cs
@@ -0,0 +1,56 @@
+﻿using System.Net.Http.Headers;
+using StabilityMatrix.Core.Models.Packages;
+
+namespace StabilityMatrix.Tests.Models.Packages;
+
+/// <summary>
+/// Tests that URL links on Packages should be valid. Requires internet connection.
+/// </summary>
+[TestClass]
+public sealed class PackageLinkTests
+{
+    private static HttpClient HttpClient { get; } =
+        new() { DefaultRequestHeaders = { { "User-Agent", "StabilityMatrix/2.0" } } };
+
+    private static IEnumerable<object[]> PackagesData =>
+        PackageHelper.GetPackages().Select(p => new object[] { p });
+
+    [TestMethod]
+    [DynamicData(nameof(PackagesData))]
+    public async Task TestPreviewImageUri(BasePackage package)
+    {
+        var imageUri = package.PreviewImageUri;
+
+        // Test http head is successful
+        var response = await HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, imageUri));
+
+        Assert.IsTrue(
+            response.IsSuccessStatusCode,
+            "Failed to get PreviewImageUri at {0}: {1}",
+            imageUri,
+            response
+        );
+    }
+
+    [TestMethod]
+    [DynamicData(nameof(PackagesData))]
+    public async Task TestLicenseUrl(BasePackage package)
+    {
+        if (string.IsNullOrEmpty(package.LicenseUrl))
+        {
+            Assert.Inconclusive();
+        }
+
+        var licenseUri = package.LicenseUrl;
+
+        // Test http head is successful
+        var response = await HttpClient.SendAsync(new HttpRequestMessage(HttpMethod.Head, licenseUri));
+
+        Assert.IsTrue(
+            response.IsSuccessStatusCode,
+            "Failed to get LicenseUrl at {0}: {1}",
+            licenseUri,
+            response
+        );
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,5 @@ IPrerequisiteHelper prerequisiteHelper`
`23`	`23`
`24`	`24`	`public override string LicenseUrl => "https://github.com/mashb1t/Fooocus/blob/main/LICENSE";`
`25`	`25`
`26`		`- public override Uri PreviewImageUri =>`
`27`		`- new("https://github.com/lllyasviel/Fooocus/assets/19834515/483fb86d-c9a2-4c20-997c-46dafc124f25");`
`28`		`-`
`29`	`26`	`public override bool ShouldIgnoreReleases => false;`
`30`	`27`	`}`