ApplySpecialLogic should be handled more carefully

Author: mcmonkey4eva

src/BuiltinExtensions/ComfyUIBackend/ComfyUIWebAPI.cs

@@ -139,6 +139,7 @@ public static async Task<JObject> ComfyGetGeneratedWorkflow(Session session, JOb
         try
         {
             input = T2IAPI.RequestToParams(session, rawInput);
+            input.ApplySpecialLogic();
             input.PreparsePromptLikes();
             ComfyUIAPIAbstractBackend backend = ComfyUIBackendExtension.ComfyBackendsDirect().FirstOrDefault().Backend as ComfyUIAPIAbstractBackend;
             if (backend is null)

src/BuiltinExtensions/GridGenerator/GridGeneratorExtension.cs

@@ -420,6 +420,7 @@ async Task sendStatus()
         baseParams.Remove(T2IParamTypes.BatchSize);
         baseParams.Remove(T2IParamTypes.Images);
         baseParams.Remove(T2IParamTypes.OutputIntermediateImages);
+        baseParams.ApplySpecialLogic();
         await sendStatus();
         SwarmUIGridData data = new()
         {

src/BuiltinExtensions/ImageBatchTool/ImageBatchToolExtension.cs

@@ -134,6 +134,7 @@ void setRes(int width, int height)
                 param.Set(T2IParamTypes.Height, height);
                 param.Remove(T2IParamTypes.AspectRatio);
                 param.Remove(T2IParamTypes.AltResolutionHeightMult);
+                param.Remove(T2IParamTypes.RawResolution);
             }
             switch (resMode)
             {
@@ -176,6 +177,7 @@ void setRes(int width, int height)
                     param.Set(controlnetParams.Image, image);
                 }
             }
+            param.ApplySpecialLogic();
             int genId = 0;
             tasks.Add(T2IEngine.CreateImageTask(param, $"{imageIndex}", claim, output, setError, isWS, Program.ServerSettings.Backends.PerRequestTimeoutMinutes, (image, metadata) =>
             {

src/WebAPI/T2IAPI.cs

@@ -221,7 +221,6 @@ public static T2IParamInput RequestToParams(Session session, JObject rawInput)
             }
             user_input.ExtraMeta["presets_used"] = presets.Values().Select(v => v.ToString()).ToList();
         }
-        user_input.ApplySpecialLogic();
         return user_input;
     }
 
@@ -252,6 +251,7 @@ void setError(string message)
             setError(ex.Message);
             return;
         }
+        user_input.ApplySpecialLogic();
         images = user_input.Get(T2IParamTypes.Images, images);
         Logs.Info($"User {session.User.UserID} requested {images} image{(images == 1 ? "" : "s")} with model '{user_input.Get(T2IParamTypes.Model)?.Name}'...");
         if (Logs.MinimumLevel <= Logs.LogLevel.Verbose)
@@ -446,6 +446,7 @@ public static async Task<JObject> AddImageToHistory(Session session,
         {
             return new() { ["error"] = ex.Message };
         }
+        user_input.ApplySpecialLogic();
         Logs.Info($"User {session.User.UserID} stored an image to history.");
         (img, string metadata) = user_input.SourceSession.ApplyMetadata(img, user_input, 1);
         (string path, _) = session.SaveImage(img, 0, user_input, metadata);