fix: max_retries and retry_delay_multiplier, do not throw when pass the retry failed

comfy-nodes/external_boolean.py

@@ -8,16 +8,6 @@ class ComfyUIDeployExternalBoolean:
                     {"multiline": False, "default": "input_bool"},
                 ),
                 "default_value": ("BOOLEAN", {"default": False})
-            },
-            "optional": {
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -26,7 +16,7 @@ class ComfyUIDeployExternalBoolean:
     
     FUNCTION = "run"
     
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         print(f"Node '{input_id}' processing with switch set to {default_value}")
         return [default_value]
     

comfy-nodes/external_checkpoints.py

@@ -23,14 +23,6 @@ class ComfyUIDeployExternalCheckpoint:
             },
             "optional": {
                 "default_value": (folder_paths.get_filename_list("checkpoints"), ),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -41,7 +33,7 @@ class ComfyUIDeployExternalCheckpoint:
 
     CATEGORY = "deploy"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         import requests
         import os
         import uuid

comfy-nodes/external_image.py

@@ -15,14 +15,6 @@ class ComfyUIDeployExternalImage:
             },
             "optional": {
                 "default_value": ("IMAGE",),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -33,7 +25,7 @@ class ComfyUIDeployExternalImage:
 
     CATEGORY = "image"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         image = default_value
         try:
             if input_id.startswith('http'):

comfy-nodes/external_image_alpha.py

@@ -15,14 +15,6 @@ class ComfyUIDeployExternalImageAlpha:
             },
             "optional": {
                 "default_value": ("IMAGE",),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -33,7 +25,7 @@ class ComfyUIDeployExternalImageAlpha:
 
     CATEGORY = "image"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         image = default_value
         try:
             if input_id.startswith('http'):

comfy-nodes/external_image_batch.py

@@ -21,14 +21,6 @@ class ComfyUIDeployExternalImageBatch:
             },
             "optional": {
                 "default_value": ("IMAGE",),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -39,7 +31,7 @@ class ComfyUIDeployExternalImageBatch:
 
     CATEGORY = "image"
     
-    def run(self, input_id, images=None, default_value=None, display_name=None, description=None):
+    def run(self, input_id, images=None, default_value=None):
         processed_images = []
         try:
             images_list = json.loads(images)  # Assuming images is a JSON array string

comfy-nodes/external_lora.py

@@ -4,15 +4,12 @@ import numpy as np
 import torch
 import folder_paths
 
-
 class AnyType(str):
     def __ne__(self, __value: object) -> bool:
         return False
-
+        
-
 WILDCARD = AnyType("*")
 
-
 class ComfyUIDeployExternalLora:
     @classmethod
     def INPUT_TYPES(s):
@@ -25,18 +22,6 @@ class ComfyUIDeployExternalLora:
             },
             "optional": {
                 "default_lora_name": (folder_paths.get_filename_list("loras"),),
-                "lora_save_name": ( # if `default_lora_name` is a link to download a file, we will attempt to save it with this name
-                    "STRING",
-                    {"multiline": False, "default": ""},
-                ), 
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             },
         }
 
@@ -47,24 +32,17 @@ class ComfyUIDeployExternalLora:
 
     CATEGORY = "deploy"
 
-    def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None):
+    def run(self, input_id, default_lora_name=None):
         import requests
         import os
         import uuid
 
         if default_lora_name.startswith("http"):
-            if lora_save_name:
+            unique_filename = str(uuid.uuid4()) + ".safetensors"
-                existing_loras = folder_paths.get_filename_list("loras")
+            print(unique_filename)
-                # Check if lora_save_name exists in the list
-                if lora_save_name in existing_loras:
-                    print(f"using lora: {lora_save_name}")
-                    return (lora_save_name,)
-            else:
-                lora_save_name = str(uuid.uuid4()) + ".safetensors"
-            print(lora_save_name)
             print(folder_paths.folder_names_and_paths["loras"][0][0])
             destination_path = os.path.join(
-                folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
+                folder_paths.folder_names_and_paths["loras"][0][0], unique_filename
             )
             print(destination_path)
             print("Downloading external lora - " + input_id + " to " + destination_path)
@@ -75,7 +53,7 @@ class ComfyUIDeployExternalLora:
             )
             with open(destination_path, "wb") as out_file:
                 out_file.write(response.content)
-            return (lora_save_name,)
+            return (unique_filename,)
         else:
             print(f"using lora: {default_lora_name}")
             return (default_lora_name,)

comfy-nodes/external_number.py

@@ -16,15 +16,7 @@ class ComfyUIDeployExternalNumber:
             "optional": {
                 "default_value": (
                     "FLOAT",
-                    {"multiline": True, "display": "number", "default": 0, "min": -2147483647, "max": 2147483647, "step": 0.01},
+                    {"multiline": True, "display": "number", "default": 0, "step": 0.01},
-                ),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
                 ),
             }
         }
@@ -36,7 +28,7 @@ class ComfyUIDeployExternalNumber:
 
     CATEGORY = "number"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         try:
             float_value = float(input_id)
             print("my number", float_value)

comfy-nodes/external_number_int.py

@@ -16,15 +16,7 @@ class ComfyUIDeployExternalNumberInt:
             "optional": {
                 "default_value": (
                     "INT",
-                    {"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0},
+                    {"multiline": True, "display": "number", "default": 0},
-                ),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
                 ),
             }
         }
@@ -36,7 +28,7 @@ class ComfyUIDeployExternalNumberInt:
 
     CATEGORY = "number"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         if not input_id or (isinstance(input_id, str) and not input_id.strip().isdigit()):
             return [default_value]
         return [int(input_id)]

comfy-nodes/external_number_slider.py

@@ -11,23 +11,15 @@ class ComfyUIDeployExternalNumberSlider:
             "optional": {
                 "default_value": (
                     "FLOAT",
-                    {"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0.5, "step": 0.01},
+                    {"multiline": True, "display": "number", "default": 0.5, "step": 0.01},
                 ),
                 "min_value": (
                     "FLOAT",
-                    {"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0, "step": 0.01},
+                    {"multiline": True, "display": "number", "default": 0, "step": 0.01},
                 ),
                 "max_value": (
                     "FLOAT",
-                    {"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 1, "step": 0.01},
+                    {"multiline": True, "display": "number", "default": 1, "step": 0.01},
-                ),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
                 ),
             }
         }
@@ -39,7 +31,7 @@ class ComfyUIDeployExternalNumberSlider:
 
     CATEGORY = "number"
 
-    def run(self, input_id, default_value=None, min_value=0, max_value=1, display_name=None, description=None):
+    def run(self, input_id, default_value=None, min_value=0, max_value=1):
         try:
             float_value = float(input_id)
             if min_value <= float_value <= max_value:

comfy-nodes/external_text.py

@@ -18,14 +18,6 @@ class ComfyUIDeployExternalText:
                     "STRING",
                     {"multiline": True, "default": ""},
                 ),
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
             }
         }
 
@@ -36,7 +28,7 @@ class ComfyUIDeployExternalText:
 
     CATEGORY = "text"
 
-    def run(self, input_id, default_value=None, display_name=None, description=None):
+    def run(self, input_id, default_value=None):
         return [default_value]
 
 

comfy-nodes/external_text_list.py

@@ -1,52 +0,0 @@
-import folder_paths
-from PIL import Image, ImageOps
-import numpy as np
-import torch
-import json
-
-class ComfyUIDeployExternalTextList:
-    @classmethod
-    def INPUT_TYPES(s):
-        return {
-            "required": {
-                "input_id": (
-                    "STRING",
-                    {"multiline": False, "default": 'input_text_list'},
-                ),
-                 "text": (
-                    "STRING",
-                    {"multiline": True, "default": "[]"},
-                ),
-            },
-            "optional": {
-                "display_name": (
-                    "STRING",
-                    {"multiline": False, "default": "Name of the node (optional)"},
-                ),
-                "description": (
-                    "STRING",
-                    {"multiline": True, "default": "Description of the node (optional)"},
-                ),
-            }
-        }
-
-    RETURN_TYPES = ("STRING",)
-    RETURN_NAMES = ("text",)
-
-    OUTPUT_IS_LIST = (True,)
-
-    FUNCTION = "run"
-
-    CATEGORY = "text"
-
-    def run(self, input_id, text=None, display_name=None, description=None):
-        text_list = []
-        try:
-            text_list = json.loads(text)  # Assuming text is a JSON array string
-        except Exception as e:
-            print(f"Error processing images: {e}")
-            pass
-        return ([text_list],)
-
-NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalTextList": ComfyUIDeployExternalTextList}
-NODE_DISPLAY_NAME_MAPPINGS = {"ComfyUIDeployExternalTextList": "External Text List (ComfyUI Deploy)"}

comfy-nodes/external_video.py

@@ -765,14 +765,6 @@ class ComfyUIDeployExternalVideo:
                     "meta_batch": ("VHS_BatchManager",),
                     "vae": ("VAE",),
                     "default_value": (sorted(files),),
-                    "display_name": (
-                        "STRING",
-                        {"multiline": False, "default": "Name of the node (optional)"},
-                    ),
-                    "description": (
-                        "STRING",
-                        {"multiline": True, "default": "Description of the node (optional)"},
-                    ),
                 },
                 "hidden": {
                     "unique_id": "UNIQUE_ID"
@@ -804,6 +796,8 @@ class ComfyUIDeployExternalVideo:
         meta_batch = kwargs.get("meta_batch")
         unique_id = kwargs.get("unique_id")
 
+        video = kwargs.get("default_value")
+        video_path = folder_paths.get_annotated_filepath(video.strip('"'))
 
         input_dir = folder_paths.get_input_directory()
         if input_id.startswith("http"):
@@ -833,11 +827,8 @@ class ComfyUIDeployExternalVideo:
                     leave=True,
                 ):
                     out_file.write(chunk)
-        else:
+
-            video = kwargs.get("default_value", "")
+        print("video path: ", video_path)
-            if video is None:
-                raise "No default video given and no external video provided"
-            video_path = folder_paths.get_annotated_filepath(video.strip('"'))
 
         return load_video_cv(
             video=video_path,

custom_routes.py

@@ -17,13 +17,12 @@ from urllib.parse import quote
 import threading
 import hashlib
 import aiohttp
-from aiohttp import ClientSession, web
 import aiofiles
 from typing import Dict, List, Union, Any, Optional
 from PIL import Image
 import copy
 import struct
-from aiohttp import web, ClientSession, ClientError, ClientTimeout
+from aiohttp import ClientError
 import atexit
 
 # Global session
@@ -51,7 +50,7 @@ def exit_handler():
 
 atexit.register(exit_handler)
 
-max_retries = int(os.environ.get('MAX_RETRIES', '5'))
+max_retries = int(os.environ.get('MAX_RETRIES', '3'))
 retry_delay_multiplier = float(os.environ.get('RETRY_DELAY_MULTIPLIER', '2'))
 
 print(f"max_retries: {max_retries}, retry_delay_multiplier: {retry_delay_multiplier}")
@@ -60,31 +59,19 @@ async def async_request_with_retry(method, url, **kwargs):
     global client_session
     await ensure_client_session()
     retry_delay = 1  # Start with 1 second delay
-    initial_timeout = 5  # 5 seconds timeout for the initial connection
 
     for attempt in range(max_retries):
         try:
-            # Set a timeout for the initial connection
-            timeout = ClientTimeout(total=None, connect=initial_timeout)
-            kwargs['timeout'] = timeout
-
             async with client_session.request(method, url, **kwargs) as response:
                 response.raise_for_status()
                 return response
-        except asyncio.TimeoutError:
-            logger.warning(f"Request timed out after {initial_timeout} seconds (attempt {attempt + 1}/{max_retries})")
         except ClientError as e:
             if attempt == max_retries - 1:
                 logger.error(f"Request failed after {max_retries} attempts: {e}")
                 # raise
             logger.warning(f"Request failed (attempt {attempt + 1}/{max_retries}): {e}")
-        
+            await asyncio.sleep(retry_delay)
-        # Wait before retrying
+            retry_delay *= retry_delay_multiplier  # Exponential backoff
-        await asyncio.sleep(retry_delay)
-        retry_delay *= retry_delay_multiplier  # Exponential backoff
-
-    # If all retries fail, raise an exception
-    raise Exception(f"Request failed after {max_retries} attempts")
 
 from logging import basicConfig, getLogger
 
@@ -121,8 +108,7 @@ def log_span(name):
     if use_logfire:
         with logger.span(name):
             yield
-    else:
+    # else:
-        yield
     #     logger.info(f"Start: {name}")
     #     yield
     #     logger.info(f"End: {name}")
@@ -234,23 +220,9 @@ def apply_random_seed_to_workflow(workflow_api):
             if isinstance(workflow_api[key]['inputs']['seed'], list):
                 continue
             if workflow_api[key]['class_type'] == "PromptExpansion":
-                workflow_api[key]['inputs']['seed'] = randomSeed(8)
+                workflow_api[key]['inputs']['seed'] = randomSeed(8);
-                logger.info(f"Applied random seed {workflow_api[key]['inputs']['seed']} to PromptExpansion")
                 continue
-            if workflow_api[key]['class_type'] == "RandomNoise":
+            workflow_api[key]['inputs']['seed'] = randomSeed();
-                workflow_api[key]['inputs']['noise_seed'] = randomSeed()
-                logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to RandomNoise")
-                continue
-            if workflow_api[key]['class_type'] == "KSamplerAdvanced":
-                workflow_api[key]['inputs']['noise_seed'] = randomSeed()
-                logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to KSamplerAdvanced")
-                continue
-            if workflow_api[key]['class_type'] == "SamplerCustom":
-                workflow_api[key]['inputs']['noise_seed'] = randomSeed()
-                logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to SamplerCustom")
-                continue
-            workflow_api[key]['inputs']['seed'] = randomSeed()
-            logger.info(f"Applied random seed {workflow_api[key]['inputs']['seed']} to {workflow_api[key]['class_type']}")
 
 def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
     # Loop through each of the inputs and replace them
@@ -376,7 +348,7 @@ async def comfy_deploy_run(request):
 
     status = 200
 
-    if "node_errors" in res and res["node_errors"] is not None and len(res["node_errors"]) > 0:
+    if "node_errors" in res and res["node_errors"]:
         # Even tho there are node_errors it can still be run
         status = 400
         await update_run_with_output(prompt_id, {
@@ -414,7 +386,7 @@ async def stream_prompt(data):
         workflow_api=workflow_api
     )
 
-    # log('info', "Begin prompt", prompt=prompt)
+    log('info', "Begin prompt", prompt=prompt)
 
     try:
         res = post_prompt(prompt)
@@ -437,7 +409,7 @@ async def stream_prompt(data):
 
     status = 200
 
-    if "node_errors" in res and res["node_errors"] is not None and len(res["node_errors"]) > 0:
+    if "node_errors" in res and res["node_errors"]:
         # Even tho there are node_errors it can still be run
         status = 400
         await update_run_with_output(prompt_id, {
@@ -481,7 +453,7 @@ async def stream_response(request):
                     if not comfy_message_queues[prompt_id].empty():
                         data = await comfy_message_queues[prompt_id].get()
 
-                        # log('info', data["event"], data=json.dumps(data))
+                        log('info', data["event"], data=json.dumps(data))
                         # logger.info("listener", data)
                         await response.write(f"event: event_update\ndata: {json.dumps(data)}\n\n".encode('utf-8'))
                         await response.drain()  # Ensure the buffer is flushed
@@ -848,51 +820,7 @@ async def send(event, data, sid=None):
     except Exception as e:
         logger.info(f"Exception: {e}")
         traceback.print_exc()
-        
-@server.PromptServer.instance.routes.get('/comfydeploy/{tail:.*}')
-@server.PromptServer.instance.routes.post('/comfydeploy/{tail:.*}')
-async def proxy_to_comfydeploy(request):
-    # Get the base URL
-    base_url = f'https://www.comfydeploy.com/{request.match_info["tail"]}'
-    
-    # Get all query parameters
-    query_params = request.query_string
-    
-    # Construct the full target URL with query parameters
-    target_url = f"{base_url}?{query_params}" if query_params else base_url
-    
-    # print(f"Proxying request to: {target_url}")
 
-    try:
-        # Create a new ClientSession for each request
-        async with ClientSession() as client_session:
-            # Forward the request
-            client_req = await client_session.request(
-                method=request.method,
-                url=target_url,
-                headers={k: v for k, v in request.headers.items() if k.lower() not in ('host', 'content-length')},
-                data=await request.read(),
-                allow_redirects=False,
-            )
-
-            # Read the entire response content
-            content = await client_req.read()
-
-            # Try to decode the content as JSON
-            try:
-                json_data = json.loads(content)
-                # If successful, return a JSON response
-                return web.json_response(json_data, status=client_req.status)
-            except json.JSONDecodeError:
-                # If it's not valid JSON, return the content as-is
-                return web.Response(body=content, status=client_req.status, headers=client_req.headers)
-
-    except ClientError as e:
-        print(f"Client error occurred while proxying request: {str(e)}")
-        return web.Response(status=502, text=f"Bad Gateway: {str(e)}")
-    except Exception as e:
-        print(f"Error occurred while proxying request: {str(e)}")
-        return web.Response(status=500, text=f"Internal Server Error: {str(e)}")
 
 
 prompt_server = server.PromptServer.instance

requirements.txt

@@ -2,5 +2,4 @@ aiofiles
 pydantic
 opencv-python
 imageio-ffmpeg
-brotli
 # logfire

web-plugin/index.js

@@ -2,7 +2,6 @@ import { app } from "./app.js";
 import { api } from "./api.js";
 import { ComfyWidgets, LGraphNode } from "./widgets.js";
 import { generateDependencyGraph } from "https://esm.sh/[email protected]";
-import { ComfyDeploy } from "https://esm.sh/[email protected]";
 
 const loadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><g fill="none" stroke="#888888" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity=".3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
 
@@ -207,26 +206,14 @@ const ext = {
         ComfyWidgets.STRING(
           this,
           "workflow_name",
-          [
+          ["", { default: this.properties.workflow_name, multiline: false }],
-            "",
-            {
-              default: this.properties.workflow_name,
-              multiline: false,
-            },
-          ],
           app,
         );
 
         ComfyWidgets.STRING(
           this,
           "workflow_id",
-          [
+          ["", { default: this.properties.workflow_id, multiline: false }],
-            "",
-            {
-              default: this.properties.workflow_id,
-              multiline: false,
-            },
-          ],
           app,
         );
 
@@ -291,11 +278,7 @@ const ext = {
           sendEventToCD("cd_plugin_onDeployChanges", prompt);
         } else if (message.type === "queue_prompt") {
           const prompt = await app.graphToPrompt();
-          if (typeof api.handlePromptGenerated === "function") {
+          api.handlePromptGenerated(prompt);
-            api.handlePromptGenerated(prompt);
-          } else {
-            console.warn("api.handlePromptGenerated is not a function");
-          }
           sendEventToCD("cd_plugin_onQueuePrompt", prompt);
         } else if (message.type === "get_prompt") {
           const prompt = await app.graphToPrompt();
@@ -318,56 +301,6 @@ const ext = {
 
           app.graph.add(node);
           app.graph.afterChange();
-        } else if (message.type === "zoom_to_node") {
-          const nodeId = message.data.nodeId;
-          const position = message.data.position;
-
-          const node = app.graph.getNodeById(nodeId);
-          if (!node) return;
-
-          const canvas = app.canvas;
-          const targetScale = 1;
-          const targetOffsetX =
-            canvas.canvas.width / 4 - position[0] - node.size[0] / 2;
-          const targetOffsetY =
-            canvas.canvas.height / 4 - position[1] - node.size[1] / 2;
-
-          const startScale = canvas.ds.scale;
-          const startOffsetX = canvas.ds.offset[0];
-          const startOffsetY = canvas.ds.offset[1];
-
-          const duration = 400; // Animation duration in milliseconds
-          const startTime = Date.now();
-
-          function easeOutCubic(t) {
-            return 1 - Math.pow(1 - t, 3);
-          }
-
-          function lerp(start, end, t) {
-            return start * (1 - t) + end * t;
-          }
-
-          function animate() {
-            const currentTime = Date.now();
-            const elapsedTime = currentTime - startTime;
-            const t = Math.min(elapsedTime / duration, 1);
-
-            const easedT = easeOutCubic(t);
-
-            const currentScale = lerp(startScale, targetScale, easedT);
-            const currentOffsetX = lerp(startOffsetX, targetOffsetX, easedT);
-            const currentOffsetY = lerp(startOffsetY, targetOffsetY, easedT);
-
-            canvas.setZoom(currentScale);
-            canvas.ds.offset = [currentOffsetX, currentOffsetY];
-            canvas.draw(true, true);
-
-            if (t < 1) {
-              requestAnimationFrame(animate);
-            }
-          }
-
-          animate();
         }
         // else if (message.type === "refresh") {
         //   sendEventToCD("cd_plugin_onRefresh");
@@ -431,10 +364,10 @@ function createDynamicUIHtml(data) {
           <h3 style="font-size: 14px; font-weight: semibold; margin-bottom: 8px;">Missing Nodes</h3>
           <p style="font-size: 12px;">These nodes are not found with any matching custom_nodes in the ComfyUI Manager Database</p>
           ${data.missing_nodes
-            .map((node) => {
+        .map((node) => {
-              return `<p style="font-size: 14px; color: #d69e2e;">${node}</p>`;
+          return `<p style="font-size: 14px; color: #d69e2e;">${node}</p>`;
-            })
+        })
-            .join("")}
+        .join("")}
       </div>
   `;
   }
@@ -442,17 +375,14 @@ function createDynamicUIHtml(data) {
   Object.values(data.custom_nodes).forEach((node) => {
     html += `
           <div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
-              <a href="${
+              <a href="${node.url
-                node.url
+      }" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${node.name
-              }" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${
+      }</a>
-                node.name
-              }</a>
               <p style="font-size: 14px; color: #4b5563;">${node.hash}</p>
-              ${
+              ${node.warning
-                node.warning
+        ? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
-                  ? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
+        : ""
-                  : ""
+      }
-              }
           </div>
       `;
   });
@@ -466,9 +396,8 @@ function createDynamicUIHtml(data) {
   Object.entries(data.models).forEach(([section, items]) => {
     html += `
     <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
-        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
+        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
-          section.charAt(0).toUpperCase() + section.slice(1)
+      }</h3>`;
-        }</h3>`;
     items.forEach((item) => {
       html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
     });
@@ -484,9 +413,8 @@ function createDynamicUIHtml(data) {
   Object.entries(data.files).forEach(([section, items]) => {
     html += `
     <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
-        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
+        <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
-          section.charAt(0).toUpperCase() + section.slice(1)
+      }</h3>`;
-        }</h3>`;
     items.forEach((item) => {
       html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
     });
@@ -498,7 +426,6 @@ function createDynamicUIHtml(data) {
   return html;
 }
 
-// Modify the existing deployWorkflow function
 async function deployWorkflow() {
   const deploy = document.getElementById("deploy-button");
 
@@ -645,30 +572,30 @@ async function deployWorkflow() {
         console.log(hash);
         return hash.file_hash;
       },
-      //   handleFileUpload: async (file, hash, prevhash) => {
+      handleFileUpload: async (file, hash, prevhash) => {
-      //     console.log("Uploading ", file);
+        console.log("Uploading ", file);
-      //     loadingDialog.showLoading("Uploading file", file);
+        loadingDialog.showLoading("Uploading file", file);
-      //     try {
+        try {
-      //       const { download_url } = await fetch(`/comfyui-deploy/upload-file`, {
+          const { download_url } = await fetch(`/comfyui-deploy/upload-file`, {
-      //         method: "POST",
+            method: "POST",
-      //         body: JSON.stringify({
+            body: JSON.stringify({
-      //           file_path: file,
+              file_path: file,
-      //           token: apiKey,
+              token: apiKey,
-      //           url: endpoint + "/api/upload-url",
+              url: endpoint + "/api/upload-url",
-      //         }),
+            }),
-      //       })
+          })
-      //         .then((x) => x.json())
+            .then((x) => x.json())
-      //         .catch(() => {
+            .catch(() => {
-      //           loadingDialog.close();
+              loadingDialog.close();
-      //           confirmDialog.confirm("Error", "Unable to upload file " + file);
+              confirmDialog.confirm("Error", "Unable to upload file " + file);
-      //         });
+            });
-      //       loadingDialog.showLoading("Uploaded file", file);
+          loadingDialog.showLoading("Uploaded file", file);
-      //       console.log(download_url);
+          console.log(download_url);
-      //       return download_url;
+          return download_url;
-      //     } catch (error) {
+        } catch (error) {
-      //       return undefined;
+          return undefined;
-      //     }
+        }
-      //   },
+      },
       existingDependencies: existing_workflow.dependencies,
     });
 
@@ -693,15 +620,6 @@ async function deployWorkflow() {
       "Check dependencies",
       // JSON.stringify(deps, null, 2),
       `
-      <div>
-        You will need to create a cloud machine with the following configuration on ComfyDeploy
-        <ol style="text-align: left; margin-top: 10px;">
-            <li>Review the dependencies listed in the graph below</li>
-            <li>Create a new cloud machine with the required configuration</li>
-            <li>Install missing models and check missing files</li>
-            <li>Deploy your workflow to the newly created machine</li>
-        </ol>
-      </div>
       <div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">${loadingIcon}</div>
       <iframe 
       style="z-index: 10; min-width: 600px; max-width: 1024px; min-height: 600px; border: none; background-color: transparent;"
@@ -771,14 +689,6 @@ async function deployWorkflow() {
       `<span style="color:green;">Deployed successfully!</span>  <a style="color:white;" target="_blank" href=${endpoint}/workflows/${data.workflow_id}>-> View here</a> <br/> <br/> Workflow ID: ${data.workflow_id} <br/> Workflow Name: ${workflow_name} <br/> Workflow Version: ${data.version} <br/>`,
     );
 
-    // // Refresh the workflows list in the sidebar
-    // const sidebarEl = document.querySelector(
-    //   '.comfy-sidebar-tab[data-id="search"]',
-    // );
-    // if (sidebarEl) {
-    //   refreshWorkflowsList(sidebarEl);
-    // }
-
     setTimeout(() => {
       title.textContent = "Deploy";
       title.style.color = "white";
@@ -796,85 +706,6 @@ async function deployWorkflow() {
   }
 }
 
-// Add this function to refresh the workflows list
-function refreshWorkflowsList(el) {
-  const workflowsList = el.querySelector("#workflows-list");
-  const workflowsLoading = el.querySelector("#workflows-loading");
-
-  workflowsLoading.style.display = "flex";
-  workflowsList.style.display = "none";
-  workflowsList.innerHTML = "";
-
-  client.workflows
-    .getAll({
-      page: "1",
-      pageSize: "10",
-    })
-    .then((result) => {
-      workflowsLoading.style.display = "none";
-      workflowsList.style.display = "block";
-
-      if (result.length === 0) {
-        workflowsList.innerHTML =
-          "<li style='color: #bdbdbd;'>No workflows found</li>";
-        return;
-      }
-
-      result.forEach((workflow) => {
-        const li = document.createElement("li");
-        li.style.marginBottom = "15px";
-        li.style.padding = "15px";
-        li.style.backgroundColor = "#2a2a2a";
-        li.style.borderRadius = "8px";
-        li.style.boxShadow = "0 2px 4px rgba(0,0,0,0.1)";
-
-        const lastRun = workflow.runs[0];
-        const lastRunStatus = lastRun ? lastRun.status : "No runs";
-        const statusColor =
-          lastRunStatus === "success"
-            ? "#4CAF50"
-            : lastRunStatus === "error"
-              ? "#F44336"
-              : "#FFC107";
-
-        const timeAgo = getTimeAgo(new Date(workflow.updatedAt));
-
-        li.innerHTML = `
-          <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
-            <div style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
-              <strong style="font-size: 18px; color: #e0e0e0;">${workflow.name}</strong>
-            </div>
-            <span style="font-size: 12px; color: ${statusColor}; margin-left: 10px;">Last run: ${lastRunStatus}</span>
-          </div>
-          <div style="font-size: 14px; color: #bdbdbd; margin-bottom: 10px;">Last updated ${timeAgo}</div>
-          <div style="display: flex; gap: 10px;">
-            <button class="open-cloud-btn" style="padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 4px; cursor: pointer;">Open in Cloud</button>
-            <button class="load-api-btn" style="padding: 5px 10px; background-color: #2196F3; color: white; border: none; border-radius: 4px; cursor: pointer;">Load Workflow</button>
-          </div>
-        `;
-
-        const openCloudBtn = li.querySelector(".open-cloud-btn");
-        openCloudBtn.onclick = () =>
-          window.open(
-            `${getData().endpoint}/workflows/${workflow.id}?workspace=true`,
-            "_blank",
-          );
-
-        const loadApiBtn = li.querySelector(".load-api-btn");
-        loadApiBtn.onclick = () => loadWorkflowApi(workflow.versions[0].id);
-
-        workflowsList.appendChild(li);
-      });
-    })
-    .catch((error) => {
-      console.error("Error fetching workflows:", error);
-      workflowsLoading.style.display = "none";
-      workflowsList.style.display = "block";
-      workflowsList.innerHTML =
-        "<li style='color: #F44336;'>Error fetching workflows</li>";
-    });
-}
-
 function addButton() {
   const menu = document.querySelector(".comfy-menu");
 
@@ -1006,14 +837,12 @@ 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} ${
+        <h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${this.loadingIcon
-          this.loadingIcon
+      }</h3>
-        }</h3>
+          ${message
-          ${
+        ? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
-            message
+        : ""
-              ? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
+      }
-              : ""
-          }
         </div>
       `);
   }
@@ -1279,21 +1108,17 @@ export class ConfigDialog extends ComfyDialog {
     </label>
       <label style="color: white; width: 100%;">
         Endpoint:
-        <input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${
+        <input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${data.endpoint
-          data.endpoint
+      }">
-        }">
       </label>
       <div style="color: white;">
-        API Key: User / Org <button style="font-size: 18px;">${
+        API Key: User / Org <button style="font-size: 18px;">${data.displayName ?? ""
-          data.displayName ?? ""
+      }</button>
-        }</button>
+        <input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${data.apiKey
-        <input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${
+      }">
-          data.apiKey
-        }">
         <button id="loginButton" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;">
-          ${
+          ${data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
-            data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
+      }
-          }
         </button>
       </div>
       </div>
@@ -1367,118 +1192,3 @@ export class ConfigDialog extends ComfyDialog {
 }
 
 export const configDialog = new ConfigDialog();
-
-const currentOrigin = window.location.origin;
-const client = new ComfyDeploy({
-  bearerAuth: getData().apiKey,
-  serverURL: `${currentOrigin}/comfydeploy/api/`,
-});
-
-app.extensionManager.registerSidebarTab({
-  id: "search",
-  icon: "pi pi-cloud-upload",
-  title: "Deploy",
-  tooltip: "Deploy and Configure",
-  type: "custom",
-  render: (el) => {
-    el.innerHTML = `
-      <div style="padding: 20px;">
-        <h3>Comfy Deploy</h3>
-        <div id="deploy-container" style="margin-bottom: 20px;"></div>
-        <div id="workflows-container">
-          <h4>Your Workflows</h4>
-          <div id="workflows-loading" style="display: flex; justify-content: center; align-items: center; height: 100px;">
-            ${loadingIcon}
-          </div>
-          <ul id="workflows-list" style="list-style-type: none; padding: 0; display: none;"></ul>
-        </div>
-        <div id="config-container"></div>
-      </div>
-    `;
-
-    // Add deploy button
-    const deployContainer = el.querySelector("#deploy-container");
-    const deployButton = document.createElement("button");
-    deployButton.id = "sidebar-deploy-button";
-    deployButton.style.display = "flex";
-    deployButton.style.alignItems = "center";
-    deployButton.style.justifyContent = "center";
-    deployButton.style.width = "100%";
-    deployButton.style.marginBottom = "10px";
-    deployButton.style.padding = "10px";
-    deployButton.style.fontSize = "16px";
-    deployButton.style.fontWeight = "bold";
-    deployButton.style.backgroundColor = "#4CAF50";
-    deployButton.style.color = "white";
-    deployButton.style.border = "none";
-    deployButton.style.borderRadius = "5px";
-    deployButton.style.cursor = "pointer";
-    deployButton.innerHTML = `<i class="pi pi-cloud-upload" style="margin-right: 8px;"></i><div id='sidebar-button-title'>Deploy</div>`;
-    deployButton.onclick = async () => {
-      await deployWorkflow();
-      // Refresh the workflows list after deployment
-      refreshWorkflowsList(el);
-    };
-    deployContainer.appendChild(deployButton);
-
-    // Add config button
-    const configContainer = el.querySelector("#config-container");
-    const configButton = document.createElement("button");
-    configButton.style.display = "flex";
-    configButton.style.alignItems = "center";
-    configButton.style.justifyContent = "center";
-    configButton.style.width = "100%";
-    configButton.style.padding = "8px";
-    configButton.style.fontSize = "14px";
-    configButton.style.backgroundColor = "#f0f0f0";
-    configButton.style.color = "#333";
-    configButton.style.border = "1px solid #ccc";
-    configButton.style.borderRadius = "5px";
-    configButton.style.cursor = "pointer";
-    configButton.innerHTML = `<i class="pi pi-cog" style="margin-right: 8px;"></i>Configure`;
-    configButton.onclick = () => {
-      configDialog.show();
-    };
-    deployContainer.appendChild(configButton);
-
-    // Fetch and display workflows
-    const workflowsList = el.querySelector("#workflows-list");
-    const workflowsLoading = el.querySelector("#workflows-loading");
-
-    refreshWorkflowsList(el);
-  },
-});
-
-function getTimeAgo(date) {
-  const seconds = Math.floor((new Date() - date) / 1000);
-  let interval = seconds / 31536000;
-  if (interval > 1) return Math.floor(interval) + " years ago";
-  interval = seconds / 2592000;
-  if (interval > 1) return Math.floor(interval) + " months ago";
-  interval = seconds / 86400;
-  if (interval > 1) return Math.floor(interval) + " days ago";
-  interval = seconds / 3600;
-  if (interval > 1) return Math.floor(interval) + " hours ago";
-  interval = seconds / 60;
-  if (interval > 1) return Math.floor(interval) + " minutes ago";
-  return Math.floor(seconds) + " seconds ago";
-}
-
-async function loadWorkflowApi(versionId) {
-  try {
-    const response = await client.comfyui.getWorkflowVersionVersionId({
-      versionId: versionId,
-    });
-    // Implement the logic to load the workflow API into the ComfyUI interface
-    console.log("Workflow API loaded:", response);
-    await window["app"].ui.settings.setSettingValueAsync(
-      "Comfy.Validation.Workflows",
-      false,
-    );
-    app.loadGraphData(response.workflow);
-    // You might want to update the UI or trigger some action in ComfyUI here
-  } catch (error) {
-    console.error("Error loading workflow API:", error);
-    // Show an error message to the user
-  }
-}

web/src/routes/registerCreateRunRoute.ts

@@ -51,9 +51,7 @@ const createRunRoute = createRoute({
 export const registerCreateRunRoute = (app: App) => {
   app.openapi(createRunRoute, async (c) => {
     const data = c.req.valid("json");
-    const proto = c.req.headers.get('x-forwarded-proto')  || "http";
+    const origin = new URL(c.req.url).origin;
-    const host = c.req.headers.get('x-forwarded-host') || c.req.headers.get('host');
-    const origin = `${proto}://${host}` || new URL(c.req.url).origin;
     const apiKeyTokenData = c.get("apiKeyTokenData")!;
 
     const { deployment_id, inputs } = data;