don't hardcode default values

Author: mythz

AiServer.ServiceInterface/Comfy/ComfyExtensions.cs

@@ -18,21 +18,18 @@ public static ComfyWorkflowRequest ApplyModelDefaults(this ComfyWorkflowRequest
                 resObject = new ComfyWorkflowRequest
                 {
                     Model = request.Model ?? appConfig.DefaultModel?.Filename!,
-                    Width = request.Width is null or 0 ? modelSettings?.Width ?? 1024 : request.Width,
-                    Height = request.Height is null or 0 ? modelSettings?.Height ?? 1024 : request.Height,
+                    Width = request.Width,
+                    Height = request.Height,
                     BatchSize = request.BatchSize is 0 ? 1 : request.BatchSize,
                     Seed = request.Seed is null or 0 ? Random.Shared.Next() : request.Seed,
                     PositivePrompt = request.PositivePrompt,
                     NegativePrompt = request.NegativePrompt is null or ""
-                        ? (modelSettings?.NegativePrompt ?? ",low quality, blurry, noisy, compression artifacts")
-                        : request.NegativePrompt + (modelSettings?.NegativePrompt ??
-                                                    ",low quality, blurry, noisy, compression artifacts"),
-                    Scheduler = request.Scheduler is null or ""
-                        ? modelSettings?.Scheduler ?? "normal"
-                        : request.Scheduler,
-                    Steps = request.Steps is null or 0 ? modelSettings?.Steps ?? 25 : request.Steps,
-                    CfgScale = request.CfgScale is null or 0 ? modelSettings?.CfgScale ?? 7 : request.CfgScale,
-                    Sampler = request.Sampler ?? (modelSettings?.Sampler ?? ComfySampler.euler_ancestral),
+                        ? "low quality, blurry, noisy, compression artifacts"
+                        : request.NegativePrompt + (",low quality, blurry, noisy, compression artifacts"),
+                    Scheduler = request.Scheduler,
+                    Steps = request.Steps,
+                    CfgScale = request.CfgScale,
+                    Sampler = request.Sampler,
                     TaskType = ComfyTaskType.TextToImage
                 };
                 break;

AiServer.ServiceInterface/Generation/ComfyProvider.cs

@@ -112,8 +112,7 @@ private ComfyClient GetClient(MediaProvider provider)
             AiTaskType.SpeechToText => ComfyTaskType.SpeechToText,
             _ => throw new ArgumentOutOfRangeException()
         };
-        comfyWorkflowReq =
-            comfyWorkflowReq.ApplyModelDefaults(AppConfig.Instance, modelSettings.ConvertTo<ComfyApiModelSettings>());
+        comfyWorkflowReq = comfyWorkflowReq.ApplyModelDefaults(AppConfig.Instance, modelSettings.ConvertTo<ComfyApiModelSettings>());
         var response = await comfyClient.PromptGenerationAsync(comfyWorkflowReq, token, waitResult: true);
         var status = await comfyClient.GetWorkflowStatusAsync(response.PromptId, token);
         var previewQ = GetPreviewQueryStringByTaskType(request.TaskType ?? AiTaskType.TextToImage);

AiServer.ServiceModel/Types/ComfyApi.cs

@@ -38,19 +38,17 @@ public class ComfyWorkflowRequest
     public Stream? MaskInput { get; set; }
 
     public ComfySampler? Sampler { get; set; }
-    public string? Scheduler { get; set; } = "normal";
+    public string? Scheduler { get; set; }
     public double? CfgScale { get; set; }
     public double? Denoise { get; set; }
 
-    public string? UpscaleModel { get; set; } = "RealESRGAN_x2.pth";
+    public string? UpscaleModel { get; set; }
 
     public int? Width { get; set; }
     public int? Height { get; set; }
 
     public ComfyTaskType TaskType { get; set; }
     public string? Clip { get; set; }
-    
-    public string? Vae { get; set; }
     public double? SampleLength { get; set; }
     public ComfyMaskSource MaskChannel { get; set; }
 }