Merge pull request LykosAI#909 from ionite34/backport/main/pr-899

[dev to main] backport: O B S E R V E (899)
LykosAI · Dec 5, 2024 · 5f6d792 · 5f6d792
2 parents 922a68a + bdf423d
commit 5f6d792
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 28 deletions.
diff --git a/StabilityMatrix.Avalonia/Behaviors/TextEditorToolTipBehavior.cs b/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"))

diff --git a/StabilityMatrix.Avalonia/Collections/SearchCollection.cs b/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()
         );
     }

diff --git a/StabilityMatrix.Avalonia/Controls/BetterComboBox.cs b/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

diff --git a/StabilityMatrix.Avalonia/Controls/Inference/SelectImageCard.axaml.cs b/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)

diff --git a/StabilityMatrix.Avalonia/Controls/Painting/PaintCanvas.axaml.cs b/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)

diff --git a/StabilityMatrix.Avalonia/Services/InferenceClientManager.cs b/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(_ =>
         {

diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs
@@ -6,6 +6,7 @@
 using System.Net.Http;
 using System.Reactive.Linq;
 using System.Text.Json.Nodes;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -146,6 +147,7 @@ or nameof(HideEarlyAccessModels)
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<CheckpointBrowserCardViewModel, bool>)FilterModelCardsPredicate)
             .StartWith(FilterModelCardsPredicate)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var sortPredicate = SortExpressionComparer<CheckpointBrowserCardViewModel>.Ascending(
@@ -167,9 +169,15 @@ or nameof(HideEarlyAccessModels)
             .DisposeMany()
             .Filter(filterPredicate)
             .SortAndBind(ModelCards, sortPredicate)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
-        baseModelCache.Connect().DeferUntilLoaded().SortAndBind(AllBaseModels).Subscribe();
+        baseModelCache
+            .Connect()
+            .DeferUntilLoaded()
+            .SortAndBind(AllBaseModels)
+            .ObserveOn(SynchronizationContext.Current)
+            .Subscribe();
 
         baseModelCache.AddOrUpdate(Enum.GetValues<CivitBaseModelType>().Select(t => t.GetStringValue()));
 

diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/HuggingFacePageViewModel.cs
@@ -6,6 +6,7 @@
 using System.Reactive.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -86,6 +87,7 @@ INotificationService notificationService
             .Bind(Categories)
             .WhenAnyPropertyChanged()
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ => NumSelected = Categories.Sum(c => c.NumSelected));
 
         progressTimer.Tick += (_, _) =>

diff --git a/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
@@ -196,6 +197,7 @@ protected override void OnInitialLoaded()
                             )
                     )
             )
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var filterPredicate = Observable
@@ -209,6 +211,7 @@ or nameof(SelectedBaseModels)
             )
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<LocalModelFile, bool>)FilterModels)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         var comparerObservable = Observable
@@ -282,6 +285,7 @@ or nameof(SortConnectedModelsFirst)
 
                 return comparer;
             })
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         ModelsCache
@@ -304,6 +308,7 @@ or nameof(SortConnectedModelsFirst)
             .SortAndBind(Models, comparerObservable)
             .WhenPropertyChanged(p => p.IsSelected)
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ =>
             {
                 NumItemsSelected = Models.Count(o => o.IsSelected);
@@ -315,6 +320,7 @@ or nameof(SortConnectedModelsFirst)
             .Throttle(TimeSpan.FromMilliseconds(50))
             .Select(_ => (Func<CheckpointCategory, bool>)FilterCategories)
             .StartWith(FilterCategories)
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         categoriesCache
@@ -327,6 +333,7 @@ or nameof(SortConnectedModelsFirst)
                     .Descending(x => x.Name == "All Models")
                     .ThenByAscending(x => x.Name)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         settingsManager.RelayPropertyFor(

diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/NewOneClickInstallViewModel.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Threading;
@@ -70,6 +71,7 @@ INotificationService notificationService
 
         var incompatiblePredicate = this.WhenPropertyChanged(vm => vm.ShowIncompatiblePackages)
             .Select(_ => new Func<BasePackage, bool>(p => p.IsCompatible || ShowIncompatiblePackages))
+            .ObserveOn(SynchronizationContext.Current)
             .AsObservable();
 
         AllPackagesCache
@@ -83,6 +85,7 @@ INotificationService notificationService
                     .Ascending(p => p.InstallerSortOrder)
                     .ThenByAscending(p => p.DisplayName)
             )
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         AllPackagesCache.AddOrUpdate(packageFactory.GetAllAvailablePackages());

diff --git a/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs b/StabilityMatrix.Avalonia/ViewModels/Dialogs/RecommendedModelsViewModel.cs
@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reactive.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -73,13 +75,15 @@ IModelImportService modelImportService
             .DeferUntilLoaded()
             .Filter(f => f.ModelVersion.BaseModel == "SD 1.5")
             .Bind(Sd15Models)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
 
         CivitModels
             .Connect()
             .DeferUntilLoaded()
             .Filter(f => f.ModelVersion.BaseModel == "SDXL 1.0" || f.ModelVersion.BaseModel == "Pony")
             .Bind(SdxlModels)
+            .ObserveOn(SynchronizationContext.Current)
             .Subscribe();
     }