Skip to content

Commit a539fdc

Browse files
committed
fix workflows
1 parent 620339f commit a539fdc

File tree

8 files changed

+15
-19
lines changed

8 files changed

+15
-19
lines changed

AiServer.ServiceInterface/Comfy/ComfyClient.cs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,17 @@ public async Task<ComfyWorkflowResponse> PromptGenerationAsync(ComfyWorkflowRequ
180180
// Handle any file uploads required before processing the workflow
181181
await HandleAssetUploadsAsync(comfyRequest, promptId, token);
182182

183-
// Read template from file for Text to Image
184-
var workflowArgs = comfyRequest.ToObjectDictionary();
185-
foreach (var key in workflowArgs.Keys.ToList())
186-
{
187-
workflowArgs[key.ToCamelCase()] = workflowArgs[key];
188-
}
189-
190183
var mediaModel = AppData.Instance.MediaModels.FirstOrDefault(x =>
191184
x.ApiModels?.TryGetValue("ComfyUI", out var comfyModel) == true && comfyModel == comfyRequest.Model);
192-
if (mediaModel?.WorkflowVars != null)
185+
var workflowArgs = mediaModel?.WorkflowVars != null
186+
? new(mediaModel.WorkflowVars)
187+
: new Dictionary<string, object>();
188+
189+
// Read template from file for Text to Image
190+
var requestArgs = comfyRequest.ToObjectDictionary();
191+
foreach (var entry in requestArgs)
193192
{
194-
foreach (var entry in mediaModel.WorkflowVars)
195-
{
196-
workflowArgs[entry.Key] = entry.Value;
197-
}
193+
workflowArgs[entry.Key.ToCamelCase()] = entry.Value;
198194
}
199195

200196
var workflowJson = await PopulateWorkflowAsync(workflowArgs, templatePath, token);

AiServer/workflows/text-to-image/flux1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@
251251
"Node name for S&R": "CheckpointLoaderSimple"
252252
},
253253
"widgets_values": [
254-
"flux1-schnell.safetensors"
254+
"{{model}}"
255255
]
256256
},
257257
{

AiServer/workflows/text-to-image/hidream.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
"Node name for S&R": "CheckpointLoaderSimple"
340340
},
341341
"widgets_values": [
342-
"{{Model}}"
342+
"{{model}}"
343343
]
344344
},
345345
{

AiServer/workflows/text-to-image/sd35-large.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
"Node name for S&R": "CheckpointLoaderSimple"
444444
},
445445
"widgets_values": [
446-
"sd3.5_large.safetensors"
446+
"{{model}}"
447447
]
448448
},
449449
{

AiServer/workflows/text-to-image/sd35-turbo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
"Node name for S&R": "CheckpointLoaderSimple"
420420
},
421421
"widgets_values": [
422-
"sd3.5_large_turbo.safetensors"
422+
"{{model}}"
423423
]
424424
},
425425
{

AiServer/workflows/text-to-image/sdxl-lightning.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@
281281
"Node name for S&R": "CheckpointLoaderSimple"
282282
},
283283
"widgets_values": [
284-
"sdxl_lightning_4step.safetensors"
284+
"{{model}}"
285285
]
286286
}
287287
],

AiServer/workflows/text-to-image/sdxl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"Node name for S&R": "CheckpointLoaderSimple"
214214
},
215215
"widgets_values": [
216-
"{{Model}}"
216+
"{{model}}"
217217
]
218218
},
219219
{

AiServer/workflows/text_to_image.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
"Node name for S&R": "CheckpointLoaderSimple"
214214
},
215215
"widgets_values": [
216-
"{{Model}}"
216+
"{{model}}"
217217
]
218218
},
219219
{

0 commit comments

Comments
 (0)