Merge pull request #570 from ionite34/fix-inference-inherit-addons

Fix Inference Inherit Primary Sampler Addons not able to disable

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 
 ## v2.10.0-dev.3
 ### Fixed
+- Fixed Inference HiresFix module "Inherit Primary Sampler Addons" setting not effectively disabling when unchecked
 - Fixed model download location options for VAEs in the CivitAI Model Browser
 - Fixed crash on startup when library directory is not set
 - Fixed One-Click install progress dialog not disappearing after completion

StabilityMatrix.Avalonia/Models/Inference/ModuleApplyStepEventArgs.cs

@@ -2,8 +2,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Hashing;
+using System.Linq;
 using System.Text;
 using StabilityMatrix.Core.Models.Api.Comfy.Nodes;
+using StabilityMatrix.Core.Models.Api.Comfy.NodeTypes;
 using StabilityMatrix.Core.Models.Inference;
 
 namespace StabilityMatrix.Avalonia.Models.Inference;
@@ -36,7 +38,12 @@ public class ModuleApplyStepEventArgs : EventArgs
         {
             Primary = Builder.Connections.Primary,
             PrimaryVAE = Builder.Connections.PrimaryVAE,
-            Models = Builder.Connections.Models
+            Models = new Dictionary<string, ModelConnections>(
+                Builder.Connections.Models.ToDictionary(
+                    pair => pair.Key,
+                    pair => new ModelConnections(pair.Value)
+                )
+            )
         };
     }
 

StabilityMatrix.Core/Models/Api/Comfy/NodeTypes/ModelConnections.cs

@@ -5,6 +5,15 @@
 /// </summary>
 public record ModelConnections(string Name)
 {
+    public ModelConnections(ModelConnections other)
+    {
+        Name = other.Name;
+        Model = other.Model;
+        VAE = other.VAE;
+        Clip = other.Clip;
+        Conditioning = other.Conditioning;
+    }
+
     public ModelNodeConnection? Model { get; set; }
 
     public VAENodeConnection? VAE { get; set; }
@@ -12,6 +21,4 @@ public record ModelConnections(string Name)
     public ClipNodeConnection? Clip { get; set; }
 
     public ConditioningConnections? Conditioning { get; set; }
-
-    public ConditioningConnections? PrimarySamplerConditioning { get; set; }
 }