Merge pull request LykosAI#1194 from ionite34/backport/main/pr-1193

[dev to main] backport: Fix bugs n stuff (1193)

Author: mohnjiles

CHANGELOG.md

@@ -9,10 +9,27 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 ### 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
+- Added Tiled VAE Decode to the Inference video workflows - thanks to @NeuralFault!
 ### Changed
 - Disabled update checking for legacy InvokeAI installations using Python 3.10.11
-### Fixed
 - Hide rating stars in the Civitai browser page if no rating is available
+- Updated uv to v0.9.26
+- Updated PortableGit to v2.52.0.windows.1
+- Updated Sage/Triton/Nunchaku installers to use GitHub API to fetch latest releases
+- Updated ComfyUI installations and updates to automatically install ComfyUI Manager
+- Updated gfx110X Windows ROCm nightly index - thanks to @NeuralFault!
+- Updated ComfyUI-Zluda install to more closely match the author's intended installation method - thanks to @NeuralFault!
+- Updated Forge Classic installs/updates to use the upstream install script for better version compatibility with torch/sage/triton/nunchaku
+### Fixed
+- Fixed [#1529](https://github.com/LykosAI/StabilityMatrix/issues/1529) - "Selected commit is null" error when installing packages and rate limited by GitHub
+- Fixed [#1525](https://github.com/LykosAI/StabilityMatrix/issues/1525) - Crash after downloading a model
+- Fixed [#1523](https://github.com/LykosAI/StabilityMatrix/issues/1523), [#1499](https://github.com/LykosAI/StabilityMatrix/issues/1499), [#1494](https://github.com/LykosAI/StabilityMatrix/issues/1494) - Automatic1111 using old stable diffusion repo
+- Fixed [#1518](https://github.com/LykosAI/StabilityMatrix/issues/1518), [#1513](https://github.com/LykosAI/StabilityMatrix/issues/1513), [#1488](https://github.com/LykosAI/StabilityMatrix/issues/1488) - Forge Neo update breaking things
+- Fixed [#1505](https://github.com/LykosAI/StabilityMatrix/issues/1505) - incorrect port argument for Wan2GP
+- Possibly fix [#1502](https://github.com/LykosAI/StabilityMatrix/issues/1502) - English fonts not displaying correctly on Linux in Chinese environments
+- Fixed [#1476](https://github.com/LykosAI/StabilityMatrix/issues/1476) - Incorrect shared output folder for Forge Classic/Neo
+- 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.15.5
 ### Added

StabilityMatrix.Avalonia/App.axaml.cs

@@ -250,6 +250,28 @@ public FontFamily GetPlatformDefaultFontFamily()
                 fonts.Add("Helvetica Neue");
                 fonts.Add("Helvetica");
             }
+            else if (Compat.IsLinux)
+            {
+                // For Chinese locales, prioritize CJK-capable fonts first
+                if (Cultures.Current?.Name is "zh-Hans" or "zh-Hant")
+                {
+                    // Common Chinese fonts on Linux systems
+                    fonts.Add("Noto Sans CJK SC");
+                    fonts.Add("Noto Sans CJK TC");
+                    fonts.Add("Source Han Sans");
+                    fonts.Add("WenQuanYi Micro Hei");
+                    fonts.Add("WenQuanYi Zen Hei");
+                }
+
+                // Add common Linux fonts
+                fonts.Add("Ubuntu");
+                fonts.Add("DejaVu Sans");
+
+                // Fallback to system default
+                fonts.Add(FontFamily.Default.Name);
+
+                return new FontFamily(string.Join(",", fonts));
+            }
             else
             {
                 return FontFamily.Default;
@@ -281,6 +303,9 @@ private void Setup()
             Logger.Debug("ActivatableLifetime available, setting up activation protocol handlers");
             activatableLifetime.Activated += OnActivated;
         }
+
+        // Update font when culture/language changes
+        EventManager.Instance.CultureChanged += (_, _) => SetFontFamily(GetPlatformDefaultFontFamily());
     }
 
     private void ShowMainWindow()

StabilityMatrix.Avalonia/DesignData/MockLaunchPageViewModel.cs

@@ -36,13 +36,13 @@ IServiceManager<ViewModelBase> dialogFactory
     public override BasePackage? SelectedBasePackage =>
         SelectedPackage?.PackageName != "dank-diffusion"
             ? base.SelectedBasePackage
-            : new DankDiffusion(null!, null!, null!, null!, null!);
+            : new DankDiffusion(null!, null!, null!, null!, null!, null!);
 
     protected override Task LaunchImpl(string? command)
     {
         IsLaunchTeachingTipsOpen = false;
 
-        RunningPackage = new PackagePair(null!, new DankDiffusion(null!, null!, null!, null!, null!));
+        RunningPackage = new PackagePair(null!, new DankDiffusion(null!, null!, null!, null!, null!, null!));
 
         Console.Document.Insert(
             0,

StabilityMatrix.Avalonia/Helpers/UnixPrerequisiteHelper.cs

@@ -35,9 +35,9 @@ IPyInstallationManager pyInstallationManager
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
     private const string UvMacDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-aarch64-apple-darwin.tar.gz";
+        "https://github.com/astral-sh/uv/releases/download/0.9.26/uv-aarch64-apple-darwin.tar.gz";
     private const string UvLinuxDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-x86_64-unknown-linux-gnu.tar.gz";
+        "https://github.com/astral-sh/uv/releases/download/0.9.26/uv-x86_64-unknown-linux-gnu.tar.gz";
 
     private DirectoryPath HomeDir => settingsManager.LibraryDir;
     private DirectoryPath AssetsDir => HomeDir.JoinDir("Assets");
@@ -75,7 +75,7 @@ private bool IsPythonVersionInstalled(PyVersion version) =>
     // Cached store of whether or not git is installed
     private bool? isGitInstalled;
 
-    private string ExpectedUvVersion => "0.8.4";
+    private string ExpectedUvVersion => "0.9.26";
 
     public bool IsVcBuildToolsInstalled => false;
     public bool IsHipSdkInstalled => false;
@@ -272,7 +272,13 @@ private async Task RunGit(ProcessArgs args, string? workingDirectory = null)
         var result = await ProcessRunner.RunBashCommand(
             command,
             workingDirectory ?? string.Empty,
-            new Dictionary<string, string> { { "GIT_TERMINAL_PROMPT", "0" } }
+            new Dictionary<string, string>
+            {
+                { "GIT_TERMINAL_PROMPT", "0" },
+                // Set UTF-8 locale to handle Unicode characters in paths
+                { "LC_ALL", "C.UTF-8" },
+                { "LANG", "C.UTF-8" },
+            }
         );
         if (result.ExitCode != 0)
         {
@@ -375,7 +381,16 @@ public async Task InstallPythonIfNecessary(PyVersion version, IProgress<Progress
 
     public Task<ProcessResult> GetGitOutput(ProcessArgs args, string? workingDirectory = null)
     {
-        return ProcessRunner.RunBashCommand(args.Prepend("git"), workingDirectory ?? "");
+        return ProcessRunner.RunBashCommand(
+            args.Prepend("git"),
+            workingDirectory ?? "",
+            new Dictionary<string, string>
+            {
+                // Set UTF-8 locale to handle Unicode characters in paths
+                { "LC_ALL", "C.UTF-8" },
+                { "LANG", "C.UTF-8" },
+            }
+        );
     }
 
     private async Task<string> RunNode(

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -27,7 +27,8 @@ IPyInstallationManager pyInstallationManager
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
     private const string PortableGitDownloadUrl =
-        "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.1/PortableGit-2.41.0-64-bit.7z.exe";
+        "https://github.com/git-for-windows/git/releases/download/v2.52.0.windows.1/PortableGit-2.52.0-64-bit.7z.exe";
+    private const string ExpectedGitVersion = "2.52.0";
 
     private const string VcRedistDownloadUrl = "https://aka.ms/vs/16/release/vc_redist.x64.exe";
 
@@ -49,7 +50,7 @@ IPyInstallationManager pyInstallationManager
     private const string PythonLibsDownloadUrl = "https://cdn.lykos.ai/python_libs_for_sage.zip";
 
     private const string UvWindowsDownloadUrl =
-        "https://github.com/astral-sh/uv/releases/download/0.8.4/uv-x86_64-pc-windows-msvc.zip";
+        "https://github.com/astral-sh/uv/releases/download/0.9.26/uv-x86_64-pc-windows-msvc.zip";
 
     private string HomeDir => settingsManager.LibraryDir;
 
@@ -115,7 +116,7 @@ private string GetPythonLibraryZipPath(PyVersion version) =>
     private string UvExtractPath => Path.Combine(AssetsDir, "uv");
     public string UvExePath => Path.Combine(UvExtractPath, "uv.exe");
     public bool IsUvInstalled => File.Exists(UvExePath);
-    private string ExpectedUvVersion => "0.8.4";
+    private string ExpectedUvVersion => "0.9.26";
 
     public string GitBinPath => Path.Combine(PortableGitInstallDir, "bin");
     public bool IsVcBuildToolsInstalled => Directory.Exists(VcBuildToolsExistsPath);
@@ -155,6 +156,10 @@ public async Task RunGit(
             {
                 { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) },
                 { "GIT_TERMINAL_PROMPT", "0" },
+                // Set UTF-8 locale to handle Unicode characters in paths
+                // This helps Git load libcurl-4.dll when paths contain non-ASCII characters
+                { "LC_ALL", "C.UTF-8" },
+                { "LANG", "C.UTF-8" },
             }
         );
         await process.WaitForExitAsync().ConfigureAwait(false);
@@ -173,6 +178,10 @@ public Task<ProcessResult> GetGitOutput(ProcessArgs args, string? workingDirecto
             environmentVariables: new Dictionary<string, string>
             {
                 { "PATH", Compat.GetEnvPathWithExtensions(GitBinPath) },
+                // Set UTF-8 locale to handle Unicode characters in paths
+                // This helps Git load libcurl-4.dll when paths contain non-ASCII characters
+                { "LC_ALL", "C.UTF-8" },
+                { "LANG", "C.UTF-8" },
             }
         );
     }
@@ -605,11 +614,31 @@ public async Task InstallGitIfNecessary(IProgress<ProgressReport>? progress = nu
     {
         if (File.Exists(GitExePath))
         {
-            Logger.Debug("Git already installed at {GitExePath}", GitExePath);
-            return;
+            var installedVersion = await GetInstalledGitVersionAsync();
+            if (installedVersion.Contains(ExpectedGitVersion))
+            {
+                Logger.Debug(
+                    "Git {Version} already installed at {GitExePath}",
+                    ExpectedGitVersion,
+                    GitExePath
+                );
+                return;
+            }
+
+            Logger.Info(
+                "Git version mismatch. Installed: {Installed}, Expected: {Expected}. Upgrading...",
+                installedVersion.Trim(),
+                ExpectedGitVersion
+            );
+
+            // Delete existing installation to upgrade
+            if (Directory.Exists(PortableGitInstallDir))
+            {
+                await new DirectoryPath(PortableGitInstallDir).DeleteAsync(true);
+            }
         }
 
-        Logger.Info("Git not found at {GitExePath}, downloading...", GitExePath);
+        Logger.Info("Git not found or outdated at {GitExePath}, downloading...", GitExePath);
 
         // Download
         if (!File.Exists(PortableGitDownloadPath))
@@ -1139,6 +1168,20 @@ private async Task<string> GetInstalledUvVersionAsync()
         }
     }
 
+    private async Task<string> GetInstalledGitVersionAsync()
+    {
+        try
+        {
+            var result = await GetGitOutput(["--version"]);
+            return result.StandardOutput ?? string.Empty;
+        }
+        catch (Exception e)
+        {
+            Logger.Warn(e, "Failed to get Git version");
+            return string.Empty;
+        }
+    }
+
     private async Task<bool> EnsurePythonVersion(PyVersion pyVersion)
     {
         var result = await pyInstallationManager.GetInstallationAsync(pyVersion);

StabilityMatrix.Avalonia/Services/InferenceClientManager.cs

@@ -331,15 +331,22 @@ ICompletionProvider completionProvider
             if (!settingsManager.IsLibraryDirSet)
                 return;
 
-            ResetSharedProperties();
-
-            if (IsConnected)
+            // Dispatch to UI thread to prevent race conditions with Avalonia's selection model.
+            // The ModelIndexChanged event may be raised from a background thread, and modifying
+            // observable collections from a non-UI thread can cause ArgumentOutOfRangeException
+            // when the selection model tries to enumerate selected items.
+            Dispatcher.UIThread.Post(() =>
             {
-                LoadSharedPropertiesAsync()
-                    .SafeFireAndForget(onException: ex =>
-                        logger.LogError(ex, "Error loading shared properties")
-                    );
-            }
+                ResetSharedProperties();
+
+                if (IsConnected)
+                {
+                    LoadSharedPropertiesAsync()
+                        .SafeFireAndForget(onException: ex =>
+                            logger.LogError(ex, "Error loading shared properties")
+                        );
+                }
+            });
         };
     }
 

StabilityMatrix.Avalonia/ViewModels/CheckpointManager/CheckpointFileViewModel.cs

@@ -321,41 +321,35 @@ private async Task RenameAsync()
     [RelayCommand]
     private async Task OpenSafetensorMetadataViewer()
     {
-        if (!CheckpointFile.SafetensorMetadataParsed)
+        if (
+            !settingsManager.IsLibraryDirSet
+            || new DirectoryPath(settingsManager.ModelsDirectory) is not { Exists: true } modelsDir
+        )
         {
-            if (
-                !settingsManager.IsLibraryDirSet
-                || new DirectoryPath(settingsManager.ModelsDirectory) is not { Exists: true } modelsDir
-            )
-            {
-                return;
-            }
-
-            try
-            {
-                var safetensorPath = CheckpointFile.GetFullPath(modelsDir);
-
-                var metadata = await SafetensorMetadata.ParseAsync(safetensorPath);
-
-                CheckpointFile.SafetensorMetadataParsed = true;
-                CheckpointFile.SafetensorMetadata = metadata;
-            }
-            catch (Exception ex)
-            {
-                logger.LogWarning(ex, "Failed to parse safetensor metadata");
-                return;
-            }
+            return;
         }
 
-        if (!CheckpointFile.SafetensorMetadataParsed)
+        SafetensorMetadata? metadata;
+        try
+        {
+            var safetensorPath = CheckpointFile.GetFullPath(modelsDir);
+            metadata = await SafetensorMetadata.ParseAsync(safetensorPath);
+        }
+        catch (Exception ex)
         {
+            logger.LogWarning(ex, "Failed to parse safetensor metadata");
+            notificationService.Show(
+                "No Metadata Found",
+                "This safetensor file does not contain any embedded metadata.",
+                NotificationType.Warning
+            );
             return;
         }
 
         var vm = vmFactory.Get<SafetensorMetadataViewModel>(vm =>
         {
             vm.ModelName = CheckpointFile.DisplayModelName;
-            vm.Metadata = CheckpointFile.SafetensorMetadata;
+            vm.Metadata = metadata;
         });
 
         var dialog = vm.GetDialog();

StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs

@@ -403,11 +403,16 @@ or nameof(SortConnectedModelsFirst)
 
         EventManager.Instance.ModelIndexChanged += (_, _) =>
         {
-            RefreshCategories();
-            ModelsCache.EditDiff(
-                modelIndexService.ModelIndex.Values.SelectMany(x => x),
-                LocalModelFile.RelativePathConnectedModelInfoComparer
-            );
+            // Dispatch to UI thread to prevent race conditions with Avalonia's selection model.
+            // The ModelIndexChanged event may be raised from a background thread.
+            Dispatcher.UIThread.Post(() =>
+            {
+                RefreshCategories();
+                ModelsCache.EditDiff(
+                    modelIndexService.ModelIndex.Values.SelectMany(x => x),
+                    LocalModelFile.RelativePathConnectedModelInfoComparer
+                );
+            });
         };
 
         AddDisposable(

StabilityMatrix.Avalonia/ViewModels/Dialogs/CivitFileViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using Avalonia.Threading;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Controls;
@@ -90,9 +91,13 @@ public CivitFileViewModel(
 
     private void ModelIndexChanged(object? sender, EventArgs e)
     {
-        IsInstalled =
-            CivitFile is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
-            && modelIndexService.ModelIndexBlake3Hashes.Contains(CivitFile.Hashes.BLAKE3);
+        // Dispatch to UI thread since the event may be raised from a background thread
+        Dispatcher.UIThread.Post(() =>
+        {
+            IsInstalled =
+                CivitFile is { Type: CivitFileType.Model, Hashes.BLAKE3: not null }
+                && modelIndexService.ModelIndexBlake3Hashes.Contains(CivitFile.Hashes.BLAKE3);
+        });
     }
 
     [RelayCommand(CanExecute = nameof(CanExecuteDownload))]

StabilityMatrix.Avalonia/ViewModels/Dialogs/ModelVersionViewModel.cs

@@ -1,4 +1,5 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
 using StabilityMatrix.Avalonia.ViewModels.Base;
 using StabilityMatrix.Core.Helper;
 using StabilityMatrix.Core.Models.Api;
@@ -42,7 +43,8 @@ public void RefreshInstallStatus()
 
     private void ModelIndexChanged(object? sender, EventArgs e)
     {
-        RefreshInstallStatus();
+        // Dispatch to UI thread since the event may be raised from a background thread
+        Dispatcher.UIThread.Post(RefreshInstallStatus);
     }
 
     protected override void Dispose(bool disposing)