Merge pull request LykosAI#458 from ionite34/checkpoint-updates-n-stuff

add Find in Model Browser button on Checkpoints page context menu

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added base model filter to Checkpoints page
 - Search box on Checkpoints page now searches tags and trigger words
 - Added "Compatible Images" category when selecting images for Inference projects
+- Added "Find in Model Browser" option to the right-click menu on the Checkpoints page
 ### Changed
 - Removed "Failed to load image" notification when loading some images on the Checkpoints page
 - Installed models will no longer be selectable on the Hugging Face tab of the model browser

StabilityMatrix.Avalonia/DesignData/DesignData.cs

@@ -209,6 +209,7 @@ public static void Initialize()
                             PreviewImagePath =
                                 "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/"
                                 + "78fd2a0a-42b6-42b0-9815-81cb11bb3d05/00009-2423234823.jpeg",
+                            UpdateAvailable = true,
                             ConnectedModel = new ConnectedModelInfo
                             {
                                 VersionName = "Lightning Auroral",

StabilityMatrix.Avalonia/DesignData/MockModelIndexService.cs

@@ -43,6 +43,11 @@ public Task<bool> RemoveModelAsync(LocalModelFile model)
         return Task.FromResult(false);
     }
 
+    public Task CheckModelsForUpdates()
+    {
+        return Task.CompletedTask;
+    }
+
     /// <inheritdoc />
     public void BackgroundRefreshIndex() { }
 }

StabilityMatrix.Avalonia/Languages/Resources.resx

@@ -927,4 +927,7 @@
   <data name="Label_VideoQuality" xml:space="preserve">
     <value>Quality</value>
   </data>
+  <data name="Label_FindInModelBrowser" xml:space="preserve">
+    <value>Find in Model Browser</value>
+  </data>
 </root>

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs

@@ -18,6 +18,7 @@
 using LiteDB;
 using LiteDB.Async;
 using NLog;
+using OneOf.Types;
 using Refit;
 using StabilityMatrix.Avalonia.Languages;
 using StabilityMatrix.Avalonia.Services;
@@ -160,6 +161,17 @@ INotificationService notificationService
             .Where(page => page <= TotalPages && page > 0)
             .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ => TrySearchAgain(false).SafeFireAndForget(), err => Logger.Error(err));
+
+        EventManager.Instance.NavigateAndFindCivitModelRequested += OnNavigateAndFindCivitModelRequested;
+    }
+
+    private void OnNavigateAndFindCivitModelRequested(object? sender, int e)
+    {
+        if (e <= 0)
+            return;
+
+        SearchQuery = $"$#{e}";
+        SearchModelsCommand.ExecuteAsync(null).SafeFireAndForget();
     }
 
     public override void OnLoaded()
@@ -399,6 +411,16 @@ private async Task SearchModels()
             Page = CurrentPageNumber
         };
 
+        if (SelectedModelType != CivitModelType.All)
+        {
+            modelRequest.Types = [SelectedModelType];
+        }
+
+        if (SelectedBaseModelType != "All")
+        {
+            modelRequest.BaseModel = SelectedBaseModelType;
+        }
+
         if (SearchQuery.StartsWith("#"))
         {
             modelRequest.Tag = SearchQuery[1..];
@@ -407,19 +429,16 @@ private async Task SearchModels()
         {
             modelRequest.Username = SearchQuery[1..];
         }
-        else
-        {
-            modelRequest.Query = SearchQuery;
-        }
-
-        if (SelectedModelType != CivitModelType.All)
+        else if (SearchQuery.StartsWith("$#"))
         {
-            modelRequest.Types = [SelectedModelType];
+            modelRequest.Period = CivitPeriod.AllTime;
+            modelRequest.BaseModel = null;
+            modelRequest.Types = null;
+            modelRequest.CommaSeparatedModelIds = SearchQuery[2..];
         }
-
-        if (SelectedBaseModelType != "All")
+        else
         {
-            modelRequest.BaseModel = SelectedBaseModelType;
+            modelRequest.Query = SearchQuery;
         }
 
         if (SortMode == CivitSortMode.Installed)

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowserViewModel.cs

@@ -1,32 +1,51 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using Avalonia;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using CommunityToolkit.Mvvm.ComponentModel;
+using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Avalonia.ViewModels.CheckpointBrowser;
 using StabilityMatrix.Avalonia.Views;
 using StabilityMatrix.Core.Attributes;
+using StabilityMatrix.Core.Helper;
 using Symbol = FluentIcons.Common.Symbol;
 using SymbolIconSource = FluentIcons.FluentAvalonia.SymbolIconSource;
 
 namespace StabilityMatrix.Avalonia.ViewModels;
 
 [View(typeof(CheckpointBrowserPage))]
 [Singleton]
-public partial class CheckpointBrowserViewModel(
-    CivitAiBrowserViewModel civitAiBrowserViewModel,
-    HuggingFacePageViewModel huggingFaceViewModel
-) : PageViewModelBase
+public partial class CheckpointBrowserViewModel : PageViewModelBase
 {
     public override string Title => "Model Browser";
-    public override IconSource IconSource => new SymbolIconSource { Symbol = Symbol.BrainCircuit, IsFilled = true };
+    public override IconSource IconSource =>
+        new SymbolIconSource { Symbol = Symbol.BrainCircuit, IsFilled = true };
 
-    public IReadOnlyList<TabItem> Pages { get; } =
-        new List<TabItem>(
+    public IReadOnlyList<TabItem> Pages { get; }
+
+    [ObservableProperty]
+    private TabItem? selectedPage;
+
+    /// <inheritdoc/>
+    public CheckpointBrowserViewModel(
+        CivitAiBrowserViewModel civitAiBrowserViewModel,
+        HuggingFacePageViewModel huggingFaceViewModel
+    )
+    {
+        Pages = new List<TabItem>(
             new List<TabViewModelBase>([civitAiBrowserViewModel, huggingFaceViewModel]).Select(
                 vm => new TabItem { Header = vm.Header, Content = vm }
             )
         );
+        SelectedPage = Pages.FirstOrDefault();
+        EventManager.Instance.NavigateAndFindCivitModelRequested += OnNavigateAndFindCivitModelRequested;
+    }
+
+    private void OnNavigateAndFindCivitModelRequested(object? sender, int e)
+    {
+        SelectedPage = Pages.FirstOrDefault();
+    }
 }

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFile.cs

@@ -63,6 +63,9 @@ public partial class CheckpointFile : ViewModelBase
     [ObservableProperty]
     private ProgressReport? progress;
 
+    [ObservableProperty]
+    private bool updateAvailable;
+
     public string FileName => Path.GetFileName(FilePath);
 
     public bool CanShowTriggerWords =>
@@ -212,6 +215,15 @@ private async Task RenameAsync()
         }
     }
 
+    [RelayCommand]
+    private void FindOnModelBrowser()
+    {
+        if (ConnectedModel?.ModelId == null)
+            return;
+
+        EventManager.Instance.OnNavigateAndFindCivitModelRequested(ConnectedModel.ModelId);
+    }
+
     [RelayCommand]
     private void OpenOnCivitAi()
     {

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFolder.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
@@ -660,12 +659,10 @@ public void Index()
         SubFoldersCache.EditDiff(updatedFolders, (a, b) => a.Title == b.Title);
 
         // Index files
+        var files = GetCheckpointFiles();
+
         Dispatcher.UIThread.Post(
-            () =>
-            {
-                var files = GetCheckpointFiles();
-                checkpointFilesCache.EditDiff(files, CheckpointFile.FilePathComparer);
-            },
+            () => checkpointFilesCache.EditDiff(files, CheckpointFile.FilePathComparer),
             DispatcherPriority.Background
         );
     }

StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs

@@ -4,7 +4,6 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Controls.Notifications;
@@ -153,7 +152,6 @@ ModelFinder modelFinder
     public override void OnLoaded()
     {
         base.OnLoaded();
-
         var sw = Stopwatch.StartNew();
 
         // Set UI states
@@ -173,7 +171,6 @@ public override void OnLoaded()
 
         IsLoading = CheckpointFolders.Count == 0;
         IsIndexing = CheckpointFolders.Count > 0;
-        // GetStuff();
         IndexFolders();
         IsLoading = false;
         IsIndexing = false;

StabilityMatrix.Avalonia/ViewModels/MainWindowViewModel.cs

@@ -3,15 +3,13 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using System.Reactive.Linq;
 using System.Threading.Tasks;
 using AsyncAwaitBestPractices;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using FluentAvalonia.UI.Controls;
-using KGySoft.CoreLibraries;
 using NLog;
 using StabilityMatrix.Avalonia.Controls;
 using StabilityMatrix.Avalonia.Services;

StabilityMatrix.Avalonia/Views/CheckpointBrowserPage.axaml

@@ -14,5 +14,6 @@
                           x:DataType="viewModels:CheckpointBrowserViewModel"
                           mc:Ignorable="d"
                           x:Class="StabilityMatrix.Avalonia.Views.CheckpointBrowserPage">
-        <TabControl ItemsSource="{Binding Pages}"/>
+        <TabControl ItemsSource="{Binding Pages}"
+                    SelectedItem="{Binding SelectedPage}"/>
 </controls:UserControlBase>