From 747ed8c901d65dcafcaaa246c77e7ed193545542 Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 26 Jun 2023 18:24:45 -0400
Subject: [PATCH 1/8] Add unknown model type handling

---
 .../Json/DefaultUnknownEnumConverter.cs       | 41 +++++++++++++++++++
 StabilityMatrix/Models/Api/CivitModelType.cs  |  4 +-
 .../ViewModels/CheckpointBrowserViewModel.cs  | 13 +++++-
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 StabilityMatrix/Converters/Json/DefaultUnknownEnumConverter.cs

diff --git a/StabilityMatrix/Converters/Json/DefaultUnknownEnumConverter.cs b/StabilityMatrix/Converters/Json/DefaultUnknownEnumConverter.cs
new file mode 100644
index 00000000..da44e3ab
--- /dev/null
+++ b/StabilityMatrix/Converters/Json/DefaultUnknownEnumConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using StabilityMatrix.Extensions;
+
+namespace StabilityMatrix.Converters.Json;
+
+public class DefaultUnknownEnumConverter<T> : JsonConverter<T> where T : Enum
+{
+    public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType != JsonTokenType.String) 
+        {
+            throw new JsonException();
+        }
+
+        var enumText = reader.GetString();
+        if (Enum.TryParse(typeof(T), enumText, true, out var result))
+        {
+            return (T) result!;
+        }
+
+        // Unknown value handling
+        if (Enum.TryParse(typeof(T), "Unknown", true, out var unknownResult)) 
+        {
+            return (T) unknownResult!;
+        }
+        
+        throw new JsonException($"Unable to parse '{enumText}' to enum '{typeof(T)}'.");
+    }
+
+    public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+    {
+        if (value == null)
+        {
+            writer.WriteNullValue();
+            return;
+        }
+        writer.WriteStringValue(value.GetStringValue());
+    }
+}
diff --git a/StabilityMatrix/Models/Api/CivitModelType.cs b/StabilityMatrix/Models/Api/CivitModelType.cs
index e397cf23..29c9a169 100644
--- a/StabilityMatrix/Models/Api/CivitModelType.cs
+++ b/StabilityMatrix/Models/Api/CivitModelType.cs
@@ -1,13 +1,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
+using StabilityMatrix.Converters.Json;
 using StabilityMatrix.Extensions;
 
 namespace StabilityMatrix.Models.Api;
 
-[JsonConverter(typeof(JsonStringEnumConverter))]
+[JsonConverter(typeof(DefaultUnknownEnumConverter<CivitModelType>))]
 [SuppressMessage("ReSharper", "InconsistentNaming")]
 public enum CivitModelType
 {
+    Unknown,
     [ConvertTo<SharedFolderType>(SharedFolderType.StableDiffusion)]
     Checkpoint,
     [ConvertTo<SharedFolderType>(SharedFolderType.TextualInversion)]
diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index 56b4ef1c..6fa4d7aa 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -52,7 +52,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
 
     public IEnumerable<CivitModelType> AllModelTypes => Enum.GetValues(typeof(CivitModelType))
         .Cast<CivitModelType>()
-        .Where(t => t != CivitModelType.AestheticGradient && t != CivitModelType.Poses)
+        .Where(t => t == CivitModelType.All || t.ConvertTo<SharedFolderType>() > 0)
         .OrderBy(t => t.ToString());
 
     public CheckpointBrowserViewModel(
@@ -104,6 +104,17 @@ public partial class CheckpointBrowserViewModel : ObservableObject
                 return;
             }
             Logger.Debug("CivitAI Query {Text} returned {Results} results (in {Elapsed:F1} s)", queryText, models.Count, timer.Elapsed.TotalSeconds);
+            
+            var unknown = models.Where(m => m.Type == CivitModelType.Unknown).ToList();
+            if (unknown.Any())
+            {
+                var names = unknown.Select(m => m.Name).ToList();
+                Logger.Warn("Excluded {Unknown} unknown model types: {Models}", unknown.Count, names);
+            }
+            
+            // Filter out unknown model types
+            models = models.Where(m => m.Type.ConvertTo<SharedFolderType>() > 0).ToList();
+            
             // Database update calls will invoke `OnModelsUpdated`
             // Add to database
             await liteDbContext.UpsertCivitModelAsync(models);

From 4833d15f0b922e5ba91472e39d2db4f83304469c Mon Sep 17 00:00:00 2001
From: Ionite <dev@ionite.io>
Date: Mon, 26 Jun 2023 18:55:34 -0400
Subject: [PATCH 2/8] Ensure python installed on check python version

---
 StabilityMatrix/Helper/IPrerequisiteHelper.cs |  3 +++
 StabilityMatrix/Helper/PrerequisiteHelper.cs  |  2 ++
 StabilityMatrix/SettingsPage.xaml             | 23 +++++++++++++++----
 .../ViewModels/SettingsViewModel.cs           | 17 +++++++++++++-
 4 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/StabilityMatrix/Helper/IPrerequisiteHelper.cs b/StabilityMatrix/Helper/IPrerequisiteHelper.cs
index efc40c39..c6a0b0d7 100644
--- a/StabilityMatrix/Helper/IPrerequisiteHelper.cs
+++ b/StabilityMatrix/Helper/IPrerequisiteHelper.cs
@@ -6,10 +6,13 @@ namespace StabilityMatrix.Helper;
 
 public interface IPrerequisiteHelper
 {
+    bool IsPythonInstalled { get; }
+ 
     Task InstallAllIfNecessary(IProgress<ProgressReport>? progress = null);
     Task UnpackResourcesIfNecessary(IProgress<ProgressReport>? progress = null);
     Task InstallGitIfNecessary(IProgress<ProgressReport>? progress = null);
     Task InstallVcRedistIfNecessary(IProgress<ProgressReport>? progress = null);
+    Task InstallPythonIfNecessary(IProgress<ProgressReport>? progress = null);
 
     Task SetupPythonDependencies(string installLocation, string requirementsFileName,
         IProgress<ProgressReport>? progress = null, Action<string?>? onConsoleOutput = null);
diff --git a/StabilityMatrix/Helper/PrerequisiteHelper.cs b/StabilityMatrix/Helper/PrerequisiteHelper.cs
index 1a5ba7a6..c46bd3bd 100644
--- a/StabilityMatrix/Helper/PrerequisiteHelper.cs
+++ b/StabilityMatrix/Helper/PrerequisiteHelper.cs
@@ -43,6 +43,8 @@ public class PrerequisiteHelper : IPrerequisiteHelper
     private static readonly string PortableGitDownloadPath = Path.Combine(HomeDir, "PortableGit.7z.exe");
     private static readonly string GitExePath = Path.Combine(PortableGitInstallDir, "bin", "git.exe");
     public static readonly string GitBinPath = Path.Combine(PortableGitInstallDir, "bin");
+    
+    public bool IsPythonInstalled => File.Exists(PythonDllPath);
 
     public PrerequisiteHelper(ILogger<PrerequisiteHelper> logger, IGitHubClient gitHubClient,
         IDownloadService downloadService, ISettingsManager settingsManager)
diff --git a/StabilityMatrix/SettingsPage.xaml b/StabilityMatrix/SettingsPage.xaml
index fc75fc2f..a8a1ced5 100644
--- a/StabilityMatrix/SettingsPage.xaml
+++ b/StabilityMatrix/SettingsPage.xaml
@@ -133,10 +133,25 @@
                             FontWeight="Bold"
                             Margin="0,8"
                             Text="Embedded Python" />
-                        <Button
-                            Command="{Binding PythonVersionCommand}"
-                            Content="Check Version Info"
-                            Margin="8" />
+                        <StackPanel Orientation="Horizontal">
+                            <ui:Button
+                                Command="{Binding PythonVersionCommand}"
+                                Content="Check Version Info"
+                                Margin="8" />
+                            <!--  Progress for python install if needed  -->
+                            <StackPanel Orientation="Horizontal" Visibility="{Binding IsPythonInstalling, Converter={StaticResource BoolToVisibilityConverter}, FallbackValue=Collapsed}">
+                                <ui:ProgressRing
+                                    Height="24"
+                                    IsEnabled="{Binding IsPythonInstalling}"
+                                    IsIndeterminate="True"
+                                    Margin="8"
+                                    Width="24" />
+                                <TextBlock
+                                    Margin="4"
+                                    Text="Preparing Environment"
+                                    VerticalAlignment="Center" />
+                            </StackPanel>
+                        </StackPanel>
                     </StackPanel>
                 </ui:Card>
 
diff --git a/StabilityMatrix/ViewModels/SettingsViewModel.cs b/StabilityMatrix/ViewModels/SettingsViewModel.cs
index b1fa4c1e..e7671cba 100644
--- a/StabilityMatrix/ViewModels/SettingsViewModel.cs
+++ b/StabilityMatrix/ViewModels/SettingsViewModel.cs
@@ -41,6 +41,7 @@ public partial class SettingsViewModel : ObservableObject
     private readonly IPyRunner pyRunner;
     private readonly ISnackbarService snackbarService;
     private readonly ILiteDbContext liteDbContext;
+    private readonly IPrerequisiteHelper prerequisiteHelper;
     private static string LicensesPath => "pack://application:,,,/Assets/licenses.json";
     public TextToFlowDocumentConverter? TextToFlowDocumentConverter { get; set; }
 
@@ -62,6 +63,8 @@ public partial class SettingsViewModel : ObservableObject
     [ObservableProperty] private bool isFileSearchFlyoutOpen;
     [ObservableProperty] private double fileSearchProgress;
 
+    [ObservableProperty] private bool isPythonInstalling;
+
     [ObservableProperty] private string? webApiHost;
     [ObservableProperty] private string? webApiPort;
     [ObservableProperty] private string? webApiActivePackageHost;
@@ -94,7 +97,8 @@ public partial class SettingsViewModel : ObservableObject
         ISnackbarService snackbarService, 
         ILogger<SettingsViewModel> logger, 
         IPackageFactory packageFactory,
-        ILiteDbContext liteDbContext)
+        ILiteDbContext liteDbContext,
+        IPrerequisiteHelper prerequisiteHelper)
     {
         this.logger = logger;
         this.settingsManager = settingsManager;
@@ -104,6 +108,7 @@ public partial class SettingsViewModel : ObservableObject
         this.a3WebApiManager = a3WebApiManager;
         this.pyRunner = pyRunner;
         this.liteDbContext = liteDbContext;
+        this.prerequisiteHelper = prerequisiteHelper;
         SelectedTheme = settingsManager.Settings.Theme ?? "Dark";
         WindowBackdropType = settingsManager.Settings.WindowBackdropType ?? WindowBackdropType.Mica;
     }
@@ -169,6 +174,16 @@ public partial class SettingsViewModel : ObservableObject
 
     public AsyncRelayCommand PythonVersionCommand => new(async () =>
     {
+        // Ensure python installed
+        if (!prerequisiteHelper.IsPythonInstalled)
+        {
+            IsPythonInstalling = true;
+            // Need 7z as well for site packages repack
+            await prerequisiteHelper.UnpackResourcesIfNecessary();
+            await prerequisiteHelper.InstallPythonIfNecessary();
+            IsPythonInstalling = false;
+        }
+
         // Get python version
         await pyRunner.Initialize();
         var result = await pyRunner.GetVersionInfo();

From 3a31f6347a1509cb5d51175b939e7bd3897037bd Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 17:07:08 -0700
Subject: [PATCH 3/8] Some bug fixes & model browser changes - Try to throw
 less Owner errors if mainWindow isn't active - Show "no results found" in
 model browser if that's the case - Reset page number when searching new query
 - Model browser now searches by tags for more results

---
 StabilityMatrix/App.xaml.cs                   |  9 +++--
 StabilityMatrix/CheckpointBrowserPage.xaml    |  9 +++++
 .../ViewModels/CheckpointBrowserViewModel.cs  | 40 ++++++++++++++-----
 3 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/StabilityMatrix/App.xaml.cs b/StabilityMatrix/App.xaml.cs
index 99c318a4..c02ba56b 100644
--- a/StabilityMatrix/App.xaml.cs
+++ b/StabilityMatrix/App.xaml.cs
@@ -18,7 +18,6 @@ using Microsoft.Extensions.Logging;
 using NLog;
 using NLog.Config;
 using NLog.Extensions.Logging;
-using NLog.Layouts;
 using NLog.Targets;
 using Octokit;
 using Polly;
@@ -334,9 +333,13 @@ namespace StabilityMatrix
                 };
                 var exceptionWindow = new ExceptionWindow
                 {
-                    DataContext = vm,
-                    Owner = MainWindow
+                    DataContext = vm
                 };
+
+                if (MainWindow?.IsActive ?? false)
+                {
+                    exceptionWindow.Owner = MainWindow;
+                }
                 exceptionWindow.ShowDialog();
             }
             e.Handled = true;
diff --git a/StabilityMatrix/CheckpointBrowserPage.xaml b/StabilityMatrix/CheckpointBrowserPage.xaml
index cd6513d2..0ff791db 100644
--- a/StabilityMatrix/CheckpointBrowserPage.xaml
+++ b/StabilityMatrix/CheckpointBrowserPage.xaml
@@ -238,6 +238,15 @@
             </StackPanel>
         </StackPanel>
 
+        <TextBlock
+            Grid.Row="0"
+            Grid.RowSpan="3"
+            FontSize="20"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Text="No results found"
+            Visibility="{Binding NoResultsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
+        
         <ui:ProgressRing
             Grid.Row="0"
             Grid.RowSpan="3"
diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index 6fa4d7aa..9803939e 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -46,6 +46,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     [ObservableProperty] private bool canGoToNextPage;
     [ObservableProperty] private bool canGoToPreviousPage;
     [ObservableProperty] private bool isIndeterminate;
+    [ObservableProperty] private bool noResultsFound;
     
     public IEnumerable<CivitPeriod> AllCivitPeriods => Enum.GetValues(typeof(CivitPeriod)).Cast<CivitPeriod>();
     public IEnumerable<CivitSortMode> AllSortModes => Enum.GetValues(typeof(CivitSortMode)).Cast<CivitSortMode>();
@@ -100,21 +101,25 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             var models = modelsResponse.Items;
             if (models is null)
             {
-                Logger.Debug("CivitAI Query {Text} returned no results (in {Elapsed:F1} s)", queryText, timer.Elapsed.TotalSeconds);
+                Logger.Debug("CivitAI Query {Text} returned no results (in {Elapsed:F1} s)",
+                    queryText, timer.Elapsed.TotalSeconds);
                 return;
             }
-            Logger.Debug("CivitAI Query {Text} returned {Results} results (in {Elapsed:F1} s)", queryText, models.Count, timer.Elapsed.TotalSeconds);
-            
+
+            Logger.Debug("CivitAI Query {Text} returned {Results} results (in {Elapsed:F1} s)",
+                queryText, models.Count, timer.Elapsed.TotalSeconds);
+
             var unknown = models.Where(m => m.Type == CivitModelType.Unknown).ToList();
             if (unknown.Any())
             {
                 var names = unknown.Select(m => m.Name).ToList();
-                Logger.Warn("Excluded {Unknown} unknown model types: {Models}", unknown.Count, names);
+                Logger.Warn("Excluded {Unknown} unknown model types: {Models}", unknown.Count,
+                    names);
             }
-            
+
             // Filter out unknown model types
             models = models.Where(m => m.Type.ConvertTo<SharedFolderType>() > 0).ToList();
-            
+
             // Database update calls will invoke `OnModelsUpdated`
             // Add to database
             await liteDbContext.UpsertCivitModelAsync(models);
@@ -127,7 +132,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
                 Items = models,
                 Metadata = modelsResponse.Metadata
             });
-            
+
             if (cacheNew)
             {
                 Logger.Debug("New cache entry, updating model cards");
@@ -137,6 +142,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             {
                 Logger.Debug("Cache entry already exists, not updating model cards");
             }
+            NoResultsFound = !models.Any();
         }
         catch (ApiException e)
         {
@@ -144,6 +150,10 @@ public partial class CheckpointBrowserViewModel : ObservableObject
                 "CivitAI can't be reached right now").SafeFireAndForget();
             Logger.Log(LogLevel.Error, e);
         }
+        finally
+        {
+            ShowMainLoadingSpinner = false;
+        }
     }
     
     /// <summary>
@@ -154,6 +164,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
         if (models is null)
         {
             ModelCards?.Clear();
+            NoResultsFound = true;
         }
         else
         {
@@ -161,6 +172,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
                 .Select(model => new CheckpointBrowserCardViewModel(model, 
                     downloadService, snackbarService, settingsManager));
             ModelCards = new ObservableCollection<CheckpointBrowserCardViewModel>(updateCards);
+            NoResultsFound = false;
         }
         TotalPages = metadata?.TotalPages ?? 1;
         CanGoToPreviousPage = CurrentPageNumber > 1;
@@ -171,22 +183,30 @@ public partial class CheckpointBrowserViewModel : ObservableObject
         HasSearched = true;
     }
 
+    private string previousSearchQuery = string.Empty;
+
     [RelayCommand]
     private async Task SearchModels()
     {
         if (string.IsNullOrWhiteSpace(SearchQuery)) return;
-        
         var timer = Stopwatch.StartNew();
-
+        
+        if (SearchQuery != previousSearchQuery)
+        {
+            // Reset page number
+            CurrentPageNumber = 1;
+            previousSearchQuery = SearchQuery;
+        }
+        
         // Build request
         var modelRequest = new CivitModelsRequest
         {
-            Query = SearchQuery,
             Limit = MaxModelsPerPage,
             Nsfw = "true", // Handled by local view filter
             Sort = SortMode,
             Period = SelectedPeriod,
             Page = CurrentPageNumber,
+            Tag = SearchQuery
         };
         
         if (SelectedModelType != CivitModelType.All)

From 8768471034c599c7957d2183784fe5e19af2c105 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 17:47:02 -0700
Subject: [PATCH 4/8] Hardcode git download url

---
 StabilityMatrix/Helper/PrerequisiteHelper.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/StabilityMatrix/Helper/PrerequisiteHelper.cs b/StabilityMatrix/Helper/PrerequisiteHelper.cs
index c46bd3bd..74cf1749 100644
--- a/StabilityMatrix/Helper/PrerequisiteHelper.cs
+++ b/StabilityMatrix/Helper/PrerequisiteHelper.cs
@@ -212,9 +212,8 @@ public class PrerequisiteHelper : IPrerequisiteHelper
         
         logger.LogInformation($"Git not found at {GitExePath}, downloading...");
 
-        var latestRelease = await gitHubClient.Repository.Release.GetLatest("git-for-windows", "git");
-        var portableGitUrl = latestRelease.Assets
-            .First(a => a.Name.EndsWith("64-bit.7z.exe")).BrowserDownloadUrl;
+        var portableGitUrl =
+            "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-64-bit.7z.exe";
 
         if (!File.Exists(PortableGitDownloadPath))
         {

From 6368d867da1738874aad220b90a62c928b91ed34 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 18:20:56 -0700
Subject: [PATCH 5/8] Search Improvements: - show "No SFW results found" if you
 don't have NSFW mode on & there are no results - ability to search by tag &
 username as well as query

---
 StabilityMatrix/CheckpointBrowserPage.xaml    |  4 +-
 .../ViewModels/CheckpointBrowserViewModel.cs  | 39 ++++++++++++++-----
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/StabilityMatrix/CheckpointBrowserPage.xaml b/StabilityMatrix/CheckpointBrowserPage.xaml
index 0ff791db..3a784e6e 100644
--- a/StabilityMatrix/CheckpointBrowserPage.xaml
+++ b/StabilityMatrix/CheckpointBrowserPage.xaml
@@ -139,7 +139,7 @@
                 <ui:TextBox
                     HorizontalAlignment="Stretch"
                     Margin="8,0,0,0"
-                    PlaceholderText="Query"
+                    PlaceholderText="Search models, #tags, or @users"
                     Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                 <ui:Button
@@ -244,7 +244,7 @@
             FontSize="20"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Text="No results found"
+            Text="{Binding NoResultsText, FallbackValue=No results found}"
             Visibility="{Binding NoResultsFound, Converter={StaticResource BoolToVisibilityConverter}}" />
         
         <ui:ProgressRing
diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index 9803939e..367ca07d 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -47,6 +47,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     [ObservableProperty] private bool canGoToPreviousPage;
     [ObservableProperty] private bool isIndeterminate;
     [ObservableProperty] private bool noResultsFound;
+    [ObservableProperty] private string noResultsText;
     
     public IEnumerable<CivitPeriod> AllCivitPeriods => Enum.GetValues(typeof(CivitPeriod)).Cast<CivitPeriod>();
     public IEnumerable<CivitSortMode> AllSortModes => Enum.GetValues(typeof(CivitSortMode)).Cast<CivitSortMode>();
@@ -142,7 +143,6 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             {
                 Logger.Debug("Cache entry already exists, not updating model cards");
             }
-            NoResultsFound = !models.Any();
         }
         catch (ApiException e)
         {
@@ -153,6 +153,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
         finally
         {
             ShowMainLoadingSpinner = false;
+            UpdateResultsText();
         }
     }
     
@@ -164,7 +165,6 @@ public partial class CheckpointBrowserViewModel : ObservableObject
         if (models is null)
         {
             ModelCards?.Clear();
-            NoResultsFound = true;
         }
         else
         {
@@ -172,7 +172,6 @@ public partial class CheckpointBrowserViewModel : ObservableObject
                 .Select(model => new CheckpointBrowserCardViewModel(model, 
                     downloadService, snackbarService, settingsManager));
             ModelCards = new ObservableCollection<CheckpointBrowserCardViewModel>(updateCards);
-            NoResultsFound = false;
         }
         TotalPages = metadata?.TotalPages ?? 1;
         CanGoToPreviousPage = CurrentPageNumber > 1;
@@ -206,8 +205,20 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             Sort = SortMode,
             Period = SelectedPeriod,
             Page = CurrentPageNumber,
-            Tag = SearchQuery
         };
+
+        if (SearchQuery.StartsWith("#"))
+        {
+            modelRequest.Tag = SearchQuery[1..];
+        }
+        else if (SearchQuery.StartsWith("@"))
+        {
+            modelRequest.Username = SearchQuery[1..];
+        }
+        else
+        {
+            modelRequest.Query = SearchQuery;
+        }
         
         if (SelectedModelType != CivitModelType.All)
         {
@@ -220,7 +231,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             .FindByIdAsync(ObjectHash.GetMd5Guid(modelRequest));
         
         // If cached, update model cards
-        if (cachedQuery?.Items is not null && cachedQuery.Items.Any())
+        if (cachedQuery is not null)
         {
             var elapsed = timer.Elapsed;
             Logger.Debug("Using cached query for {Text} [{RequestHash}] (in {Elapsed:F1} s)", 
@@ -230,14 +241,13 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             // Start remote query (background mode)
             // Skip when last query was less than 2 min ago
             var timeSinceCache = DateTimeOffset.UtcNow - cachedQuery.InsertedAt;
-            if (timeSinceCache?.TotalMinutes < 2)
+            if (timeSinceCache?.TotalMinutes >= 2)
             {
-                Logger.Debug("Cached query was less than 2 minutes ago ({Seconds:F0} s), skipping remote query",
+                CivitModelQuery(modelRequest).SafeFireAndForget();
+                Logger.Debug(
+                    "Cached query was more than 2 minutes ago ({Seconds:F0} s), updating cache with remote query",
                     timeSinceCache.Value.TotalSeconds);
-                return;
             }
-            
-            CivitModelQuery(modelRequest).SafeFireAndForget();
         }
         else
         {
@@ -245,6 +255,8 @@ public partial class CheckpointBrowserViewModel : ObservableObject
             ShowMainLoadingSpinner = true;
             await CivitModelQuery(modelRequest);
         }
+        
+        UpdateResultsText();
     }
 
     [RelayCommand]
@@ -282,6 +294,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     {
         settingsManager.SetModelBrowserNsfwEnabled(value);
         ModelCardsView?.Refresh();
+        UpdateResultsText();
     }
 
     partial void OnSelectedPeriodChanged(CivitPeriod oldValue, CivitPeriod newValue)
@@ -312,4 +325,10 @@ public partial class CheckpointBrowserViewModel : ObservableObject
         // execute command instead of calling method directly so that the IsRunning property gets updated
         await SearchModelsCommand.ExecuteAsync(null);
     }
+
+    private void UpdateResultsText()
+    {
+        NoResultsFound = ModelCardsView?.IsEmpty ?? true;
+        NoResultsText = ShowNsfw ? "No results found" : "No SFW results found";
+    }
 }

From a55e8f5977e55d749677a01af6c1a75aa3fa4bb1 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 18:45:35 -0700
Subject: [PATCH 6/8] Show # of hidden results if any

---
 StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index 367ca07d..92f691b3 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -329,6 +329,8 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     private void UpdateResultsText()
     {
         NoResultsFound = ModelCardsView?.IsEmpty ?? true;
-        NoResultsText = ShowNsfw ? "No results found" : "No SFW results found";
+        NoResultsText = ModelCards?.Count == 0
+            ? "No results found"
+            : $"{ModelCards?.Count} results hidden by filters";
     }
 }

From 667847b72ccffcddea742ce6f7b391dc2b082cd2 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 19:43:35 -0700
Subject: [PATCH 7/8] Fix text display when NSFW mode enabled & you haven't
 searched yet

---
 StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index 92f691b3..c919ea83 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -294,6 +294,10 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     {
         settingsManager.SetModelBrowserNsfwEnabled(value);
         ModelCardsView?.Refresh();
+        
+        if (!HasSearched) 
+            return;
+        
         UpdateResultsText();
     }
 
@@ -329,7 +333,7 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     private void UpdateResultsText()
     {
         NoResultsFound = ModelCardsView?.IsEmpty ?? true;
-        NoResultsText = ModelCards?.Count == 0
+        NoResultsText = ModelCards == null || ModelCards.Count == 0
             ? "No results found"
             : $"{ModelCards?.Count} results hidden by filters";
     }

From c60b9d5e573be5e7ffbe6541ba8ee5d075243762 Mon Sep 17 00:00:00 2001
From: JT <mohnjiles@gmail.com>
Date: Mon, 26 Jun 2023 19:47:31 -0700
Subject: [PATCH 8/8] Update
 StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs

Co-authored-by: Ionite <dev@ionite.io>
---
 StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
index c919ea83..5b7a0591 100644
--- a/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
+++ b/StabilityMatrix/ViewModels/CheckpointBrowserViewModel.cs
@@ -333,8 +333,8 @@ public partial class CheckpointBrowserViewModel : ObservableObject
     private void UpdateResultsText()
     {
         NoResultsFound = ModelCardsView?.IsEmpty ?? true;
-        NoResultsText = ModelCards == null || ModelCards.Count == 0
-            ? "No results found"
-            : $"{ModelCards?.Count} results hidden by filters";
+        NoResultsText = ModelCards?.Count > 0
+            ? $"{ModelCards.Count} results hidden by filters"
+            : "No results found";
     }
 }