Merge branch 'main' of github.com:jbilcke-hf/clapper

jbilcke-hf · Aug 27, 2024 · 21f95fb · 21f95fb
2 parents 2ef7f4c + 7dd23bb
commit 21f95fb
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/packages/app/src/services/settings/workflows/parseWorkflow.ts b/packages/app/src/services/settings/workflows/parseWorkflow.ts
@@ -49,10 +49,18 @@ export function parseWorkflow(
       throw new Error(`the workflow data seems invalid`)
     }
     if (maybeWorkflow.engine == ClapWorkflowEngine.COMFYUI_WORKFLOW) {
-      const { inputFields, inputValues } =
-        convertComfyUiWorkflowApiToClapWorkflow(maybeWorkflow.data)
-      maybeWorkflow.inputFields = inputFields
-      maybeWorkflow.inputValues = inputValues
+      // The `data` comfyui workflow doesn't have info about custom
+      // inputFields/inputValues, it gets only the default ones based on the nodes
+      const {
+        inputFields: defaultInputFields,
+        inputValues: defaultInputValues,
+      } = convertComfyUiWorkflowApiToClapWorkflow(maybeWorkflow.data)
+      // Use the already existing inputFields/inputValues, otherwise use the default
+      // ones based on the raw comfyui workflow data
+      maybeWorkflow.inputFields =
+        maybeWorkflow.inputFields || defaultInputFields
+      maybeWorkflow.inputValues =
+        maybeWorkflow.inputValues || defaultInputValues
     }
     return maybeWorkflow
   } catch (err) {