Merge branch 'main' into backport/main/pr-1193

mohnjiles · web-flow · commit 362f1f910a1c · 2026-01-26T11:12:45.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +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).
 
-<<<<<<< HEAD
-=======
-## v2.16.0-dev.2
+## v2.15.6
 ### Added
 - Added NVIDIA driver version warning when launching ComfyUI with CUDA 13.0 (cu130) and driver versions below 580.x
 - Added legacy Python warning when launching InvokeAI installations using Python 3.10.11
@@ -33,35 +31,6 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed [#1466](https://github.com/LykosAI/StabilityMatrix/issues/1466) - crash after moving portable install
 - Fixed [#1445](https://github.com/LykosAI/StabilityMatrix/issues/1445) - Linux app updates not actually updating - thanks to @NeuralFault!
 
-## v2.16.0-dev.1
-### Added
-#### New Feature: 🧪 Image Lab  - Conversational Image Generation for ComfyUI
-- We've added a brand new conversational interface for image generation! Image Lab lets you iterate on images naturally through chat, rather than just one-off prompts.
-  - Local-First Power: Native support for Flux Kontext and Qwen Image Edit running entirely locally via your ComfyUI backend.
-  - Smart Setup: Stability Matrix automatically detects and helps you download the specific models and LoRAs needed for these local workflows.
-  - Interactive Tools: Drag-and-drop image inputs, use the built-in annotation tool to draw on images, and keep persistent conversation history.
-  - Cloud Option: Includes optional support for Nano Banana (Gemini 3 Pro/2.5) for users who want to leverage external reasoning models.
-- Added new package - [Wan2GP](https://github.com/deepbeepmeep/Wan2GP)
-- Added [Stable Diffusion WebUI Forge - Neo](https://github.com/Haoming02/sd-webui-forge-classic/tree/neo) as a separate package for convenience
-- Added Intel GPU support for ComfyUI
-- Added "Run Python Command" option to the package card's 3-dots menu for running arbitrary Python code in the package's virtual environment
-- Added togglable `--uv` argument to the SD.Next launch options
-- Added Tiled VAE decoding as an Inference addon thanks to @NeuralFault!
-### Changed
-- Moved the original Stable Diffusion WebUI Forge to the "Legacy" packages tab due to inactivity
-- Updated to cu130 torch index for ComfyUI installs with Nvidia GPUs
-- Consolidated and fixed AMD GPU architecture detection
-- Updated SageAttention installer to latest v2.2.0-windows.post4 version
-- Video files can now be opened directly from the Output browser
-- Videos will now appear with thumbnails in the Output browser
-### Fixed
-- Fixed [#1450](https://github.com/LykosAI/StabilityMatrix/issues/1450) - Older SD.Next not launching due to forced `--uv` argument
-- Fixed duplicate custom node installations when installing workflows from the Workflow Browser - thanks again to @NeuralFault!
-### Supporters
-#### 🌟 Visionaries
-A massive thank you to our esteemed Visionaries: **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, and **whudunit**! Your generosity is the powerhouse behind Stability Matrix, enabling us to keep building and refining with confidence. We are truly grateful for your partnership!
-
->>>>>>> 1c542602 (Merge pull request #1193 from ionite34/fix-bugs-n-stuff)
 ## v2.15.5
 ### Added
 - Added new package - [Wan2GP](https://github.com/deepbeepmeep/Wan2GP)
diff --git a/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml b/StabilityMatrix.Avalonia/Views/CivitAiBrowserPage.axaml
@@ -351,7 +351,8 @@
                                     <Grid ColumnDefinitions="*, Auto">
                                         <StackPanel
                                             Grid.Row="0"
-                                            Grid.Column="0"
+                                            Grid.Column="1"
+                                            IsVisible="{Binding CivitModel.ModelVersionStats.RatingCount, FallbackValue=False, TargetNullValue=False}"
                                             Orientation="Horizontal">
                                             <controls:StarsRating
                                                 Margin="8,8,0,8"
@@ -368,9 +369,9 @@
 
                                         <StackPanel
                                             Grid.Row="0"
-                                            Grid.Column="1"
-                                            Margin="0,0,8,0"
-                                            HorizontalAlignment="Right"
+                                            Grid.Column="0"
+                                            Margin="8"
+                                            HorizontalAlignment="Left"
                                             Orientation="Horizontal">
                                             <fa:Icon Value="fa-solid fa-heart" />
                                             <TextBlock
diff --git a/StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs b/StabilityMatrix.Core/Helper/HardwareInfo/HardwareHelper.cs
@@ -247,6 +247,41 @@ public static IEnumerable<GpuInfo> IterGpuInfo(bool forceRefresh = false)
         return gpuInfos;
     }
 
+    /// <summary>
+    /// Gets the NVIDIA driver version using nvidia-smi.
+    /// Returns null if nvidia-smi is not available or fails.
+    /// </summary>
+    public static Version? GetNvidiaDriverVersion()
+    {
+        try
+        {
+            var psi = new ProcessStartInfo
+            {
+                FileName = "nvidia-smi",
+                UseShellExecute = false,
+                Arguments = "--query-gpu=driver_version --format=csv,noheader",
+                RedirectStandardOutput = true,
+                CreateNoWindow = true,
+            };
+
+            var process = Process.Start(psi);
+            process?.WaitForExit();
+            var stdout = process?.StandardOutput.ReadToEnd()?.Trim();
+
+            if (string.IsNullOrEmpty(stdout))
+                return null;
+
+            // Driver version is typically in the format "xxx.xx" (e.g., "591.59")
+            // We'll parse it as a Version object
+            return Version.TryParse(stdout, out var version) ? version : null;
+        }
+        catch (Exception e)
+        {
+            Logger.Warn(e, "Failed to get NVIDIA driver version from nvidia-smi");
+            return null;
+        }
+    }
+
     /// <summary>
     /// Return true if the system has at least one Nvidia GPU.
     /// </summary>
diff --git a/StabilityMatrix.Core/Models/Packages/ComfyUI.cs b/StabilityMatrix.Core/Models/Packages/ComfyUI.cs
@@ -530,6 +530,59 @@ await SetupVenv(installLocation, pythonVersion: PyVersion.Parse(installedPackage
 
         VenvRunner.UpdateEnvironmentVariables(GetEnvVars);
 
+        // Check for old NVIDIA driver version with cu130 installations
+        var isNvidia = SettingsManager.Settings.PreferredGpu?.IsNvidia ?? HardwareHelper.HasNvidiaGpu();
+        var isLegacyNvidia =
+            SettingsManager.Settings.PreferredGpu?.IsLegacyNvidiaGpu() ?? HardwareHelper.HasLegacyNvidiaGpu();
+
+        if (isNvidia && !isLegacyNvidia)
+        {
+            var driverVersion = HardwareHelper.GetNvidiaDriverVersion();
+            if (driverVersion is not null && driverVersion.Major < 580)
+            {
+                // Check if torch is installed with cu130 index
+                var torchInfo = await VenvRunner.PipShow("torch").ConfigureAwait(false);
+                if (torchInfo is not null)
+                {
+                    var version = torchInfo.Version;
+                    var plusPos = version.IndexOf('+');
+                    var torchIndex = plusPos >= 0 ? version[(plusPos + 1)..] : string.Empty;
+
+                    // Only warn if using cu130 (which requires driver 580+)
+                    if (torchIndex.Equals("cu130", StringComparison.OrdinalIgnoreCase))
+                    {
+                        var warningMessage = $"""
+
+                            ============================================================
+                                            NVIDIA DRIVER WARNING
+                            ============================================================
+
+                            Your NVIDIA driver version ({driverVersion}) is older than
+                            the minimum required version (580.x) for CUDA 13.0 (cu130).
+
+                            This may cause ComfyUI to fail to start or experience issues.
+
+                            Recommended actions:
+                              1. Update your NVIDIA driver to version 580 or newer
+                              2. Or manually downgrade your torch version to use an
+                                 older torch index (e.g. cu128)
+
+                            ============================================================
+
+                            """;
+
+                        Logger.Warn(
+                            "NVIDIA driver version {DriverVersion} is below 580.x minimum for cu130 (torch index: {TorchIndex})",
+                            driverVersion,
+                            torchIndex
+                        );
+                        onConsoleOutput?.Invoke(ProcessOutput.FromStdErrLine(warningMessage));
+                        return;
+                    }
+                }
+            }
+        }
+
         VenvRunner.RunDetached(
             [Path.Combine(installLocation, options.Command ?? LaunchCommand), .. options.Arguments],
             HandleConsoleOutput,
diff --git a/StabilityMatrix.Core/Models/Packages/FluxGym.cs b/StabilityMatrix.Core/Models/Packages/FluxGym.cs
@@ -39,8 +39,7 @@ IPipWheelService pipWheelService
     public override string LicenseUrl => "";
     public override string LaunchCommand => "app.py";
 
-    public override Uri PreviewImageUri =>
-        new("https://raw.githubusercontent.com/cocktailpeanut/fluxgym/main/screenshot.png");
+    public override Uri PreviewImageUri => new("https://cdn.lykos.ai/sm/packages/fluxgym/fluxgym.webp");
 
     public override List<LaunchOptionDefinition> LaunchOptions => [LaunchOptionDefinition.Extras];
 
diff --git a/StabilityMatrix.Core/Models/Packages/InvokeAI.cs b/StabilityMatrix.Core/Models/Packages/InvokeAI.cs
@@ -131,6 +131,11 @@ public override Task DownloadPackage(
         return Task.CompletedTask;
     }
 
+    public override Task<bool> CheckForUpdates(InstalledPackage package) =>
+        package.PythonVersion == Python.PyInstallationManager.Python_3_10_11.ToString()
+            ? Task.FromResult(false)
+            : base.CheckForUpdates(package);
+
     public override async Task InstallPackage(
         string installLocation,
         InstalledPackage installedPackage,
@@ -300,6 +305,44 @@ await SetupVenv(installedPackagePath, pythonVersion: PyVersion.Parse(installedPa
 
         VenvRunner.UpdateEnvironmentVariables(env => GetEnvVars(env, installedPackagePath));
 
+        // Check for legacy Python 3.10.11 installations
+        if (installedPackage.PythonVersion == Python.PyInstallationManager.Python_3_10_11.ToString())
+        {
+            var warningMessage = """
+
+                ============================================================
+                            LEGACY INVOKEAI INSTALLATION
+                ============================================================
+
+                This InvokeAI installation is using Python 3.10.11, which
+                is no longer supported by InvokeAI.
+
+                Automatic updates have been disabled for this installation
+                to prevent compatibility issues.
+
+                Your current installation will continue to work, but will
+                not receive updates.
+
+                Recommended actions:
+                  1. Install a new InvokeAI instance with Python 3.12+
+                  2. Copy your settings and data from this installation
+                     to the new one
+                  3. Once verified, you can delete this old installation
+
+                Note: You can run both installations side-by-side during
+                the migration.
+
+                ============================================================
+
+                """;
+
+            Logger.Warn(
+                "InvokeAI installation using legacy Python {PythonVersion} - updates disabled",
+                installedPackage.PythonVersion
+            );
+            onConsoleOutput?.Invoke(ProcessOutput.FromStdErrLine(warningMessage));
+        }
+
         // Launch command is for a console entry point, and not a direct script
         var entryPoint = await VenvRunner.GetEntryPoint(command).ConfigureAwait(false);
 
