Merge pull request #1133 from ionite34/update-detailer

Update facedetailer and finally hook up wildcards thing

Author: mohnjiles

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Added Negative Rejection Steering (NRS) by @reithan to Inference
 - Added Czech translation thanks to @PEKArt!
 - Added Wan 2.2 models to the HuggingFace tab of the model browser
+- Added Tiled Encode/Decode options to FaceDetailer in Inference
 ### Changed
 - Brought back the "size remaining after download" tooltip in the new Civitai details page
 - Updated ComfyUI installs for AMD users on Linux to use the latest rocm6.4 torch index
@@ -22,13 +23,14 @@ and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2
 - Fixed extension manager failing to install extensions due to incorrect clone directory
 - Fixed duplicate Python versions appearing in the Advanced Options when installing a package
 - Fixed an error when packages and other processes exit before process tracking on windows can initialize
+- Fixed "none" appearing in wildcard field when using Face Detailer in Inference
 - Fixed [#1254](https://github.com/LykosAI/StabilityMatrix/issues/1254) - Unable to scroll samplers in Inference
 - Fixed [#1294](https://github.com/LykosAI/StabilityMatrix/issues/1294) - Improper sorting of output folders in Output Browser
 - Fixed [#1300](https://github.com/LykosAI/StabilityMatrix/issues/1300) - Git errors when installing Extension Packs
 - Fixed [#1317](https://github.com/LykosAI/StabilityMatrix/issues/1317) - Inference missing GGUF text encoders
 - Fixed [#1324](https://github.com/LykosAI/StabilityMatrix/issues/1324) - Window height slightly increasing every launch
 - Fixed [#1360](https://github.com/LykosAI/StabilityMatrix/issues/1360) - A1111 install not using correct torch for 5000-series GPUs
-- Fixed [#1361](https://github.com/LykosAI/StabilityMatrix/issues/1361) - numpy and other Forge startup 
+- Fixed [#1361](https://github.com/LykosAI/StabilityMatrix/issues/1361) - numpy and other Forge startup
 ### Supporters
 #### 🌟 Visionaries
 A huge thank-you to our incredible Visionary-tier supporters: **Waterclouds**, **Corey T**, **bluepopsicle**, **Bob S**, **Ibixat**, **whudunit**, and **Akiro_Senkai**! Your continued support lights the way for Stability Matrix and helps us keep building features like these. We couldn’t do it without you.

StabilityMatrix.Avalonia/Controls/Inference/FaceDetailerCard.axaml

@@ -133,6 +133,33 @@
                         DataContext="{Binding SeedCardViewModel}"
                         IsVisible="{Binding !$parent[StackPanel].((vmInference:FaceDetailerViewModel)DataContext).InheritSeed, TargetNullValue=False, FallbackValue=False}" />
 
+                    <avalonia:SpacedGrid
+                        Margin="0,8,0,0"
+                        ColumnDefinitions="*, *"
+                        RowDefinitions="Auto, Auto">
+                        <!--  Tiled Encode  -->
+                        <TextBlock Margin="4,0,4,0" Text="Tiled Encode" />
+                        <ToggleSwitch
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="8,-8,4,0"
+                            IsChecked="{Binding UseTiledEncode}" />
+
+                        <!--  Tiled Decode  -->
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Margin="4,0,4,0"
+                            VerticalAlignment="Center"
+                            Text="Tiled Decode" />
+                        <ToggleSwitch
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Margin="8,-8,4,0"
+                            HorizontalAlignment="Stretch"
+                            IsChecked="{Binding UseTiledDecode}" />
+                    </avalonia:SpacedGrid>
+
                     <Separator Margin="8,16" Background="#DDDDDD" />
 
                     <avalonia:SpacedGrid
@@ -144,7 +171,7 @@
                         <ToggleSwitch
                             Grid.Row="1"
                             Grid.Column="0"
-                            Margin="8,0,4,8"
+                            Margin="8,-8,4,0"
                             IsChecked="{Binding GuideSizeFor}"
                             OffContent="Crop Region"
                             OnContent="BBox" />
@@ -159,7 +186,7 @@
                         <ToggleSwitch
                             Grid.Row="1"
                             Grid.Column="1"
-                            Margin="8,0,4,0"
+                            Margin="8,-8,4,0"
                             HorizontalAlignment="Stretch"
                             IsChecked="{Binding ForceInpaint}" />
                     </avalonia:SpacedGrid>
@@ -440,6 +467,9 @@
 
                     <!--  Positive Prompt  -->
                     <controls:PromptCard DataContext="{Binding PromptCardViewModel}" IsVisible="{Binding $parent[StackPanel].((vmInference:FaceDetailerViewModel)DataContext).UseSeparatePrompt, TargetNullValue=False, FallbackValue=False}" />
+
+                    <TextBlock Margin="4,8,4,4" Text="{x:Static lang:Resources.Label_Wildcards}" />
+                    <controls:PromptCard Margin="0,8,0,0" DataContext="{Binding WildcardViewModel}" />
                 </StackPanel>
             </ControlTemplate>
         </Setter>

StabilityMatrix.Avalonia/Controls/Inference/PromptCard.axaml

@@ -486,7 +486,8 @@
                         <controls:StackEditableCard
                             Grid.Row="4"
                             Margin="2,0,0,0"
-                            DataContext="{Binding ModulesCardViewModel}" />
+                            DataContext="{Binding ModulesCardViewModel}"
+                            IsVisible="{Binding $parent[Grid].((vmInference:PromptCardViewModel)DataContext).IsStackCardEnabled}" />
 
                         <!--  Styles and Prompt Expansions  -->
                         <!--<Grid Grid.Row="4" RowDefinitions="Auto,*">

StabilityMatrix.Avalonia/ViewModels/Inference/FaceDetailerViewModel.cs

@@ -128,6 +128,12 @@ public partial class FaceDetailerViewModel : LoadableViewModelBase
     [property: Category("Settings"), DisplayName("Inherit Seed")]
     private bool inheritSeed = true;
 
+    [ObservableProperty]
+    public partial bool UseTiledEncode { get; set; }
+
+    [ObservableProperty]
+    public partial bool UseTiledDecode { get; set; }
+
     public IReadOnlyList<ComfyScheduler> AvailableSchedulers => ComfyScheduler.FaceDetailerDefaults;
 
     /// <inheritdoc/>
@@ -141,6 +147,11 @@ IServiceManager<ViewModelBase> vmFactory
         SeedCardViewModel = vmFactory.Get<SeedCardViewModel>();
         SeedCardViewModel.GenerateNewSeed();
         PromptCardViewModel = vmFactory.Get<PromptCardViewModel>();
+        WildcardViewModel = vmFactory.Get<PromptCardViewModel>(vm =>
+        {
+            vm.IsNegativePromptEnabled = false;
+            vm.IsStackCardEnabled = false;
+        });
     }
 
     [JsonPropertyName("DetailerSeed")]
@@ -149,6 +160,9 @@ IServiceManager<ViewModelBase> vmFactory
     [JsonPropertyName("DetailerPrompt")]
     public PromptCardViewModel PromptCardViewModel { get; }
 
+    [JsonPropertyName("DetailerWildcard")]
+    public PromptCardViewModel WildcardViewModel { get; }
+
     public ObservableCollection<string> SamDetectionHints { get; set; } =
         [
             "center-1",
@@ -159,7 +173,7 @@ IServiceManager<ViewModelBase> vmFactory
             "mask-area",
             "mask-points",
             "mask-point-bbox",
-            "none"
+            "none",
         ];
 
     public ObservableCollection<string> SamMaskHintUseNegatives { get; set; } = ["False", "Small", "Outter"];

StabilityMatrix.Avalonia/ViewModels/Inference/Modules/FaceDetailerModule.cs

@@ -131,7 +131,9 @@ protected override void OnApplyStep(ModuleApplyStepEventArgs e)
             Positive = GetPositiveConditioning(faceDetailerCard, e),
             Negative = GetNegativeConditioning(faceDetailerCard, e),
             BboxDetector = e.Nodes.AddTypedNode(bboxLoader).Output1,
-            Wildcard = new StringNodeConnection() // TODO put <lora:stuff:here>
+            Wildcard = faceDetailerCard.WildcardViewModel.GetPrompt().ProcessedText ?? string.Empty,
+            TiledDecode = faceDetailerCard.UseTiledDecode,
+            TiledEncode = faceDetailerCard.UseTiledEncode,
         };
 
         var segmModelName = GetModelName(faceDetailerCard.SegmModel);
@@ -140,7 +142,7 @@ protected override void OnApplyStep(ModuleApplyStepEventArgs e)
             var segmLoader = new ComfyNodeBuilder.UltralyticsDetectorProvider
             {
                 Name = e.Builder.Nodes.GetUniqueName(nameof(ComfyNodeBuilder.UltralyticsDetectorProvider)),
-                ModelName = segmModelName
+                ModelName = segmModelName,
             };
             faceDetailer.SegmDetectorOpt = e.Nodes.AddTypedNode(segmLoader).Output2;
         }
@@ -168,7 +170,7 @@ protected override void OnApplyStep(ModuleApplyStepEventArgs e)
             { RemoteName: "@none" } => null,
             { Local: not null } => model.RelativePath.NormalizePathSeparators(),
             { RemoteName: not null } => model.RemoteName,
-            _ => null
+            _ => null,
         };
 
     private ConditioningNodeConnection GetPositiveConditioning(
@@ -188,7 +190,7 @@ ModuleApplyStepEventArgs e
             {
                 Name = e.Builder.Nodes.GetUniqueName(nameof(ComfyNodeBuilder.CLIPTextEncode)),
                 Clip = e.Builder.Connections.Base.Clip!,
-                Text = prompt.ProcessedText
+                Text = prompt.ProcessedText,
             }
         );
 
@@ -212,7 +214,7 @@ ModuleApplyStepEventArgs e
             {
                 Name = e.Builder.Nodes.GetUniqueName(nameof(ComfyNodeBuilder.CLIPTextEncode)),
                 Clip = e.Builder.Connections.Base.Clip!,
-                Text = prompt.ProcessedText
+                Text = prompt.ProcessedText,
             }
         );
 

StabilityMatrix.Avalonia/ViewModels/Inference/PromptCardViewModel.cs

@@ -109,6 +109,9 @@ public partial class PromptCardViewModel
     [NotifyPropertyChangedFor(nameof(ShowLowTokenWarning))]
     private int lowTokenThreshold = 25;
 
+    [ObservableProperty]
+    public partial bool IsStackCardEnabled { get; set; } = true;
+
     public bool ShowLowTokenWarning => TokensRemaining <= LowTokenThreshold && TokensRemaining >= 0;
 
     public string LowTokenWarningText =>

StabilityMatrix.Core/Models/Api/Comfy/Nodes/ComfyNodeBuilder.cs

@@ -765,7 +765,7 @@ public record FaceDetailer : ComfyTypedNodeBase<ImageNodeConnection>
         /// </summary>
         public required string SamMaskHintUseNegative { get; init; } = "False";
 
-        public required StringNodeConnection Wildcard { get; init; }
+        public required string Wildcard { get; init; }
 
         [Range(1, 32768)]
         public required int DropSize { get; init; } = 10;
@@ -775,6 +775,8 @@ public record FaceDetailer : ComfyTypedNodeBase<ImageNodeConnection>
 
         public SamModelNodeConnection? SamModelOpt { get; set; }
         public SegmDetectorNodeConnection? SegmDetectorOpt { get; set; }
+        public bool TiledEncode { get; init; }
+        public bool TiledDecode { get; init; }
     }
 
     /// <summary>