Skip to content

Commit 1aeec7a

Browse files
committed
Fix VibeVoice
1 parent 9ba7461 commit 1aeec7a

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

MyApp.ServiceInterface/ComfyWorkflowConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public Task<ApiPromptResult> CreateApiPromptAsync(WorkflowVersion workflowVersio
3030

3131
public ApiPrompt CreateApiPrompt(Dictionary<string, object?> workflow, Dictionary<string,object?> args, ComfyAgent? agent=null, string? clientId=null)
3232
{
33-
var requiredNodes = ComfyWorkflowParser.ExtractNodeTypes(workflow, log);
33+
var requiredNodes = ComfyWorkflowParser.ExtractRequiredNodeTypes(workflow, log);
3434
var requiredAssets = ComfyWorkflowParser.ExtractAssetPaths(workflow, log);
3535
var nodeDefs = appData.GetSupportedNodeDefinitions(requiredNodes, requiredAssets, agent);
3636
var apiPrompt = ComfyConverters.ConvertWorkflowToApiPrompt(workflow, nodeDefs, clientId, log:log);
@@ -83,7 +83,7 @@ public class NodeComfyWorkflowConverter(ILogger<NodeComfyWorkflowConverter> log,
8383
public async Task<ApiPromptResult> CreateApiPromptAsync(WorkflowVersion workflowVersion, Dictionary<string, object?> args, ComfyAgent? agent=null, string? clientId = null)
8484
{
8585
var workflow = workflowVersion.Workflow;
86-
var requiredNodes = ComfyWorkflowParser.ExtractNodeTypes(workflow, log);
86+
var requiredNodes = ComfyWorkflowParser.ExtractRequiredNodeTypes(workflow, log);
8787
var requiredAssets = ComfyWorkflowParser.ExtractAssetPaths(workflow, log);
8888
agent ??= appData.GetSupportedAgent(requiredNodes, requiredAssets);
8989
var nodeDefinitionPath = agent != null

MyApp.ServiceInterface/ComfyWorkflowParser.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,19 @@ public class ComfyWorkflowParser
2020
return nodesObj.Map(x => (Dictionary<string, object?>)x);
2121
}
2222

23-
public static List<string> IgnoreClientNodes { get; } =
23+
public static HashSet<string> IgnoreClientNodes { get; } =
2424
[
2525
"Note",
2626
"MarkdownNote",
2727
"Reroute",
2828
"PrimitiveNode",
29-
"PrimitiveNode",
3029
];
3130

31+
public static HashSet<string> ExtractRequiredNodeTypes(Dictionary<string, object?> workflow, ILogger? log = null)
32+
{
33+
return ExtractRequiredNodeTypes(workflow, IgnoreClientNodes, log);
34+
}
35+
3236
public static HashSet<string> ExtractRequiredNodeTypes(Dictionary<string, object?> workflow, HashSet<string> ignoreNodes, ILogger? log = null)
3337
{
3438
var workflowNodes = ExtractNodeTypes(workflow, log);
@@ -40,7 +44,7 @@ public static HashSet<string> ExtractRequiredNodeTypes(Dictionary<string, object
4044
return workflowNodes;
4145
}
4246

43-
public static HashSet<string> ExtractNodeTypes(Dictionary<string, object?> workflow, ILogger? log = null)
47+
static HashSet<string> ExtractNodeTypes(Dictionary<string, object?> workflow, ILogger? log = null)
4448
{
4549
log ??= NullLogger.Instance;
4650
var ret = new HashSet<string>();

0 commit comments

Comments
 (0)