generic stackable params

Author: mcmonkey4eva

src/BuiltinExtensions/GridGenerator/GridGeneratorExtension.cs

@@ -1,22 +1,26 @@
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Linq;
 using FreneticUtilities.FreneticExtensions;
 using FreneticUtilities.FreneticToolkit;
 using Newtonsoft.Json.Linq;
 using SwarmUI.Accounts;
 using SwarmUI.Core;
 using SwarmUI.Text2Image;
+using SwarmUI.Media;
 using SwarmUI.Utils;
 using SwarmUI.WebAPI;
-using System.IO;
 using System.Net.WebSockets;
 using SixLabors.Fonts;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Drawing.Processing;
+
 using static SwarmUI.Builtin_GridGeneratorExtension.GridGenCore;
 using Image = SwarmUI.Utils.Image;
 using ISImage = SixLabors.ImageSharp.Image;
 using ISImageRGBA = SixLabors.ImageSharp.Image<SixLabors.ImageSharp.PixelFormats.Rgba32>;
-using SwarmUI.Media;
 
 namespace SwarmUI.Builtin_GridGeneratorExtension;
 
@@ -29,6 +33,15 @@ public class GridGeneratorExtension : Extension
     public static PermInfo PermReadGrids = Permissions.Register(new("gridgen_read_grids", "[Grid Generator] Read Grids", "Allows the user to read their list of saved grids.", PermissionDefault.USER, Permissions.GroupUser));
     public static PermInfo PermSaveGrids = Permissions.Register(new("gridgen_save_grids", "[Grid Generator] Save Grids", "Allows the user to save new custom grids to their list of saved grids.", PermissionDefault.USER, Permissions.GroupUser));
 
+    /// <summary>Set of parameter IDs that should be comma-stackable in multiple grid axes.</summary>
+    public static Dictionary<string, T2IParamType> CommaStackableParameters = [];
+
+    /// <summary>Marks a parameter type as being stackable with comma separation in multiple grid axes.</summary>
+    public static void MakeStackable(T2IParamType type)
+    {
+        CommaStackableParameters[type.ID] = type;
+    }
+
     public override void OnPreInit()
     {
         ScriptFiles.Add("Assets/grid_gen.js");
@@ -90,9 +103,9 @@ public override void OnPreInit()
                 (call.LocalData as GridCallData).Additions.Add(val);
                 return true;
             }
-            else if (cleaned == PresetsParameter.Type.ID)
+            else if (CommaStackableParameters.TryGetValue(cleaned, out T2IParamType type))
             {
-                (call.LocalData as GridCallData).Presets.Add(val);
+                (call.LocalData as GridCallData).CommaStackable.GetOrCreate(type, () => []).Add(val);
                 return true;
             }
             else if (cleaned == "width" || cleaned == "outwidth")
@@ -135,14 +148,18 @@ public override void OnPreInit()
                 string prompt = param.InternalSet.Get(T2IParamTypes.Prompt, "") + " " + data.Additions.JoinString(" ");
                 param.InternalSet.Set(T2IParamTypes.Prompt, prompt.Trim());
             }
-            if (data.Presets.Any())
+            foreach ((T2IParamType key, List<string> vals) in data.CommaStackable)
             {
-                string presets = data.Presets.JoinString(",");
-                if (param.InternalSet.TryGet(PresetsParameter, out string existing))
+                string joined = vals.JoinString(",");
+                if (param.TryGetRaw(key, out object existing))
                 {
-                    presets += $",{existing}";
+                    if (existing is List<string> strs)
+                    {
+                        existing = strs.JoinString(",");
+                    }
+                    joined = $"{existing},{joined}";
                 }
-                param.InternalSet.Set(PresetsParameter, presets);
+                param.Set(key, joined);
             }
         };
         GridRunnerPreRunHook = (runner) =>
@@ -278,6 +295,11 @@ public override void OnInit()
         API.RegisterAPICall(GridGenDeleteData, true, PermSaveGrids);
         API.RegisterAPICall(GridGenGetData, false, PermReadGrids);
         API.RegisterAPICall(GridGenListData, false, PermReadGrids);
+        MakeStackable(PresetsParameter.Type);
+        MakeStackable(T2IParamTypes.Loras.Type);
+        MakeStackable(T2IParamTypes.LoraWeights.Type);
+        MakeStackable(T2IParamTypes.LoraTencWeights.Type);
+        MakeStackable(T2IParamTypes.LoraSectionConfinement.Type);
     }
 
     public async Task<JObject> GridGenSaveData(Session session, string gridName, bool isPublic, JObject rawData)
@@ -340,7 +362,7 @@ public class GridCallData
 
         public List<string> Additions = [];
 
-        public List<string> Presets = [];
+        public Dictionary<T2IParamType, List<string>> CommaStackable = [];
     }
 
     public class SwarmUIGridData

src/Text2Image/T2IParamTypes.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -174,10 +174,9 @@ public static T2IParamType FromNet(JObject data)
 
 /// <summary>Helper class to easily read T2I Parameters.</summary>
 /// <typeparam name="T">The C# datatype of the parameter.</typeparam>
-public class T2IRegisteredParam<T>
+/// <param name="Type">The underlying type data.</param>
+public record class T2IRegisteredParam<T>(T2IParamType Type)
 {
-    /// <summary>The underlying type data.</summary>
-    public T2IParamType Type;
 }
 
 /// <summary>Represents a group of parameters.</summary>
@@ -265,7 +264,7 @@ public static T2IRegisteredParam<T> Register<T>(T2IParamType type)
         }
         Types.Add(type.ID, type);
         LanguagesHelper.AppendSetInternal(type.Name, type.Description);
-        return new T2IRegisteredParam<T>() { Type = type };
+        return new T2IRegisteredParam<T>(type);
     }
 
     /// <summary>Type-name cleaner.</summary>