From c028a51d71c51e7b09b72781e11495691e5da9c8 Mon Sep 17 00:00:00 2001 From: Ionite Date: Wed, 13 Mar 2024 03:03:38 -0400 Subject: [PATCH 1/3] Fix Inference Inherit Primary Sampler Addons not able to disable --- .../Models/Inference/ModuleApplyStepEventArgs.cs | 9 ++++++++- .../Models/Api/Comfy/NodeTypes/ModelConnections.cs | 11 +++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/StabilityMatrix.Avalonia/Models/Inference/ModuleApplyStepEventArgs.cs b/StabilityMatrix.Avalonia/Models/Inference/ModuleApplyStepEventArgs.cs index 8da5fe6d..f4bd13fb 100644 --- a/StabilityMatrix.Avalonia/Models/Inference/ModuleApplyStepEventArgs.cs +++ b/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( + Builder.Connections.Models.ToDictionary( + pair => pair.Key, + pair => new ModelConnections(pair.Value) + ) + ) }; } diff --git a/StabilityMatrix.Core/Models/Api/Comfy/NodeTypes/ModelConnections.cs b/StabilityMatrix.Core/Models/Api/Comfy/NodeTypes/ModelConnections.cs index a9d6447c..5257b5b2 100644 --- a/StabilityMatrix.Core/Models/Api/Comfy/NodeTypes/ModelConnections.cs +++ b/StabilityMatrix.Core/Models/Api/Comfy/NodeTypes/ModelConnections.cs @@ -5,6 +5,15 @@ /// 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; } } From 8503e937edee9be231a14a51deb2436386165ca6 Mon Sep 17 00:00:00 2001 From: Ionite Date: Wed, 13 Mar 2024 03:05:01 -0400 Subject: [PATCH 2/3] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68ea5d33..d06e9998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ 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.10.0-dev.3 +### Fixed +- Fixed Inference HiresFix module "Inherit Primary Sampler Addons" setting not effectively disabling when unchecked + ## v2.10.0-dev.2 ### Added - Added Reference-Only mode for Inference ControlNet, used for guiding the sampler with an image without a pretrained model. Part of the latent and attention layers will be connected to the reference image, similar to Image to Image or Inpainting. From 479aceebb05351b98af5460f787ae6105b864e7f Mon Sep 17 00:00:00 2001 From: Ionite Date: Wed, 13 Mar 2024 03:21:52 -0400 Subject: [PATCH 3/3] Fix double chagenlog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8342d809..91a94ec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ 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 -- Fix model download location options for VAEs in the CivitAI Model Browser - 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