Merge branch 'dev' into inference-preprocessors

9 months ago · cd0957825f
13 changed files with 113 additions and 42 deletions
--- a/Avalonia.Gif/Avalonia.Gif.csproj
+++ b/Avalonia.Gif/Avalonia.Gif.csproj
@ -10,7 +10,7 @@
 		<EnableWindowsTargeting>true</EnableWindowsTargeting>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.7" />
+    <PackageReference Include="Avalonia" Version="11.0.9" />
    <PackageReference Include="SkiaSharp" Version="2.88.7" />
 	<PackageReference Include="DotNet.Bundle" Version="0.9.13" />
  </ItemGroup>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,17 @@ 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.9.0-pre.2
+### Added
+- Added `--launch-package` argument to launch a specific package on startup, using display name or package ID (i.e. `--launch-package "Stable Diffusion WebUI Forge"` or `--launch-package c0b3ecc5-9664-4be9-952d-a10b3dcaee14`)
+- Added more Base Model search options to the CivitAI Model Browser
+- Added Stable Cascade to the HuggingFace Model Browser
+### Changed
+- (Internal) Updated to Avalonia 11.0.9
+### Fixed
+- Fixed image viewer dialog arrow key navigation not working
+- Fixed CivitAI login prompt not showing when downloading models that require CivitAI logins
+
 ## v2.9.0-pre.1
 ### Added
 - Added Inference Prompt Styles, with Prompt Expansion model support (i.e. Fooocus V2)
--- a/StabilityMatrix.Avalonia.Diagnostics/StabilityMatrix.Avalonia.Diagnostics.csproj
+++ b/StabilityMatrix.Avalonia.Diagnostics/StabilityMatrix.Avalonia.Diagnostics.csproj
@ -19,8 +19,8 @@
    </ItemGroup>

    <ItemGroup>
-      <PackageReference Include="Avalonia" Version="11.0.7" />
-      <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.7" />
+      <PackageReference Include="Avalonia" Version="11.0.9" />
+      <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.9" />
      <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
      <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
--- a/StabilityMatrix.Avalonia/Assets/hf-packages.json
+++ b/StabilityMatrix.Avalonia/Assets/hf-packages.json
@ -58,6 +58,17 @@
    "LicenseType": "Stable-Video-Diffusion-NC-Community",
    "LicensePath": "LICENSE"
  },
+  {
+    "ModelCategory": "BaseModel",
+    "ModelName": "Stable Cascade",
+    "RepositoryPath": "stabilityai/stable-cascade",
+    "Files": [
+      "comfyui_checkpoints/stable_cascade_stage_b.safetensors",
+      "comfyui_checkpoints/stable_cascade_stage_c.safetensors"
+    ],
+    "LicenseType": "stable-cascade-nc-community",
+    "LicensePath": "LICENSE"
+  },
  {
    "ModelCategory": "ControlNet",
    "ModelName": "Canny",
--- a/StabilityMatrix.Avalonia/Models/AppArgs.cs
+++ b/StabilityMatrix.Avalonia/Models/AppArgs.cs
@ -77,6 +77,13 @@ public class AppArgs
    [Option("data-dir", HelpText = "Override data directory")]
    public string? DataDirectoryOverride { get; set; }

+    /// <summary>
+    /// Launch an installed package on startup
+    /// Can use package ID or name
+    /// </summary>
+    [Option("launch-package", HelpText = "Package ID or name to launch on startup")]
+    public string? LaunchPackageName { get; set; }
+
    /// <summary>
    /// Custom Uri protocol handler
    /// This will send the Uri to the running instance of the app via IPC and exit
--- a/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
+++ b/StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj
@ -39,13 +39,13 @@
        <PackageReference Include="AsyncImageLoader.Avalonia" Version="3.2.1" />
        <PackageReference Include="AutoComplete.Net" Version="1.2211.2014.42"/>
        <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
-        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.7" />
+        <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.9" />
        <PackageReference Include="Avalonia.Controls.PanAndZoom" Version="11.0.0.2" />
-        <PackageReference Include="Avalonia" Version="11.0.7" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.7" />
+        <PackageReference Include="Avalonia" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.9" />
        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
        <PackageReference Include="Avalonia.HtmlRenderer" Version="11.0.0" />
        <PackageReference Include="Avalonia.Labs.Controls" Version="11.0.3" />
        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
@ -65,8 +65,8 @@
        <PackageReference Include="Exceptionless.DateTimeExtensions" Version="3.4.3" />
        <PackageReference Include="FluentAvalonia.BreadcrumbBar" Version="2.0.2" />
        <PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
-        <PackageReference Include="FluentIcons.Avalonia" Version="1.1.225" />
-        <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.225" />
+        <PackageReference Include="FluentIcons.Avalonia" Version="1.1.230" />
+        <PackageReference Include="FluentIcons.Avalonia.Fluent" Version="1.1.230" />
        <PackageReference Include="FuzzySharp" Version="2.0.2" />
        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
        <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
@ -77,24 +77,25 @@
        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
        <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
        <PackageReference Include="NLog" Version="5.2.8" />
        <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
        <PackageReference Include="NSubstitute" Version="5.1.0" />
        <PackageReference Include="OneOf" Version="3.0.263" />
-        <PackageReference Include="Polly" Version="8.2.1" />
+        <PackageReference Include="Polly" Version="8.3.0" />
        <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
        <PackageReference Include="Polly.Extensions.Http" Version="3.0.0" />
-        <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.0.1" />
+        <PackageReference Include="Projektanker.Icons.Avalonia.FontAwesome" Version="9.1.1" />
        <PackageReference Include="RockLib.Reflection.Optimized" Version="3.0.0" />
-        <PackageReference Include="Sentry" Version="3.41.3" />
-        <PackageReference Include="Sentry.NLog" Version="3.41.3" />
+        <PackageReference Include="Sentry" Version="4.1.2" />
+        <PackageReference Include="Sentry.NLog" Version="4.1.2" />
        <PackageReference Include="SpacedGrid-Avalonia" Version="11.0.0" />
        <PackageReference Include="Sylvan.Common" Version="0.4.3" />
-        <PackageReference Include="Sylvan.Data" Version="0.2.12" />
-        <PackageReference Include="Sylvan.Data.Csv" Version="1.3.5" />
+        <PackageReference Include="Sylvan.Data" Version="0.2.13" />
+        <PackageReference Include="Sylvan.Data.Csv" Version="1.3.7" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.2" />
        <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
        <PackageReference Include="TextMateSharp.Grammars" Version="1.0.56" />
        <PackageReference Include="URISchemeTools" Version="1.0.2" />
--- a/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs
+++ b/StabilityMatrix.Avalonia/ViewModels/LaunchPageViewModel.cs
@ -181,6 +181,26 @@ public partial class LaunchPageViewModel : PageViewModelBase, IDisposable, IAsyn
        }
    }

+    protected override Task OnInitialLoadedAsync()
+    {
+        if (string.IsNullOrWhiteSpace(Program.Args.LaunchPackageName))
+            return base.OnInitialLoadedAsync();
+
+        var package = InstalledPackages.FirstOrDefault(x => x.DisplayName == Program.Args.LaunchPackageName);
+        if (package is not null)
+        {
+            SelectedPackage = package;
+            return LaunchAsync();
+        }
+
+        package = InstalledPackages.FirstOrDefault(x => x.Id.ToString() == Program.Args.LaunchPackageName);
+        if (package is null)
+            return base.OnInitialLoadedAsync();
+
+        SelectedPackage = package;
+        return LaunchAsync();
+    }
+
    public override void OnLoaded()
    {
        // Load installed packages
@ -203,6 +223,8 @@ public partial class LaunchPageViewModel : PageViewModelBase, IDisposable, IAsyn
        // Load active package
        SelectedPackage = settingsManager.Settings.ActiveInstalledPackage;
        AutoScrollToEnd = settingsManager.Settings.AutoScrollLaunchConsoleToEnd;
+
+        base.OnLoaded();
    }

    [RelayCommand]
--- a/StabilityMatrix.Avalonia/Views/Dialogs/ImageViewerDialog.axaml
+++ b/StabilityMatrix.Avalonia/Views/Dialogs/ImageViewerDialog.axaml
@ -72,6 +72,7 @@
                    <DataTemplate x:Key="{x:Static models:ImageSourceTemplateType.Image}" DataType="models:ImageSource">
                        <controls:AdvancedImageBox
                            Name="ImageBox"
+                            Focusable="False"
                            CornerRadius="4"
                            Image="{Binding BitmapAsync^}"
                            SizeMode="Fit">
--- a/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs
+++ b/StabilityMatrix.Core/Models/Api/CivitBaseModelType.cs
@ -26,6 +26,18 @@ public enum CivitBaseModelType
    [StringValue("SDXL 1.0 LCM")]
    Sdxl10Lcm,

+    [StringValue("SDXL Distilled")]
+    SdxlDistilled,
+
+    [StringValue("SDXL Lightning")]
+    SdxlLightning,
+
+    [StringValue("SVD")]
+    SVD,
+
+    [StringValue("Stable Cascade")]
+    StableCascade,
+
    [StringValue("SDXL Turbo")]
    SdxlTurbo,
    Other,
--- a/StabilityMatrix.Core/Services/DownloadService.cs
+++ b/StabilityMatrix.Core/Services/DownloadService.cs
@ -1,4 +1,5 @@
-using System.Net.Http.Headers;
+using System.Net;
+using System.Net.Http.Headers;
 using Microsoft.Extensions.Logging;
 using Polly.Contrib.WaitAndRetry;
 using StabilityMatrix.Core.Attributes;
@ -184,6 +185,10 @@ public class DownloadService : IDownloadService
                    throw new UnauthorizedAccessException();
                }
            }
+            else if (noRedirectResponse.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                throw new UnauthorizedAccessException();
+            }

            using var redirectRequest = new HttpRequestMessage();
            redirectRequest.Method = HttpMethod.Get;
--- a/StabilityMatrix.Core/StabilityMatrix.Core.csproj
+++ b/StabilityMatrix.Core/StabilityMatrix.Core.csproj
@ -17,7 +17,7 @@

    <ItemGroup>
      <PackageReference Include="AsyncAwaitBestPractices" Version="7.0.0" />
-      <PackageReference Include="AutoCtor" Version="2.1.0" />
+      <PackageReference Include="AutoCtor" Version="2.1.1" />
      <PackageReference Include="Blake3" Version="1.0.0" />
      <PackageReference Include="Crc32.NET" Version="1.2.0" />
      <PackageReference Include="CSharpDiscriminatedUnion" Version="2.0.1" />
@ -32,9 +32,9 @@
      <PackageReference Include="FreneticLLC.FreneticUtilities" Version="1.0.24" />
      <PackageReference Include="Hardware.Info" Version="100.0.1.1" />
      <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
-      <PackageReference Include="KGySoft.Drawing.Core" Version="8.0.0" />
-      <PackageReference Include="KGySoft.Drawing.SkiaSharp" Version="8.0.0" />
-      <PackageReference Include="LiteDB" Version="5.0.17" />
+      <PackageReference Include="KGySoft.Drawing.Core" Version="8.1.0" />
+      <PackageReference Include="KGySoft.Drawing.SkiaSharp" Version="8.1.0" />
+      <PackageReference Include="LiteDB" Version="5.0.19" />
      <PackageReference Include="LiteDB.Async" Version="0.1.7" />
      <PackageReference Include="MetadataExtractor" Version="2.8.1" />
      <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
@ -42,10 +42,10 @@
      <PackageReference Include="NLog" Version="5.2.8" />
      <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
      <PackageReference Include="NSec.Cryptography" Version="22.4.0" />
-      <PackageReference Include="Octokit" Version="9.1.0" />
+      <PackageReference Include="Octokit" Version="10.0.0" />
      <PackageReference Include="OneOf" Version="3.0.263" />
      <PackageReference Include="OneOf.SourceGenerator" Version="3.0.263" />
-      <PackageReference Include="Polly" Version="8.2.1" />
+      <PackageReference Include="Polly" Version="8.3.0" />
      <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
      <PackageReference Include="pythonnet" Version="3.0.3" />
      <PackageReference Include="Refit" Version="7.0.0" />
@ -53,11 +53,11 @@
      <PackageReference Include="RockLib.Reflection.Optimized" Version="3.0.0" />
      <PackageReference Include="Salaros.ConfigParser" Version="0.3.8" />
      <PackageReference Include="Semver" Version="3.0.0-beta.1" />
-      <PackageReference Include="Sentry.NLog" Version="3.41.3" />
+      <PackageReference Include="Sentry.NLog" Version="4.1.2" />
      <PackageReference Include="SharpCompress" Version="0.36.0" />
      <PackageReference Include="SkiaSharp" Version="2.88.7" />
-      <PackageReference Include="Websocket.Client" Version="5.0.0" />
-      <PackageReference Include="YamlDotNet" Version="13.7.1" />
+      <PackageReference Include="Websocket.Client" Version="5.1.1" />
+      <PackageReference Include="YamlDotNet" Version="15.1.2" />
      <PackageReference Include="Yoh.Text.Json.NamingPolicies" Version="1.0.0" />
    </ItemGroup>
 </Project>
--- a/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
+++ b/StabilityMatrix.Tests/StabilityMatrix.Tests.csproj
@ -17,18 +17,18 @@

    <ItemGroup>
        <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
-        <PackageReference Include="DotNext" Version="5.0.0" />
+        <PackageReference Include="DotNext" Version="5.1.0" />
        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
          <PrivateAssets>all</PrivateAssets>
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="Polly" Version="8.2.1" />
+        <PackageReference Include="Polly" Version="8.3.0" />
        <PackageReference Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
    </ItemGroup>

--- a/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
+++ b/StabilityMatrix.UITests/StabilityMatrix.UITests.csproj
@ -15,21 +15,22 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.7" />
+        <PackageReference Include="Avalonia.Headless.XUnit" Version="11.0.9" />
        <PackageReference Include="DotNet.Bundle" Version="0.9.13" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
        <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="Verify" Version="23.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.2" />
+        <PackageReference Include="Verify" Version="23.2.2" />
        <PackageReference Include="Verify.CommunityToolkit.Mvvm" Version="0.1.0" />
        <PackageReference Include="Verify.Avalonia" Version="1.0.1" />
        <PackageReference Include="Verify.Phash" Version="3.1.0" />
-        <PackageReference Include="Verify.Xunit" Version="23.0.0" />
-        <PackageReference Include="xunit" Version="2.6.6" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="Verify.Xunit" Version="23.2.2" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
            <PrivateAssets>all</PrivateAssets>
        </PackageReference>