Merge pull request #1161 from ionite34/backport/main/pr-1160

[dev to main] backport: Fix comf and inference compat issues, wrong triton on linux, … (1160)

Author: mohnjiles

CHANGELOG.md

@@ -5,6 +5,20 @@ 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

Directory.Build.props

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

StabilityMatrix.Avalonia/Views/CivitDetailsPage.axaml

@@ -128,10 +128,7 @@
             Margin="0,8,0,0"
             ItemsSource="{Binding CivitModel.Tags}">
             <ItemsRepeater.Layout>
-                <WrapLayout
-                    HorizontalSpacing="4"
-                    Orientation="Horizontal"
-                    VerticalSpacing="4" />
+                <StackLayout Orientation="Horizontal" Spacing="4" />
             </ItemsRepeater.Layout>
             <ItemsRepeater.ItemTemplate>
                 <DataTemplate>

StabilityMatrix.Core/Models/Api/Comfy/ComfyInputInfo.cs

@@ -18,9 +18,23 @@ public class ComfyInputInfo
 
         // value usually is a [["a", "b"]] array
         // but can also be [["a", "b"], {"x": "y"}] array
+        // or sometimes ["COMBO", {"options": ["a", "b"]}] array
 
         var outerArray = value?.Deserialize<JsonArray>();
 
+        if (
+            outerArray?.Count > 1
+            && outerArray.FirstOrDefault() is JsonValue jsonValue
+            && jsonValue.ToString().Equals("COMBO")
+        )
+        {
+            var options = outerArray[1]?["options"];
+            if (options is JsonArray optionsArray)
+            {
+                return optionsArray.Deserialize<List<string>>();
+            }
+        }
+
         if (outerArray?.FirstOrDefault() is not { } innerNode)
         {
             return null;

StabilityMatrix.Core/Models/Packages/ComfyUI.cs

@@ -363,6 +363,7 @@ public override async Task InstallPackage(
                 RequirementsFilePaths = ["requirements.txt"],
                 ExtraPipArgs = ["numpy<2"],
                 SkipTorchInstall = true,
+                PostInstallPipArgs = ["typing-extensions>=4.15.0"],
             };
             await StandardPipInstallProcessAsync(
                     venvRunner,
@@ -415,6 +416,7 @@ _ when gfxArch.StartsWith("gfx120") => "https://rocm.nightlies.amd.com/v2/gfx120
                 CudaIndex = isLegacyNvidia ? "cu126" : "cu128",
                 RocmIndex = "rocm6.4",
                 UpgradePackages = true,
+                PostInstallPipArgs = ["typing-extensions>=4.15.0"],
             };
 
             await StandardPipInstallProcessAsync(

StabilityMatrix.Core/Models/Packages/FramePack.cs

@@ -108,7 +108,7 @@ public override async Task InstallPackage(
         var extraArgs = new List<string>();
         if (isNewerNvidia)
         {
-            extraArgs.Add("triton-windows");
+            extraArgs.Add(Compat.IsWindows ? "triton-windows" : "triton");
         }
 
         var config = new PipInstallConfig