Back to transient for most & merge GGUF model loader into Unet

Author: mohnjiles

CHANGELOG.md

@@ -13,11 +13,13 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added Prompt Amplifier to Inference - click the magic wand 🪄 in the prompt editor to expand and enrich your ideas. Tailor the vibe with the ‘Feel’ selector and watch as your generations come to life with extra detail, coherence, and flair!
 ### Changed
 - Updated install for kohya_ss to support RTX 5000-series GPUs
+- (pre.2 re-release) Merged Inference GGUF workflows into the UNet model loader option (no longer need to choose GGUF separately)
 ### Fixed
 - Fixed Inference ControlNet Preprocessors using incorrect resolution and increased maximum of smallest dimension to 16384
 - Fixed Triton/Sage install option showing for incompatible GPUs
 - Fixed errors from invalid pip specifiers in requirements files
 - Fixed package images sometimes showing as blank due to concurrent image caching. Requests to same image resources are now de-duplicated
+- (pre.2 re-release) Fixed Inference Extra Networks card not allowing for more than one model at a time
 ### Supporters
 #### Visionaries
 - Big shout-out to our Visionary-tier patrons: Waterclouds, Corey T, bluepopsicle, and Bob S! Your steadfast support keeps Stability Matrix moving forward, and we couldn’t do it without you. 🚀 Thank you!

StabilityMatrix.Avalonia/ViewModels/Inference/BatchSizeCardViewModel.cs

@@ -11,7 +11,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(BatchSizeCard))]
 [ManagedService]
-[RegisterScoped<BatchSizeCardViewModel>]
+[RegisterTransient<BatchSizeCardViewModel>]
 public partial class BatchSizeCardViewModel : LoadableViewModelBase, IComfyStep
 {
     [NotifyDataErrorInfo]

StabilityMatrix.Avalonia/ViewModels/Inference/ControlNetCardViewModel.cs

@@ -21,7 +21,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(ControlNetCard))]
 [ManagedService]
-[RegisterScoped<ControlNetCardViewModel>]
+[RegisterTransient<ControlNetCardViewModel>]
 public partial class ControlNetCardViewModel : LoadableViewModelBase
 {
     public const string ModuleKey = "ControlNet";

StabilityMatrix.Avalonia/ViewModels/Inference/DiscreteModelSamplingCardViewModel.cs

@@ -9,7 +9,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(DiscreteModelSamplingCard))]
 [ManagedService]
-[RegisterScoped<DiscreteModelSamplingCardViewModel>]
+[RegisterTransient<DiscreteModelSamplingCardViewModel>]
 public partial class DiscreteModelSamplingCardViewModel : LoadableViewModelBase
 {
     public const string ModuleKey = "DiscreteModelSampling";

StabilityMatrix.Avalonia/ViewModels/Inference/FaceDetailerViewModel.cs

@@ -15,7 +15,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(FaceDetailerCard))]
 [ManagedService]
-[RegisterScoped<FaceDetailerViewModel>]
+[RegisterTransient<FaceDetailerViewModel>]
 public partial class FaceDetailerViewModel : LoadableViewModelBase
 {
     private readonly IServiceManager<ViewModelBase> vmFactory;

StabilityMatrix.Avalonia/ViewModels/Inference/FreeUCardViewModel.cs

@@ -9,7 +9,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(FreeUCard))]
 [ManagedService]
-[RegisterScoped<FreeUCardViewModel>]
+[RegisterTransient<FreeUCardViewModel>]
 public partial class FreeUCardViewModel : LoadableViewModelBase
 {
     public const string ModuleKey = "FreeU";

StabilityMatrix.Avalonia/ViewModels/Inference/ImageFolderCardViewModel.cs

@@ -37,7 +37,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(ImageFolderCard))]
 [ManagedService]
-[RegisterScoped<ImageFolderCardViewModel>]
+[RegisterTransient<ImageFolderCardViewModel>]
 public partial class ImageFolderCardViewModel : DisposableViewModelBase
 {
     private readonly ILogger<ImageFolderCardViewModel> logger;

StabilityMatrix.Avalonia/ViewModels/Inference/ImageGalleryCardViewModel.cs

@@ -25,7 +25,7 @@ namespace StabilityMatrix.Avalonia.ViewModels.Inference;
 
 [View(typeof(ImageGalleryCard))]
 [ManagedService]
-[RegisterScoped<ImageGalleryCardViewModel>]
+[RegisterTransient<ImageGalleryCardViewModel>]
 public partial class ImageGalleryCardViewModel : ViewModelBase
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceImageToImageViewModel.cs

@@ -77,7 +77,8 @@ protected override void BuildPrompt(BuildPromptEventArgs args)
         PromptCardViewModel.ApplyStep(applyArgs);
 
         // Setup Sampler and Refiner if enabled
-        var isUnetLoader = ModelCardViewModel.SelectedModelLoader is ModelLoader.Gguf or ModelLoader.Unet;
+        var isUnetLoader =
+            ModelCardViewModel.SelectedModelLoader is ModelLoader.Unet || ModelCardViewModel.IsGguf;
         if (isUnetLoader)
         {
             SamplerCardViewModel.ApplyStepsInitialCustomSampler(applyArgs, true);

StabilityMatrix.Avalonia/ViewModels/Inference/InferenceTextToImageViewModel.cs

@@ -168,7 +168,7 @@ protected override void BuildPrompt(BuildPromptEventArgs args)
         // Load models
         ModelCardViewModel.ApplyStep(applyArgs);
 
-        var isUnetLoader = ModelCardViewModel.SelectedModelLoader is ModelLoader.Gguf or ModelLoader.Unet;
+        var isUnetLoader = ModelCardViewModel.SelectedModelLoader is ModelLoader.Unet;
         var useSd3Latent =
             SamplerCardViewModel.ModulesCardViewModel.IsModuleEnabled<FluxGuidanceModule>() || isUnetLoader;
         var usePlasmaNoise = SamplerCardViewModel.ModulesCardViewModel.IsModuleEnabled<PlasmaNoiseModule>();