Merge branch 'main' into main

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,43 @@ 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.2
+### Changed
+- Updated Avalonia to 11.3.7
+### Fixed
+- Fixed [#1409](https://github.com/LykosAI/StabilityMatrix/issues/1409) - incorrect triton version installed during FramePack install on non-Windows systems
+- Fixed [#1410](https://github.com/LykosAI/StabilityMatrix/issues/1410) - crash when resizing Civitai model details page
+- Fixed [#1417](https://github.com/LykosAI/StabilityMatrix/issues/1417), [#1419](https://github.com/LykosAI/StabilityMatrix/issues/1419) - unable to connect Inference to ComfyUI after updating to latest ComfyUI
+- Fixed missing dependencies for ComfyUI API nodes
+### Supporters
+#### 🌟 Visionaries
+Huge thanks to our incredible Visionaries: **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, **Ibixat**, and **whudunit**! You’re the reason Stability Matrix keeps pushing forward. Your support lights the path and keeps the dream alive.
+#### 🚀 Pioneers
+Shoutout to our amazing Pioneer crew: **Szir777**, **Tigon**, **Noah M**, **USATechDude**, **Thom**, **SeraphOfSalem**, **Desert Viber**, **Tundra Everquill**, **Adam**, **Droolguy**, **Philip R.**, **ACTUALLY_the_Real_Willem_Dafoe**, and **takyamtom**! You help keep the gears turning and the magic flowing.
+
+## v2.15.1
+### Changed
+- Upgraded ComfyUI-Zluda and Stable Diffusion WebUI AMDGPU Forge packages to install and use HIP SDK 6.4.2
+- Changed ComfyUI torch index from `cu129` back to `cu128` for better compatibility with custom nodes
+- Updated SageAttention installer to install v2.2.0-windows.post3
+- Updated Nunchaku installer to install v1.0.1
+- Updated Windows ROCm ComfyUI installs to use recommended environment variables by default
+### Fixed
+- Fixed [#1372](https://github.com/LykosAI/StabilityMatrix/issues/1372), [#1399](https://github.com/LykosAI/StabilityMatrix/issues/1399) - LiteAsyncException upon starting Stability Matrix v2.15.0
+- Fixed [#1391](https://github.com/LykosAI/StabilityMatrix/issues/1391) - "Failed to parse" error when upgrading pip packages with extra index url
+- Fixed [#1401](https://github.com/LykosAI/StabilityMatrix/issues/1401) - "Python <version> was not found and/or failed to install" errors when path contains special characters
+- Fixed [#1403](https://github.com/LykosAI/StabilityMatrix/issues/1403) - Checkpoint Manager filters not being saved correctly
+- Fixed [#1411](https://github.com/LykosAI/StabilityMatrix/issues/1411) - SD.Next installs not using correct torch version
+- Fixed "cannot access local variable 'job' where it is not associated with a value" error when running jobs in AI Toolkit
+- Fixed Civitai browser not always returning at least 30 results when possible on initial search
+- Fixed model browser crashing when downloading a file with invalid characters in the name
+- Fixed model browser crashing when no author exists for a model
+### Supporters
+#### 🌟 Visionaries
+To our guiding stars, the Visionaries! Thank you **Waterclouds**, **JungleDragon**, **bluepopsicle**, **Bob S**, **Ibixat**, and **whudunit**! While this release is focused on fixes and stability, your foundational support is what empowers us to build a reliable and robust platform for everyone.
+#### 🚀 Pioneers
+A huge round of applause for our fantastic Pioneers! Your steady support helps us smooth out the rough edges and deliver a better experience with every update. Our deepest thanks to: **Szir777**, **Tigon**, **Noah M**, **USATechDude**, **Thom**, **SeraphOfSalem**, **Desert Viber**, **Tundra Everquill**, **Adam**, and **Droolguy**. We're also thrilled to welcome our newest Pioneers to the crew: **Philip R.**, **ACTUALLY_the_Real_Willem_Dafoe**, and **takyamtom**!
+
 ## v2.15.0
 ### Added
 - Added new package - [AI Toolkit](https://github.com/ostris/ai-toolkit/)

Directory.Build.props

@@ -10,7 +10,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <AvaloniaVersion>11.3.2</AvaloniaVersion>
+        <AvaloniaVersion>11.3.7</AvaloniaVersion>
     </PropertyGroup>
 
     <PropertyGroup>

StabilityMatrix.Avalonia/Helpers/WindowsPrerequisiteHelper.cs

@@ -45,7 +45,7 @@ IPyInstallationManager pyInstallationManager
     private const string CppBuildToolsUrl = "https://aka.ms/vs/17/release/vs_BuildTools.exe";
 
     private const string HipSdkDownloadUrl =
-        "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-24.Q4-Win10-Win11-For-HIP.exe";
+        "https://download.amd.com/developer/eula/rocm-hub/AMD-Software-PRO-Edition-25.Q3-Win10-Win11-For-HIP.exe";
     private const string PythonLibsDownloadUrl = "https://cdn.lykos.ai/python_libs_for_sage.zip";
 
     private const string UvWindowsDownloadUrl =
@@ -110,7 +110,7 @@ private string GetPythonLibraryZipPath(PyVersion version) =>
     private string HipSdkDownloadPath => Path.Combine(AssetsDir, "AMD-HIP-SDK.exe");
 
     private string HipInstalledPath =>
-        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "AMD", "ROCm", "6.2");
+        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "AMD", "ROCm", "6.4");
 
     private string UvDownloadPath => Path.Combine(AssetsDir, "uv.zip");
     private string UvExtractPath => Path.Combine(AssetsDir, "uv");
@@ -189,7 +189,7 @@ private async Task<string> RunNode(
 
         result.EnsureSuccessExitCode();
         return result.StandardOutput ?? result.StandardError ?? string.Empty;
-    }    
+    }
 
     public async Task RunNpm(
         ProcessArgs args,
@@ -997,15 +997,11 @@ private async Task PatchHipSdkIfNecessary(IProgress<ProgressReport>? progress)
 
         var zipFolderName = downloadUrl switch
         {
-            _ when downloadUrl.Contains("gfx1201") => null,
-            _ when downloadUrl.Contains("gfx1150") => "rocm gfx1150 for hip skd 6.2.4",
-            _ when downloadUrl.Contains("gfx1103.AMD") =>
-                "rocm gfx1103 AMD 780M phoenix V5.0 for hip skd 6.2.4",
-            _ when downloadUrl.Contains("gfx1034") => "rocm gfx1034-gfx1035-gfx1036 for hip sdk 6.2.4",
-            _ when downloadUrl.Contains("gfx1032") => "rocm gfx1032 for hip skd 6.2.4(navi21 logic)",
-            _ when downloadUrl.Contains("gfx1031") => "rocm gfx1031 for hip skd 6.2.4 (littlewu's logic)",
-            _ when downloadUrl.Contains("gfx1010") =>
-                "rocm gfx1010-xnack-gfx1011-xnack-gfx1012-xnack- for hip sdk 6.2.4",
+            _ when downloadUrl.Contains("gfx1103.for.hip") => "rocm gfx1103 for hip 6.4.2",
+            _ when downloadUrl.Contains("gfx1034") => "rocm gfx1034.gfx1035.gfx1036 for hip 6.4.2",
+            _ when downloadUrl.Contains("gfx1032") => "rocm gfx1032 for hip 6.4.2",
+            _ when downloadUrl.Contains("gfx1031") => "rocm gfx1031 for hip 6.4.2",
+            _ when downloadUrl.Contains("gfx1010") => "rocm gfx1010-xnack-gfx1012-xnack-.for.hip6.4.2",
             _ => null,
         };
 
@@ -1035,27 +1031,29 @@ _ when downloadUrl.Contains("gfx1010") =>
 
     private string? GetDownloadUrlFromGpuName(string name)
     {
+        // not used anymore but good to know for gfx -> name reference
         // gfx1201
-        if (name.Contains("9060") || name.Contains("9070"))
-        {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1201.for.hip.skd.6.2.4-no-optimized.7z";
-        }
+        // if (name.Contains("9060") || name.Contains("9070"))
+        // {
+        //     return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1201.for.hip.skd.6.2.4-no-optimized.7z";
+        // }
 
+        // not used anymore but good to know for gfx -> name reference
         // gfx1150
-        if (
-            name.Contains("8050S")
-            || name.Contains("8060S")
-            || name.Contains("880M")
-            || name.Contains("890M")
-        )
-        {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1150.for.hip.skd.6.2.4.7z";
-        }
+        // if (
+        //     name.Contains("8050S")
+        //     || name.Contains("8060S")
+        //     || name.Contains("880M")
+        //     || name.Contains("890M")
+        // )
+        // {
+        //     return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1150.for.hip.skd.6.2.4.7z";
+        // }
 
         // gfx1103
         if (name.Contains("740M") || name.Contains("760M") || name.Contains("780M") || name.Contains("Z1"))
         {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1103.AMD.780M.phoenix.V5.0.for.hip.sdk.6.2.4.7z";
+            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1103.for.hip.6.4.2.7z";
         }
 
         // gfx1034, gfx1035, gfx1036
@@ -1070,7 +1068,7 @@ _ when downloadUrl.Contains("gfx1010") =>
             || name.Contains("Graphics 128SP")
         )
         {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1034-gfx1035-gfx1036.for.hip.sdk.6.2.4.7z";
+            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1034.gfx1035.gfx1036.for.hip.6.4.2.7z";
         }
 
         // gfx1032
@@ -1081,7 +1079,7 @@ _ when downloadUrl.Contains("gfx1010") =>
             || name.Contains("6650")
         )
         {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1032.for.hip.sdk.6.2.4.navi21.logic.7z";
+            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1032.for.hip.6.4.2.7z";
         }
 
         // gfx1031
@@ -1092,13 +1090,13 @@ _ when downloadUrl.Contains("gfx1010") =>
             || name.Contains("6850M")
         )
         {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1031.for.hip.sdk.6.2.4.littlewu.s.logic.7z";
+            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1031.for.hip.6.4.2.7z";
         }
 
         // gfx1010/1012
         if (name.Contains("5700") || name.Contains("5600") || name.Contains("5300") || name.Contains("5500"))
         {
-            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.2.4/rocm.gfx1010-xnack-gfx1011-xnack-gfx1012-xnack-.for.hip.sdk.6.2.4.7z";
+            return "https://github.com/likelovewant/ROCmLibs-for-gfx1103-AMD780M-APU/releases/download/v0.6.4.2/rocm.gfx1010-xnack-gfx1012-xnack-.for.hip6.4.2.7z";
         }
 
         return null;

StabilityMatrix.Avalonia/Models/Inference/FileNameFormat.cs

@@ -37,7 +37,20 @@ public string GetFileName()
         return Prefix
             + string.Join(
                 "",
-                Parts.Select(part => part.Match(constant => constant, substitution => substitution.Invoke()))
+                Parts.Select(part =>
+                    part.Match(
+                        constant => constant,
+                        substitution =>
+                        {
+                            // Filter invalid path chars
+                            var result = substitution.Invoke();
+                            return result is null
+                                ? null
+                                : Path.GetInvalidFileNameChars()
+                                    .Aggregate(result, (current, c) => current.Replace(c, '_'));
+                        }
+                    )
+                )
             )
             + Postfix;
     }

StabilityMatrix.Avalonia/Models/Inference/FileNameFormatProvider.cs

@@ -47,7 +47,7 @@ public partial class FileNameFormatProvider
             { "project_name", () => ProjectName },
             { "date", () => DateTime.Now.ToString("yyyy-MM-dd") },
             { "time", () => DateTime.Now.ToString("HH-mm-ss") },
-            { "author", () => CivitModel?.Creator.Username },
+            { "author", () => CivitModel?.Creator?.Username },
             { "base_model", () => CivitModelVersion?.BaseModel },
             { "file_name", () => Path.GetFileNameWithoutExtension(CivitFile?.Name) },
             { "file_id", () => CivitFile?.Id.ToString() },

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CheckpointBrowserCardViewModel.cs

@@ -212,7 +212,7 @@ private void ToggleFavorite()
     [RelayCommand]
     public void SearchAuthor()
     {
-        EventManager.Instance.OnNavigateAndFindCivitAuthorRequested(CivitModel.Creator.Username);
+        EventManager.Instance.OnNavigateAndFindCivitAuthorRequested(CivitModel.Creator?.Username);
     }
 
     private async Task DoImport(

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitAiBrowserViewModel.cs

@@ -52,6 +52,8 @@ public sealed partial class CivitAiBrowserViewModel : TabViewModelBase, IInfinit
 
     private readonly SourceCache<OrderedValue<CivitModel>, int> modelCache = new(static ov => ov.Value.Id);
 
+    private const int TargetPageItemCount = 30;
+
     [ObservableProperty]
     private IObservableCollection<CheckpointBrowserCardViewModel> modelCards =
         new ObservableCollectionExtended<CheckpointBrowserCardViewModel>();
@@ -453,8 +455,46 @@ private async Task CivitModelQuery(CivitModelsRequest request, bool isInfiniteSc
             }
             else
             {
-                modelsResponse = await civitApi.GetModels(request);
-                models = modelsResponse.Items;
+                // Auto-paginate via cursor until we fill the target page size or run out
+                var collectedById = new HashSet<int>();
+                var targetCount = request.Limit ?? TargetPageItemCount;
+                var safetyGuard = 0;
+
+                while (true)
+                {
+                    var resp = await civitApi.GetModels(request);
+                    modelsResponse = resp;
+
+                    if (resp.Items != null)
+                    {
+                        foreach (var item in resp.Items)
+                        {
+                            if (collectedById.Add(item.Id))
+                            {
+                                models.Add(item);
+                            }
+                        }
+                    }
+
+                    // Check how many items survive local filtering
+                    var filteredCount = models
+                        .Where(m => m.Type.ConvertTo<SharedFolderType>() > 0)
+                        .Count(m => m.Mode == null);
+
+                    var next = resp.Metadata?.NextCursor;
+                    if (filteredCount >= targetCount || string.IsNullOrEmpty(next))
+                    {
+                        break;
+                    }
+
+                    request.Cursor = next;
+
+                    if (++safetyGuard >= 10)
+                    {
+                        // Avoid unbounded looping on unexpected cursors
+                        break;
+                    }
+                }
             }
 
             if (models is null)
@@ -513,7 +553,7 @@ private async Task CivitModelQuery(CivitModelsRequest request, bool isInfiniteSc
                 var doesBaseModelTypeMatch =
                     SelectedBaseModels.Count == 0
                         ? request.BaseModels == null || request.BaseModels.Length == 0
-                        : SelectedBaseModels.SequenceEqual(request.BaseModels);
+                        : SelectedBaseModels.SequenceEqual(request.BaseModels ?? []);
                 var doesModelTypeMatch =
                     SelectedModelType == CivitModelType.All
                         ? request.Types == null || request.Types.Length == 0
@@ -634,6 +674,7 @@ private async Task SearchModels(bool isInfiniteScroll = false)
         // Build request
         var modelRequest = new CivitModelsRequest
         {
+            Limit = TargetPageItemCount + 20, // Fetch a few extra to account for local filtering
             Nsfw = "true", // Handled by local view filter
             Sort = SortMode,
             Period = SelectedPeriod,

StabilityMatrix.Avalonia/ViewModels/CheckpointBrowser/CivitDetailsPageViewModel.cs

@@ -651,7 +651,7 @@ private async Task ShowImageDialog(ImageSource? image)
     private void SearchByAuthor()
     {
         navigationService.GoBack();
-        EventManager.Instance.OnNavigateAndFindCivitAuthorRequested(CivitModel.Creator.Username);
+        EventManager.Instance.OnNavigateAndFindCivitAuthorRequested(CivitModel.Creator?.Username);
     }
 
     [RelayCommand]

StabilityMatrix.Avalonia/ViewModels/CheckpointsPageViewModel.cs

@@ -160,16 +160,14 @@ protected override async Task OnInitialLoadedAsync()
 
         await base.OnInitialLoadedAsync();
 
-        var settingsSelectedBaseModels = settingsManager.Settings.SelectedBaseModels;
-
         AddDisposable(
             BaseModelCache
                 .Connect()
                 .DeferUntilLoaded()
                 .Transform(baseModel => new BaseModelOptionViewModel
                 {
                     ModelType = baseModel,
-                    IsSelected = settingsSelectedBaseModels.Contains(baseModel),
+                    IsSelected = settingsManager.Settings.SelectedBaseModels.Contains(baseModel),
                 })
                 .SortAndBind(
                     BaseModelOptions,
@@ -179,10 +177,15 @@ protected override async Task OnInitialLoadedAsync()
                 .ObserveOn(SynchronizationContext.Current)
                 .Subscribe(next =>
                 {
-                    if (next.Sender.IsSelected)
-                        SelectedBaseModels.Add(next.Sender.ModelType);
-                    else
-                        SelectedBaseModels.Remove(next.Sender.ModelType);
+                    switch (next.Sender.IsSelected)
+                    {
+                        case true when !SelectedBaseModels.Contains(next.Sender.ModelType):
+                            SelectedBaseModels.Add(next.Sender.ModelType);
+                            break;
+                        case false when SelectedBaseModels.Contains(next.Sender.ModelType):
+                            SelectedBaseModels.Remove(next.Sender.ModelType);
+                            break;
+                    }
 
                     OnPropertyChanged(nameof(ClearButtonText));
                     OnPropertyChanged(nameof(SelectedBaseModels));
@@ -191,6 +194,7 @@ protected override async Task OnInitialLoadedAsync()
 
         var settingsTransactionObservable = this.WhenPropertyChanged(x => x.SelectedBaseModels)
             .Throttle(TimeSpan.FromMilliseconds(50))
+            .Skip(1)
             .ObserveOn(SynchronizationContext.Current)
             .Subscribe(_ =>
             {

StabilityMatrix.Avalonia/ViewModels/Dialogs/PythonPackagesViewModel.cs

@@ -239,7 +239,7 @@ private async Task UpgradePackageVersion(
 
         if (extraIndexUrl != null)
         {
-            args = args.AddArg(("--extra-index-url", extraIndexUrl));
+            args = args.AddArgs("--extra-index-url", extraIndexUrl);
         }
 
         var steps = new List<IPackageStep>