Bump CD ver to 2.3.2 in Manager

README.md

@@ -2,8 +2,6 @@
 
 Open source comfyui deployment platform, a `vercel` for generative workflow infra. (serverless hosted gpu with vertical intergation with comfyui)
 
-Check out our latest lcoal demo -> https://github.com/comfy-deploy/comfyui-api-comfydeploy
-
 > [!NOTE]  
 > Im looking for creative hacker to join ComfyDeploy's core team! DM me on [twitter](https://x.com/BennyKokMusic)
 

custom_routes.py

@@ -579,6 +579,22 @@ async def comfy_deploy_run(request):
     data = await request.json()
 
     client_id = data.get("client_id")
+    # We proxy the request to Comfy Deploy, this is a native run
+    if "is_native_run" in data:
+        async with aiohttp.ClientSession() as session:
+            # pprint(data)
+            # headers = request.headers.copy()
+            # headers['Content-Type'] = 'application/json'
+            async with session.post(
+                data.get("native_run_api_endpoint"),
+                json=data,
+                headers={
+                    "Content-Type": "application/json",
+                    "Authorization": request.headers.get("Authorization"),
+                },
+            ) as response:
+                data = await response.json()
+                # print(data)
 
     if "cd_token" in data:
         token = data["cd_token"]
@@ -590,24 +606,6 @@ async def comfy_deploy_run(request):
             if len(parts) == 2 and parts[0].lower() == "bearer":
                 token = parts[1]
 
-    # We proxy the request to Comfy Deploy, this is a native run
-    if "is_native_run" in data:
-        async with aiohttp.ClientSession() as session:
-            data.pop("cd_token", None)
-            # pprint(data)
-            # headers = request.headers.copy()
-            # headers['Content-Type'] = 'application/json'
-            async with session.post(
-                data.get("native_run_api_endpoint"),
-                json=data,
-                headers={
-                    "Content-Type": "application/json",
-                    "Authorization": "Bearer " + token,
-                },
-            ) as response:
-                data = await response.json()
-                # print(data)
-
     # In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
     workflow_api = data.get("workflow_api_raw")
     # The prompt id generated from comfy deploy, can be None
@@ -674,14 +672,6 @@ async def comfy_deploy_run(request):
     return web.json_response(res, status=status)
 
 
-@server.PromptServer.instance.routes.post("/comfyui-deploy/interrupt")
-async def interrupt_prompt(request):
-    data = await request.json()
-    prompt_id = data.get("prompt_id")
-    await update_run(prompt_id, Status.CANCELLED)
-    return web.json_response({"message": "Prompt interrupted"}, status=200)
-
-
 async def stream_prompt(data, token):
     # In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
     workflow_api = data.get("workflow_api_raw")

globals.py

@@ -18,7 +18,6 @@ class Status(Enum):
     SUCCESS = "success"
     FAILED = "failed"
     UPLOADING = "uploading"
-    CANCELLED = "cancelled"
 
 
 class StreamingPrompt(BaseModel):

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-deploy"
 description = "Open source comfyui deployment platform, a vercel for generative workflow infra."
-version = "2.3.4"
+version = "2.3.2"
 license = { file = "LICENSE" }
 dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg", "tabulate", "brotli"]
 

web-plugin/index.js

@@ -538,7 +538,9 @@ const ext = {
         }
         if (toInput.length) {
           if (true) {
-            let optionIndex = options.findIndex((o) => o && o.content === "Outputs");
+            options.push();
+
+            let optionIndex = options.findIndex((o) => o.content === "Outputs");
             if (optionIndex === -1) optionIndex = options.length;
             else optionIndex++;
             options.splice(
@@ -735,7 +737,7 @@ const ext = {
           "string",
           inputName,
           /* value=*/ "",
-          () => { },
+          () => {},
           { serialize: true }
         );
 
@@ -1718,12 +1720,14 @@ export class LoadingDialog extends ComfyDialog {
   showLoading(title, message) {
     this.show(`
       <div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
-        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${this.loadingIcon
-      }</h3>
-          ${message
-        ? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
-        : ""
-      }
+        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${
+      this.loadingIcon
+    }</h3>
+          ${
+            message
+              ? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
+              : ""
+          }
         </div>
       `);
   }
@@ -2308,10 +2312,12 @@ export class ConfigDialog extends ComfyDialog {
                 transition: all 0.2s ease;
                 box-sizing: border-box;
               " onfocus="this.style.borderColor='#0ea5e9'; this.style.background='#252525'; this.style.boxShadow='0 0 0 3px rgba(14, 165, 233, 0.1)'" onblur="this.style.borderColor='#404040'; this.style.background='#1a1a1a'; this.style.boxShadow='none'" onmouseover="this.style.borderColor='#525252'" onmouseout="if(document.activeElement !== this) this.style.borderColor='#404040'">
-                <option value="cloud" ${data.environment === "cloud" ? "selected" : ""
-      }>☁️ Cloud Deployment</option>
-                <option value="local" ${data.environment === "local" ? "selected" : ""
-      }>🏠 Local Development</option>
+                <option value="cloud" ${
+                  data.environment === "cloud" ? "selected" : ""
+                }>☁️ Cloud Deployment</option>
+                <option value="local" ${
+                  data.environment === "local" ? "selected" : ""
+                }>🏠 Local Development</option>
               </select>
               <div style="
                 position: absolute;
@@ -2376,8 +2382,9 @@ export class ConfigDialog extends ComfyDialog {
                 text-transform: uppercase;
                 letter-spacing: 0.5px;
               ">API Key</label>
-              ${data.displayName
-        ? `
+              ${
+                data.displayName
+                  ? `
                 <div style="
                   background: linear-gradient(135deg, #0ea5e9, #3b82f6);
                   color: white;
@@ -2396,8 +2403,8 @@ export class ConfigDialog extends ComfyDialog {
                   ${data.displayName}
                 </div>
               `
-        : ""
-      }
+                  : ""
+              }
             </div>
             <input 
               id="apiKey" 
@@ -2443,10 +2450,11 @@ export class ConfigDialog extends ComfyDialog {
                 <polyline points="10,17 15,12 10,7"/>
                 <line x1="15" y1="12" x2="3" y2="12"/>
               </svg>
-              ${data.apiKey
-        ? "Re-authenticate with ComfyDeploy"
-        : "Login with ComfyDeploy"
-      }
+              ${
+                data.apiKey
+                  ? "Re-authenticate with ComfyDeploy"
+                  : "Login with ComfyDeploy"
+              }
             </button>
           </div>
         </div>
@@ -2672,63 +2680,38 @@ const orginal_fetch_api = api.fetchApi;
 api.fetchApi = async (route, options) => {
   // console.log("Fetch API called with args:", route, options, ext.native_mode);
 
-  if (ext.native_mode) {
-    if (route.startsWith("/prompt")) {
-      const info = await getSelectedWorkflowInfo();
+  if (route.startsWith("/prompt") && ext.native_mode) {
+    const info = await getSelectedWorkflowInfo();
 
-      if (!info.workflow_id) {
-        console.log("No workflow id found, fallback to original fetch");
-        return await orginal_fetch_api.call(api, route, options);
-      }
+    if (!info.workflow_id) {
+      console.log("No workflow id found, fallback to original fetch");
+      return await orginal_fetch_api.call(api, route, options);
+    }
 
-      console.log("info", info);
-      if (info) {
-        const body = JSON.parse(options.body);
-
-        const data = {
-          client_id: body.client_id,
-          workflow_api_json: body.prompt,
-          workflow: body?.extra_data?.extra_pnginfo?.workflow,
-          is_native_run: true,
-          machine_id: info.machine_id,
-          workflow_id: info.workflow_id,
-          native_run_api_endpoint: info.native_run_api_endpoint,
-          gpu_event_id: info.gpu_event_id,
-          gpu: info.gpu,
-          cd_token: info.cd_token,
-        };
-
-        return await fetch("/comfyui-deploy/run", {
-          method: "POST",
-          headers: {
-            // Authorization: `Bearer ${info.cd_token}`,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify(data),
-        });
-      }
-    } else if (route.startsWith("/interrupt")) {
-      const info = await getSelectedWorkflowInfo();
-
-      if (!info.workflow_id) {
-        console.log("No workflow id found, fallback to original fetch");
-        return await orginal_fetch_api.call(api, route, options);
-      }
+    console.log("info", info);
+    if (info) {
       const body = JSON.parse(options.body);
+
       const data = {
-        prompt_id: body.prompt_id,
-        cd_token: info.cd_token,
+        client_id: body.client_id,
+        workflow_api_json: body.prompt,
+        workflow: body?.extra_data?.extra_pnginfo?.workflow,
+        is_native_run: true,
+        machine_id: info.machine_id,
+        workflow_id: info.workflow_id,
+        native_run_api_endpoint: info.native_run_api_endpoint,
+        gpu_event_id: info.gpu_event_id,
+        gpu: info.gpu,
       };
-      const original_response = await orginal_fetch_api.call(api, route, options);
-      await fetch("/comfyui-deploy/interrupt", {
+
+      return await fetch("/comfyui-deploy/run", {
         method: "POST",
         headers: {
-          // Authorization: `Bearer ${info.cd_token}`,
+          Authorization: `Bearer ${info.cd_token}`,
           "Content-Type": "application/json",
         },
         body: JSON.stringify(data),
       });
-      return original_response;
     }
   }