Merge pull request #1138 from ionite34/fixes-updates-and-mega-chagenlog

Fixed output browser refresh not loading new categories, streamlined …

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,75 @@ 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
+### Added
+- Added new package - [AI Toolkit](https://github.com/ostris/ai-toolkit/)
+- Added new package - [FramePack](https://github.com/lllyasviel/FramePack)
+- Added new package - [FramePack Studio](https://github.com/colinurbs/FramePack-Studio)
+- Added Python Version selector for all new package installs
+- Added the ability to rename packages
+- Added support for authenticated model downloads in the HuggingFace model browser. Visit Settings → Accounts to add your HuggingFace token.
+- Added support for dragging-and-dropping Civitai-generated images into Inference to load metadata
+- Added the ability to search by pasting an entire Civitai model URL into the search bar in the Civitai model browser
+- Added "Clear Pip Cache" and "Clear uv Cache" commands to the Settings -> Embedded Python section
+- 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
+- Added setting for Inference dimension step change - the value the dimensions increase or decrease by when using the step buttons or scroll wheel in Inference
+- Added "Install Nunchaku" option to the ComfyUI Package Commands menu
+- 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 Manual Install button for installing Package extensions that aren't in the indexes
+- Added Next and Previous buttons to the Civitai details page to navigate between results
+- Added Negative Rejection Steering (NRS) by @reithan to Inference
+- Added Wan 2.2 models to the HuggingFace tab of the model browser
+- Added Tiled Encode/Decode options to FaceDetailer in Inference
+- Added Ukrainian translation thanks to @r0ddty!
+- Added Czech translation thanks to @PEKArt!
+### Changed
+🌟 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!
+----
+- Updated all Python version management, virtual environment creation, and pip installs to use `uv` for improved reliability, compatibility, and speed
+- You can now select release versions when installing ComfyUI
+- You can no longer select branches when installing InvokeAI
+- Updated InvokeAI install to use the intended install method (resolves [#1329](https://github.com/LykosAI/StabilityMatrix/issues/1329))
+- Updated ComfyUI installs for AMD users on Linux to use the latest rocm6.3 torch index
+- Updated ComfyUI-Zluda installs to use the newer install-n method (fixes [#1347](https://github.com/LykosAI/StabilityMatrix/issues/1347))
+- Removed disclaimer from reForge since the author is now active again
+- Updated git operations to better avoid conflicts
+- Updated Japanese translation
+- Civitai model browser image loading now uses dynamic resizing for better performance and a smoother scrolling experience
+- 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
+- New installs of ComfyUI, SD.Next, and InvokeAI will now use Python 3.12, unless otherwise specified in the Advanced Options during installation
+- New installs of all other packages will now use Python 3.10.18, unless otherwise specified in the Advanced Options during installation
+- Updated ComfyUI installs for AMD users on Linux to use the latest rocm6.4 torch index
+- Updated package delete confirmation dialog
+### Fixed
+- Fixed an error when packages and other processes exit before process tracking on windows can initialize
+- Fixed "none" appearing in wildcard field when using Face Detailer in Inference
+- Fixed [#1254](https://github.com/LykosAI/StabilityMatrix/issues/1254) - Unable to scroll samplers in Inference
+- Fixed [#1294](https://github.com/LykosAI/StabilityMatrix/issues/1294) - Improper sorting of output folders in Output Browser
+- Fixed [#1300](https://github.com/LykosAI/StabilityMatrix/issues/1300) - Git errors when installing Extension Packs
+- Fixed [#1317](https://github.com/LykosAI/StabilityMatrix/issues/1317) - Inference missing GGUF text encoders
+- Fixed [#1324](https://github.com/LykosAI/StabilityMatrix/issues/1324) - Window height slightly increasing every launch
+- Fixed [#1357](https://github.com/LykosAI/StabilityMatrix/issues/1357) - Case insensitivity causing duplicate key exceptions on non-Windows systems
+- Fixed [#1360](https://github.com/LykosAI/StabilityMatrix/issues/1360) - A1111 install not using correct torch for 5000-series GPUs
+- Fixed [#1361](https://github.com/LykosAI/StabilityMatrix/issues/1361) - numpy and other Forge startup
+- Fixed [#1365](https://github.com/LykosAI/StabilityMatrix/issues/1365) - Output folder list not updating when Refresh button clicked
+### Supporters
+#### 🌟 Visionaries
+To our incredible Visionaries, the architects of our ambition: Your profound support is the powerhouse behind this massive v2.15.0 release. You don't just light the path; you fuel the entire journey, allowing us to build bigger, move faster, and turn bold ideas into reality. Our deepest gratitude to: **Waterclouds**, **Corey T**, **bluepopsicle**, **Bob S**, **Ibixat**, **whudunit**, and **TheTekknician**! We are immensely grateful for your trust and partnership in shaping the future of Stability Matrix. Thank you for everything!
+#### 🚀 Pioneers
+A heartfelt salute to our trailblazing Pioneers! Your consistent support helps us navigate the development landscape, ensuring we stay on the right track and can explore new frontiers. A huge thanks to: **tankfox**, **Mr. Unknown**, **Szir777**, **Tigon**, **Noah M**, **USATechDude**, **Thom**, **SeraphOfSalem**, and a special welcome to our newest Pioneers - **Desert Viber**, **Tundra Everquill**, **Adam**, and **Droolguy**! Thank you for being the vanguard of our community!
+ 
 ## v2.15.0-pre.2
 ### Added
 - Added new package - [AI Toolkit](https://github.com/ostris/ai-toolkit/)

StabilityMatrix.Avalonia/Models/TreeViewDirectory.cs

@@ -8,4 +8,7 @@ public partial class TreeViewDirectory : ObservableObject
     public ObservableCollection<TreeViewDirectory> SubDirectories { get; set; } = new();
     public required string Name { get; set; }
     public required string Path { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsExpanded { get; set; }
 }

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitDetailsPageViewModel.cs

@@ -916,6 +916,9 @@ modelType is CivitModelType.Checkpoint
                 baseModelType == CivitBaseModelType.Flux1D.GetStringValue()
                 || baseModelType == CivitBaseModelType.Flux1S.GetStringValue()
                 || baseModelType == CivitBaseModelType.WanVideo.GetStringValue()
+                || baseModelType?.StartsWith("Wan", StringComparison.OrdinalIgnoreCase) is true
+                || baseModelType?.StartsWith("Flux", StringComparison.OrdinalIgnoreCase) is true
+                || baseModelType?.StartsWith("Hunyuan", StringComparison.OrdinalIgnoreCase) is true
             )
         )
         {

StabilityMatrix.Avalonia/ViewModels/OutputsPageViewModel.cs

@@ -656,7 +656,8 @@ private void RefreshCategories()
             .Select(packageFactory.GetPackagePair)
             .WhereNotNull()
             .Where(p =>
-                p.BasePackage.SharedOutputFolders is { Count: > 0 } && p.InstalledPackage.FullPath != null
+                p.BasePackage.SharedOutputFolders is { Count: > 0 }
+                && p.InstalledPackage is { FullPath: not null }
             )
             .Select(pair => new TreeViewDirectory
             {
@@ -679,9 +680,15 @@ private void RefreshCategories()
             }
         );
 
-        categoriesCache.EditDiff(packageCategories, (a, b) => a.Path == b.Path);
+        categoriesCache.Edit(updater => updater.Load(packageCategories));
 
-        SelectedCategory = previouslySelectedCategory ?? Categories.First();
+        if (!string.IsNullOrWhiteSpace(previouslySelectedCategory?.Path))
+        {
+            FindAndExpandPathToCategory(Categories, previouslySelectedCategory.Path);
+        }
+
+        SelectedCategory =
+            FindCategoryByPath(Categories, previouslySelectedCategory?.Path) ?? Categories.FirstOrDefault();
     }
 
     private ObservableCollection<TreeViewDirectory> GetSubfolders(string strPath)
@@ -713,4 +720,75 @@ private ObservableCollection<TreeViewDirectory> GetSubfolders(string strPath)
 
         return subfolders;
     }
+
+    private TreeViewDirectory? FindCategoryByPath(IEnumerable<TreeViewDirectory> nodes, string? path)
+    {
+        // Can't find a category if the path is null or empty
+        if (string.IsNullOrEmpty(path))
+        {
+            return null;
+        }
+
+        foreach (var node in nodes)
+        {
+            // Check if the current node is the one we're looking for
+            if (node.Path == path)
+            {
+                return node;
+            }
+
+            if (node.SubDirectories is not { Count: > 0 })
+                continue;
+
+            // If not, and if this node has children, search within its children
+            var foundInChildren = FindCategoryByPath(node.SubDirectories, path);
+            if (foundInChildren != null)
+            {
+                // Found it in a sub-directory, so return it up the call stack
+                return foundInChildren;
+            }
+        }
+
+        // If we've searched all nodes at this level and their children without success
+        return null;
+    }
+
+    /// <summary>
+    /// Recursively searches for a category by its path and expands all parent nodes along the way.
+    /// </summary>
+    /// <param name="nodes">The collection of nodes to search within.</param>
+    /// <param name="targetPath">The path of the node to find.</param>
+    /// <returns>True if the target node was found in this branch; otherwise, false.</returns>
+    private bool FindAndExpandPathToCategory(IEnumerable<TreeViewDirectory> nodes, string? targetPath)
+    {
+        if (string.IsNullOrEmpty(targetPath))
+        {
+            return false;
+        }
+
+        foreach (var node in nodes)
+        {
+            // First, check if the target is a direct descendant of this node.
+            // This is the recursive part.
+            if (
+                node.SubDirectories is { Count: > 0 }
+                && FindAndExpandPathToCategory(node.SubDirectories, targetPath)
+            )
+            {
+                // If the recursive call returns true, it means the target was found
+                // in this node's children. Therefore, this node is an ancestor and
+                // must be expanded.
+                node.IsExpanded = true;
+                return true; // Bubble "true" up to the parent.
+            }
+
+            // After checking children, check if the current node itself is the target.
+            if (node.Path == targetPath)
+            {
+                return true; // Found it. Start the "bubble up" of true values.
+            }
+        }
+
+        return false; // Target was not found in this collection of nodes.
+    }
 }

StabilityMatrix.Avalonia/Views/OutputsPage.axaml

@@ -10,6 +10,7 @@
     xmlns:lang="clr-namespace:StabilityMatrix.Avalonia.Languages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mocks="clr-namespace:StabilityMatrix.Avalonia.DesignData"
+    xmlns:models="clr-namespace:StabilityMatrix.Avalonia.Models"
     xmlns:outputsPage="clr-namespace:StabilityMatrix.Avalonia.ViewModels.OutputsPage"
     xmlns:scroll="clr-namespace:StabilityMatrix.Avalonia.Controls.Scroll"
     xmlns:selectableImageCard="clr-namespace:StabilityMatrix.Avalonia.Controls.SelectableImageCard"
@@ -48,7 +49,16 @@
             Margin="0,0,12,0"
             IsVisible="{Binding ShowFolders}"
             ItemsSource="{Binding Categories}"
-            SelectedItem="{Binding SelectedCategory}">
+            SelectedItem="{Binding SelectedCategory}"
+            SelectionMode="AlwaysSelected">
+            <TreeView.ItemContainerTheme>
+                <ControlTheme
+                    x:DataType="models:TreeViewDirectory"
+                    BasedOn="{StaticResource {x:Type TreeViewItem}}"
+                    TargetType="TreeViewItem">
+                    <Setter Property="IsExpanded" Value="{Binding IsExpanded}" />
+                </ControlTheme>
+            </TreeView.ItemContainerTheme>
             <TreeView.ItemTemplate>
                 <TreeDataTemplate ItemsSource="{Binding SubDirectories}">
                     <TextBlock

StabilityMatrix.Core/Helper/ProcessTracker.cs

@@ -199,7 +199,7 @@ public JobObject(string name)
 
             Name = name;
 
-            handle = CreateJobObjectA(IntPtr.Zero, name);
+            handle = CreateJobObject(IntPtr.Zero, name);
 
             var info = new JOBOBJECT_BASIC_LIMIT_INFORMATION
             {
@@ -271,10 +271,15 @@ protected override bool ReleaseHandle()
         }
     }
 
-    [LibraryImport("kernel32.dll", StringMarshalling = StringMarshalling.Utf16)]
-    private static partial IntPtr CreateJobObjectA(IntPtr lpJobAttributes, string name);
+    [LibraryImport(
+        "kernel32.dll",
+        EntryPoint = "CreateJobObjectW",
+        SetLastError = true,
+        StringMarshalling = StringMarshalling.Utf16
+    )]
+    private static partial IntPtr CreateJobObject(IntPtr lpJobAttributes, string name);
 
-    [LibraryImport("kernel32.dll")]
+    [LibraryImport("kernel32.dll", SetLastError = true)]
     [return: MarshalAs(UnmanagedType.Bool)]
     private static partial bool SetInformationJobObject(
         IntPtr job,

StabilityMatrix.Core/Models/Packages/A3WebUI.cs

@@ -204,77 +204,51 @@ public override async Task InstallPackage(
     )
     {
         progress?.Report(new ProgressReport(-1f, "Setting up venv", isIndeterminate: true));
-
         await using var venvRunner = await SetupVenvPure(
                 installLocation,
                 pythonVersion: options.PythonOptions.PythonVersion
             )
             .ConfigureAwait(false);
 
-        await venvRunner.PipInstall("--upgrade pip wheel", onConsoleOutput).ConfigureAwait(false);
-
-        progress?.Report(new ProgressReport(-1f, "Installing requirements...", isIndeterminate: true));
-
-        var torchVersion = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
+        var torchIndex = options.PythonOptions.TorchIndex ?? GetRecommendedTorchVersion();
         var isBlackwell =
-            torchVersion is TorchIndex.Cuda
+            torchIndex is TorchIndex.Cuda
             && (SettingsManager.Settings.PreferredGpu?.IsBlackwellGpu() ?? HardwareHelper.HasBlackwellGpu());
 
-        var requirements = new FilePath(installLocation, "requirements_versions.txt");
-        var pipArgs = torchVersion switch
+        // 1. Configure the entire install process declaratively.
+        var config = new PipInstallConfig
         {
-            TorchIndex.Mps => new PipInstallArgs().WithTorch("==2.3.1").WithTorchVision("==0.18.1"),
-            _ => new PipInstallArgs()
-                .WithTorch(isBlackwell ? string.Empty : "==2.1.2")
-                .WithTorchVision(isBlackwell ? string.Empty : "==0.16.2")
-                .WithTorchExtraIndex(
-                    torchVersion switch
-                    {
-                        TorchIndex.Cpu => "cpu",
-                        TorchIndex.Cuda when isBlackwell => "cu128",
-                        TorchIndex.Cuda => "cu121",
-                        TorchIndex.Rocm => "rocm5.6",
-                        TorchIndex.Mps => "cpu",
-                        _ => throw new NotSupportedException($"Unsupported torch version: {torchVersion}"),
-                    }
-                ),
+            RequirementsFilePaths = ["requirements_versions.txt"],
+            TorchVersion = torchIndex == TorchIndex.Mps ? "==2.3.1" : (isBlackwell ? "" : "==2.1.2"),
+            TorchvisionVersion = torchIndex == TorchIndex.Mps ? "==0.18.1" : (isBlackwell ? "" : "==0.16.2"),
+            XformersVersion = isBlackwell ? " " : "==0.0.23.post1",
+            CudaIndex = isBlackwell ? "cu128" : "cu121",
+            RocmIndex = "rocm5.6",
+            ExtraPipArgs =
+            [
+                "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip",
+            ],
         };
 
-        if (torchVersion == TorchIndex.Cuda)
-        {
-            pipArgs = pipArgs.WithXFormers("==0.0.23.post1");
-        }
-
-        if (installedPackage.PipOverrides != null)
-        {
-            pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
-        }
-
-        await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
-
-        pipArgs = new PipInstallArgs(
-            "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip"
-        ).WithParsedFromRequirementsTxt(
-            await requirements.ReadAllTextAsync(cancellationToken).ConfigureAwait(false),
-            excludePattern: "torch"
-        );
-
-        if (installedPackage.PipOverrides != null)
-        {
-            pipArgs = pipArgs.WithUserOverrides(installedPackage.PipOverrides);
-        }
-
-        await venvRunner.PipInstall(pipArgs, onConsoleOutput).ConfigureAwait(false);
+        // 2. Execute the standardized installation process.
+        await StandardPipInstallProcessAsync(
+                venvRunner,
+                options,
+                installedPackage,
+                config,
+                onConsoleOutput,
+                progress,
+                cancellationToken
+            )
+            .ConfigureAwait(false);
 
+        // 3. Perform any final, package-specific tasks.
         progress?.Report(new ProgressReport(-1f, "Updating configuration", isIndeterminate: true));
-
-        // Create and add {"show_progress_type": "TAESD"} to config.json
-        // Only add if the file doesn't exist
         var configPath = Path.Combine(installLocation, "config.json");
         if (!File.Exists(configPath))
         {
-            var config = new JsonObject { { "show_progress_type", "TAESD" } };
-            await File.WriteAllTextAsync(configPath, config.ToString(), cancellationToken)
+            var configJson = new JsonObject { { "show_progress_type", "TAESD" } };
+            await File.WriteAllTextAsync(configPath, configJson.ToString(), cancellationToken)
                 .ConfigureAwait(false);
         }