v2.12.4

CHANGELOG.md

@@ -5,6 +5,25 @@ 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.12.4
+### Added
+- Added new package - [CogVideo](https://github.com/THUDM/CogVideo) - many thanks to @NullDev for the contribution!
+- Added more formatting options for Inference output filenames - thanks to @yansigit!
+### 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
+- Fixed an issue with updating FluxGym in certain cases - thanks to @NullDev!
+- Fixed a typo in the Japanese translation - thanks to @mattyatea!
+### Supporters
+#### Visionaries
+- A huge thank you to our dedicated Visionary-tier Patreon supporter, **Waterclouds**! We’re thrilled to have your ongoing support!
+#### Pioneers
+- Shoutout to our great Pioneer-tier patrons: **tankfox**, **tanangular**, **Mr. Unknown**, **Szir777**, and our newest Pioneer, **Tigon**!. Your continued support is greatly appreciated!
+
 ## v2.12.3
 ### Added
 - Added new package - [SimpleSDXL](https://github.com/metercai/SimpleSDXL) - many thanks to @NullDev for the contribution!

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>

StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
@@ -29,9 +31,7 @@ public class TextEditorToolTipBehavior : Behavior<TextEditor>
     private ToolTip? toolTip;
 
     public static readonly StyledProperty<ITokenizerProvider?> TokenizerProviderProperty =
-        AvaloniaProperty.Register<TextEditorCompletionBehavior, ITokenizerProvider?>(
-            "TokenizerProvider"
-        );
+        AvaloniaProperty.Register<TextEditorCompletionBehavior, ITokenizerProvider?>("TokenizerProvider");
 
     public ITokenizerProvider? TokenizerProvider
     {
@@ -137,6 +137,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
 
             toolTip
                 .GetPropertyChangedObservable(ToolTip.IsOpenProperty)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(c =>
                 {
                     if (c.NewValue as bool? != true)
@@ -159,10 +160,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
     private ToolTipData? GetCaretToolTipData(TextViewPosition position)
     {
         var logicalPosition = position.Location;
-        var pointerOffset = textEditor.Document.GetOffset(
-            logicalPosition.Line,
-            logicalPosition.Column
-        );
+        var pointerOffset = textEditor.Document.GetOffset(logicalPosition.Line, logicalPosition.Column);
 
         var line = textEditor.Document.GetLineByOffset(pointerOffset);
         var lineText = textEditor.Document.GetText(line.Offset, line.Length);
@@ -227,10 +225,7 @@ private void TextEditor_OnPointerHover(object? sender, PointerEventArgs e)
             if (result.Tokens.ElementAtOrDefault(currentTokenIndex + tokenOffset) is { } token)
             {
                 // Check supported scopes
-                if (
-                    token.Scopes.Where(s => s.Contains("invalid")).ToArray() is
-                    { Length: > 0 } results
-                )
+                if (token.Scopes.Where(s => s.Contains("invalid")).ToArray() is { Length: > 0 } results)
                 {
                     // Special cases
                     if (results.Contains("invalid.illegal.mismatched.parenthesis.closing.prompt"))

StabilityMatrix.Avalonia/Collections/SearchCollection.cs

@@ -3,6 +3,7 @@
 using System.Reactive;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
+using System.Threading;
 using DynamicData;
 using DynamicData.Binding;
 using JetBrains.Annotations;
@@ -72,6 +73,7 @@ public SearchCollection(
             .Filter(dynamicPredicate)
             .Sort(SortComparer)
             .Bind(FilteredItems)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
     }
 
@@ -114,6 +116,7 @@ public SearchCollection(
                 .Sort(SearchItemSortComparer, SortOptimisations.ComparesImmutableValuesOnly)
                 .Transform(searchItem => searchItem.Item)
                 .Bind(FilteredItems)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe()
         );
     }

StabilityMatrix.Avalonia/Controls/BetterComboBox.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+using System.Threading;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Presenters;
@@ -48,7 +49,9 @@ public BetterComboBox()
             .Select(_ => currentInput);
 
         // Subscribe to the observable to filter the ComboBox items
-        subscription = inputObservable.Subscribe(OnInputReceived, _ => ResetPopupText());
+        subscription = inputObservable
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe(OnInputReceived, _ => ResetPopupText());
 
         // Initialize the popup
         inputPopup = new Popup

StabilityMatrix.Avalonia/Controls/BetterMarkdownScrollViewer.cs

@@ -0,0 +1,16 @@
+using Markdown.Avalonia;
+using StabilityMatrix.Avalonia.Styles.Markdown;
+
+namespace StabilityMatrix.Avalonia.Controls;
+
+/// <summary>
+/// Fix MarkdownScrollViewer IBrush errors and not working with Avalonia 11.2.0
+/// </summary>
+public class BetterMarkdownScrollViewer : MarkdownScrollViewer
+{
+    public BetterMarkdownScrollViewer()
+    {
+        MarkdownStyleName = "Empty";
+        MarkdownStyle = new MarkdownStyleFluentAvalonia();
+    }
+}

StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Reactive.Linq;
+using System.Threading;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using DynamicData.Binding;
@@ -24,6 +26,7 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
 
         imageControl
             .WhenPropertyChanged(x => x.CurrentImage)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(propertyValue =>
             {
                 if (propertyValue.Value is { } image)

StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs

@@ -3,6 +3,8 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls;
@@ -108,6 +110,7 @@ protected override void OnDataContextChanged(EventArgs e)
             viewModelSubscription?.Dispose();
             viewModelSubscription = viewModel
                 .WhenPropertyChanged(vm => vm.CanvasSize)
+                .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(change =>
                 {
                     if (MainCanvas is not null && !change.Value.IsEmpty)

StabilityMatrix.Avalonia/DialogHelper.cs

@@ -81,7 +81,11 @@ public static BetterContentDialog CreateTextEntryDialog(
         IReadOnlyList<TextBoxField> textFields
     )
     {
-        return CreateTextEntryDialog(title, new MarkdownScrollViewer { Markdown = description }, textFields);
+        return CreateTextEntryDialog(
+            title,
+            new BetterMarkdownScrollViewer { Markdown = description },
+            textFields
+        );
     }
 
     /// <summary>
@@ -94,7 +98,7 @@ public static BetterContentDialog CreateTextEntryDialog(
         IReadOnlyList<TextBoxField> textFields
     )
     {
-        var markdown = new MarkdownScrollViewer { Markdown = description };
+        var markdown = new BetterMarkdownScrollViewer { Markdown = description };
         var image = new BetterAdvancedImage((Uri?)null)
         {
             Source = imageSource,
@@ -235,7 +239,7 @@ public static BetterContentDialog CreateMarkdownDialog(
     {
         Dispatcher.UIThread.VerifyAccess();
 
-        var viewer = new MarkdownScrollViewer { Markdown = markdown };
+        var viewer = new BetterMarkdownScrollViewer { Markdown = markdown };
 
         // Apply syntax highlighting to code blocks if preset is provided
         if (editorPreset != default)

StabilityMatrix.Avalonia/Services/InferenceClientManager.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
@@ -164,6 +165,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(Models)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         controlNetModelsSource
@@ -176,6 +178,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(ControlNetModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         loraModelsSource
@@ -185,6 +188,7 @@ ICompletionProvider completionProvider
                 LoraModels,
                 SortExpressionComparer<HybridModelFile>.Ascending(f => f.Type).ThenByAscending(f => f.SortKey)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         promptExpansionModelsSource
@@ -197,6 +201,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(PromptExpansionModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         ultralyticsModelsSource
@@ -209,6 +214,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(UltralyticsModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         samModelsSource
@@ -221,6 +227,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(SamModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         unetModelsSource
@@ -232,6 +239,7 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(UnetModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         clipModelsSource
@@ -244,25 +252,47 @@ ICompletionProvider completionProvider
             )
             .DeferUntilLoaded()
             .Bind(ClipModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         vaeModelsDefaults.AddOrUpdate(HybridModelFile.Default);
 
-        vaeModelsDefaults.Connect().Or(vaeModelsSource.Connect()).Bind(VaeModels).Subscribe();
+        vaeModelsDefaults
+            .Connect()
+            .Or(vaeModelsSource.Connect())
+            .Bind(VaeModels)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
-        samplersSource.Connect().DeferUntilLoaded().Bind(Samplers).Subscribe();
+        samplersSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Samplers)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         latentUpscalersSource
             .Connect()
             .Or(modelUpscalersSource.Connect())
             .Or(downloadableUpscalersSource.Connect())
             .Sort(SortExpressionComparer<ComfyUpscaler>.Ascending(f => f.Type).ThenByAscending(f => f.Name))
             .Bind(Upscalers)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-        schedulersSource.Connect().DeferUntilLoaded().Bind(Schedulers).Subscribe();
+        schedulersSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Schedulers)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
-        preprocessorsSource.Connect().DeferUntilLoaded().Bind(Preprocessors).Subscribe();
+        preprocessorsSource
+            .Connect()
+            .DeferUntilLoaded()
+            .Bind(Preprocessors)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         settingsManager.RegisterOnLibraryDirSet(_ =>
         {

StabilityMatrix.Avalonia/StabilityMatrix.Avalonia.csproj

@@ -113,7 +113,7 @@
         <PackageReference Include="FuzzySharp" Version="2.0.2" />
         <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
         <PackageReference Include="KeyedSemaphores" Version="5.0.0" />
-        <PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
+        <PackageReference Include="Markdown.Avalonia" Version="11.0.3-a1" />
         <PackageReference Include="MessagePipe" Version="1.8.1" />
         <PackageReference Include="MessagePipe.Interprocess" Version="1.8.1" />
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />