From c01ff04f23026262827ca6636b4937a23d4340c5 Mon Sep 17 00:00:00 2001
From: Julian Bilcke <julian.bilcke@huggingface.co>
Date: Mon, 12 Aug 2024 18:01:15 +0200
Subject: [PATCH] fix

---
 .../providers/comfy-replicate/index.ts        |  2 +-
 .../{comfy => comfyui}/getComfyWorkflow.ts    |  0
 .../providers/{comfy => comfyui}/index.ts     |  0
 .../{comfy => comfyui}/temporary_demo.json    |  0
 src/app/api/resolve/providers/index.ts        |  1 +
 src/app/api/resolve/route.ts                  | 39 +++++++++++--------
 6 files changed, 24 insertions(+), 18 deletions(-)
 rename src/app/api/resolve/providers/{comfy => comfyui}/getComfyWorkflow.ts (100%)
 rename src/app/api/resolve/providers/{comfy => comfyui}/index.ts (100%)
 rename src/app/api/resolve/providers/{comfy => comfyui}/temporary_demo.json (100%)

diff --git a/src/app/api/resolve/providers/comfy-replicate/index.ts b/src/app/api/resolve/providers/comfy-replicate/index.ts
index e5521a5b..49fe55b9 100644
--- a/src/app/api/resolve/providers/comfy-replicate/index.ts
+++ b/src/app/api/resolve/providers/comfy-replicate/index.ts
@@ -1,7 +1,7 @@
 import { ClapSegmentStatus, getClapAssetSourceType } from '@aitube/clap'
 
 import { ResolveRequest } from '@aitube/clapper-services'
-import { getComfyWorkflow } from '../comfy/getComfyWorkflow'
+import { getComfyWorkflow } from '../comfyui/getComfyWorkflow'
 import { runWorkflow } from './runWorkflow'
 import { TimelineSegment } from '@aitube/timeline'
 
diff --git a/src/app/api/resolve/providers/comfy/getComfyWorkflow.ts b/src/app/api/resolve/providers/comfyui/getComfyWorkflow.ts
similarity index 100%
rename from src/app/api/resolve/providers/comfy/getComfyWorkflow.ts
rename to src/app/api/resolve/providers/comfyui/getComfyWorkflow.ts
diff --git a/src/app/api/resolve/providers/comfy/index.ts b/src/app/api/resolve/providers/comfyui/index.ts
similarity index 100%
rename from src/app/api/resolve/providers/comfy/index.ts
rename to src/app/api/resolve/providers/comfyui/index.ts
diff --git a/src/app/api/resolve/providers/comfy/temporary_demo.json b/src/app/api/resolve/providers/comfyui/temporary_demo.json
similarity index 100%
rename from src/app/api/resolve/providers/comfy/temporary_demo.json
rename to src/app/api/resolve/providers/comfyui/temporary_demo.json
diff --git a/src/app/api/resolve/providers/index.ts b/src/app/api/resolve/providers/index.ts
index 8f2cb77f..d1d1cf11 100644
--- a/src/app/api/resolve/providers/index.ts
+++ b/src/app/api/resolve/providers/index.ts
@@ -1,6 +1,7 @@
 export { resolveSegment as resolveSegmentUsingHuggingFace } from './huggingface'
 export { resolveSegment as resolveSegmentUsingComfyReplicate } from './comfy-replicate'
 export { resolveSegment as resolveSegmentUsingReplicate } from './replicate'
+export { resolveSegment as resolveSegmentUsingComfyUI } from './comfyui'
 export { resolveSegment as resolveSegmentUsingComfyIcu } from './comfy-comfyicu'
 export { resolveSegment as resolveSegmentUsingComfyDeploy } from './comfy-comfydeploy'
 export { resolveSegment as resolveSegmentUsingFalAi } from './falai'
diff --git a/src/app/api/resolve/route.ts b/src/app/api/resolve/route.ts
index 20f2e386..3d8bb681 100644
--- a/src/app/api/resolve/route.ts
+++ b/src/app/api/resolve/route.ts
@@ -20,6 +20,7 @@ import {
   resolveSegmentUsingAiTube,
   resolveSegmentUsingModelsLab,
   resolveSegmentUsingStabilityAi,
+  resolveSegmentUsingComfyUI,
 } from './providers'
 
 import { ResolveRequest } from '@aitube/clapper-services'
@@ -67,30 +68,34 @@ export async function POST(req: NextRequest) {
 
   // console.log(`API ResolveRequest = `, request.settings)
   const resolveSegment =
-    provider === ClapWorkflowProvider.HUGGINGFACE &&
-    engine === ClapWorkflowEngine.REST_API
-      ? resolveSegmentUsingHuggingFace
-      : provider === ClapWorkflowProvider.REPLICATE &&
-          engine === ClapWorkflowEngine.COMFYUI_WORKFLOW
+    engine === ClapWorkflowEngine.COMFYUI_WORKFLOW
+      ? provider === ClapWorkflowProvider.REPLICATE
         ? resolveSegmentUsingComfyReplicate
-        : provider === ClapWorkflowProvider.REPLICATE
-          ? resolveSegmentUsingReplicate
+        : provider === ClapWorkflowProvider.COMFYUI
+          ? resolveSegmentUsingComfyUI
           : provider === ClapWorkflowProvider.COMFYICU
             ? resolveSegmentUsingComfyIcu
             : provider === ClapWorkflowProvider.COMFYDEPLOY
               ? resolveSegmentUsingComfyDeploy
-              : provider === ClapWorkflowProvider.STABILITYAI
-                ? resolveSegmentUsingStabilityAi
-                : provider === ClapWorkflowProvider.FALAI
-                  ? resolveSegmentUsingFalAi
-                  : provider === ClapWorkflowProvider.MODELSLAB
-                    ? resolveSegmentUsingModelsLab
-                    : provider === ClapWorkflowProvider.AITUBE
-                      ? resolveSegmentUsingAiTube
-                      : null
+              : null
+      : provider === ClapWorkflowProvider.HUGGINGFACE
+        ? resolveSegmentUsingHuggingFace
+        : provider === ClapWorkflowProvider.REPLICATE
+          ? resolveSegmentUsingReplicate
+          : provider === ClapWorkflowProvider.STABILITYAI
+            ? resolveSegmentUsingStabilityAi
+            : provider === ClapWorkflowProvider.FALAI
+              ? resolveSegmentUsingFalAi
+              : provider === ClapWorkflowProvider.MODELSLAB
+                ? resolveSegmentUsingModelsLab
+                : provider === ClapWorkflowProvider.AITUBE
+                  ? resolveSegmentUsingAiTube
+                  : null
 
   if (!resolveSegment) {
-    throw new Error(`Provider ${provider} is not supported yet`)
+    throw new Error(
+      `Engine "${engine}" is not supported by "${provider}" yet. If you believe this is a mistake, please open a Pull Request (with working code) to fix it. Thank you!`
+    )
   }
 
   let segment = request.segment