Merge pull request LykosAI#1121 from ionite34/fix-litedb-case-sensitivity

Fix litedb case sensitivity

Author: mohnjiles

CHANGELOG.md

@@ -5,7 +5,7 @@ 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.15.0-dev.3
+## v2.15.0-pre.1
 ### Added
 - Added settings to disable base models from appearing in the Checkpoint Manager and Civitai Model Browser base model selectors
 - Added Inference "Favorite Dimensions" quick selector - editable in Settings → Inference, or click the 💾 button inside the dropdown
@@ -14,9 +14,17 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added "Select All" button to the Installed Extensions page
 - Added experimental ROCm pytorch install for ComfyUI (non-Zluda) on Windows - requires a compatible AMD GPU
 - Added base model type labels (SD1.5, SDXL, Flux, etc.) to Inference model selection boxes
+- Added UNET shared folder link for SD.Next
 - Added Ukrainian translation thanks to @r0ddty!
 ### Changed
-- Redesigned Civitai model details page
+🌟 Civitai Model Details: A Grand Reimagining! 🌟
+  - No more peering through a tiny window! Introducing a massive overhaul of the Civitai Model Details page, transforming it from a cramped dialog into a spacious, feature-rich hub for all your model exploration needs.
+  - We've listened to your howls for more, and now you can dive deep into every aspect of your favorite models with unprecedented clarity and control:
+    - Expansive View: The new full-page layout means all essential information, descriptions, and previews are laid out beautifully, banishing the old, restrictive dialog forever.
+    - Rich Details at a Glance: Author, base model, last updated, SHA hashes, file name overrides/patterns – everything you need, perfectly organized and always accessible.
+    - Overhauled Image Viewer: Enjoy a sleek, modern image viewer that includes Civitai metadata and supports zooming, panning, and full-screen viewing. No more squinting at tiny thumbnails!
+    - Integrated Inference Options: For supported models, adjust sampler, scheduler, steps, CFG Scale, width, and height directly from the details page, streamlining your workflow like never before!
+----
 - You can now select release versions when installing ComfyUI
 - You can no longer select branches when installing InvokeAI
 - Updated InvokeAI install to use pinned torch index from release tag
@@ -26,11 +34,17 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Removed disclaimer from reForge since the author is now active again
 - Updated git operations to better avoid conflicts
 - Updated Japanese translation
+- Undo ComfyUI process tracking changes for now due to causing more issues than it solved
+- Updated GPU parsing fallback on Linux systems to use the method provided by @irql-notlessorequal
 ### Fixed
 - Fixed Civitai-generated image parsing in Inference
 - Fixed some first-time setup crashes from missing prerequisites
 - Fixed one-click installer not using default preferred Python version
 - Fixed updating from old installs of InvokeAI using old frontend
+- Fixed [#1357](https://github.com/LykosAI/StabilityMatrix/issues/1357) - Case insensitivity causing duplicate key exceptions on non-Windows systems
+### Supporters
+#### 🌟 Visionaries
+To our brilliant Visionary-tier Patrons: **Waterclouds**, **Corey T**, **bluepopsicle**, **Bob S**, **Ibixat**, and **whudunit** — your support is the spark that keeps Stability Matrix blazing forward. Thanks to you, we can explore bolder features, tackle complex challenges, and keep making the impossible feel effortless. Thank you all so very much! 🚀
 
 ## v2.15.0-dev.2
 ### Added

StabilityMatrix.Core/Database/LiteDbContext.cs

@@ -1,6 +1,9 @@
 using System.Collections.Immutable;
+using System.Globalization;
+using AsyncAwaitBestPractices;
 using LiteDB;
 using LiteDB.Async;
+using LiteDB.Engine;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using StabilityMatrix.Core.Extensions;
@@ -73,8 +76,24 @@ private LiteDatabaseAsync CreateDatabase()
             {
                 var dbPath = Path.Combine(settingsManager.LibraryDir, "StabilityMatrix.db");
                 db = new LiteDatabaseAsync(
-                    new ConnectionString() { Filename = dbPath, Connection = ConnectionType.Shared, }
+                    new ConnectionString { Filename = dbPath, Connection = ConnectionType.Shared }
                 );
+
+                var sortOption = db.Collation.SortOptions;
+                if (sortOption is not CompareOptions.Ordinal)
+                {
+                    logger.LogDebug(
+                        "Database collation is not Ordinal ({SortOption}), rebuilding...",
+                        sortOption
+                    );
+
+                    var options = new RebuildOptions
+                    {
+                        Collation = new Collation(CultureInfo.InvariantCulture.LCID, CompareOptions.Ordinal),
+                    };
+
+                    db.RebuildAsync(options).GetAwaiter().GetResult();
+                }
             }
             catch (IOException e)
             {
@@ -100,11 +119,10 @@ private LiteDatabaseAsync CreateDatabase()
     {
         var version = await CivitModelVersions
             .Query()
-            .Where(
-                mv =>
-                    mv.Files!.Select(f => f.Hashes)
-                        .Select(hashes => hashes.BLAKE3)
-                        .Any(hash => hash == hashBlake3)
+            .Where(mv =>
+                mv.Files!.Select(f => f.Hashes)
+                    .Select(hashes => hashes.BLAKE3)
+                    .Any(hash => hash == hashBlake3)
             )
             .FirstOrDefaultAsync()
             .ConfigureAwait(false);
@@ -201,7 +219,7 @@ public async Task ClearAllCacheCollectionsAsync()
             nameof(CivitModelQueryCache),
             nameof(GithubCache),
             nameof(LocalModelFiles),
-            nameof(LocalImageFiles)
+            nameof(LocalImageFiles),
         };
 
         logger.LogInformation("Clearing all cache collections: [{@Names}]", collectionNames);

StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs

@@ -87,10 +87,10 @@ private static IEnumerable<GpuInfo> IterGpuInfoLinux()
             string? name = null;
 
             // Parse output with regex
-            var match = Regex.Match(gpuOutput, @"VGA compatible controller: ([^\n]*)");
+            var match = Regex.Match(gpuOutput, @"(VGA compatible controller|3D controller): ([^\n]*)");
             if (match.Success)
             {
-                name = match.Groups[1].Value.Trim();
+                name = match.Groups[2].Value.Trim();
             }
 
             match = Regex.Match(gpuOutput, @"prefetchable\) \[size=(\\d+)M\]");

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -469,11 +469,6 @@ await SetupVenv(installLocation, pythonVersion: PyVersion.Parse(installedPackage
             OnExit
         );
 
-        if (Compat.IsWindows)
-        {
-            ProcessTracker.AttachExitHandlerJobToProcess(VenvRunner.Process);
-        }
-
         return;
 
         void HandleConsoleOutput(ProcessOutput s)

StabilityMatrix.Core/Models/Packages/VladAutomatic.cs

@@ -164,6 +164,12 @@ IPyInstallationManager pyInstallationManager
                     TargetRelativePaths = ["models/ControlNet"],
                     ConfigDocumentPaths = ["control_net_models_path"],
                 }, // Combined ControlNet/T2I
+                new SharedFolderLayoutRule
+                {
+                    SourceTypes = [SharedFolderType.DiffusionModels],
+                    TargetRelativePaths = ["models/UNET"],
+                    ConfigDocumentPaths = ["unet_dir"],
+                },
             ],
         };
 
@@ -304,11 +310,15 @@ public override async Task InstallPackage(
             );
         }
 
+        var requirementsContent = await new FilePath(installLocation, "requirements.txt")
+            .ReadAllTextAsync(cancellationToken)
+            .ConfigureAwait(false);
+        var pipArgs = new PipInstallArgs("--upgrade").WithParsedFromRequirementsTxt(requirementsContent);
         if (installedPackage.PipOverrides != null)
         {
-            var pipArgs = new PipInstallArgs().WithUserOverrides(installedPackage.PipOverrides);
-            await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
+            pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
         }
+        await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
 
         var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
         switch (torchVersion)