fix

jbilcke-hf · Aug 12, 2024 · c01ff04 · c01ff04
1 parent f8cc0c9
commit c01ff04
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git 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/...solve/providers/comfy/getComfyWorkflow.ts → ...lve/providers/comfyui/getComfyWorkflow.ts b/...solve/providers/comfy/getComfyWorkflow.ts → ...lve/providers/comfyui/getComfyWorkflow.ts
diff --git a/src/app/api/resolve/providers/comfy/index.ts → ...pp/api/resolve/providers/comfyui/index.ts b/src/app/api/resolve/providers/comfy/index.ts → ...pp/api/resolve/providers/comfyui/index.ts
diff --git a/...solve/providers/comfy/temporary_demo.json → ...lve/providers/comfyui/temporary_demo.json b/...solve/providers/comfy/temporary_demo.json → ...lve/providers/comfyui/temporary_demo.json
diff --git 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
@@ -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