chore: add log

comfy-nodes/external_lora.py

@@ -25,10 +25,10 @@ 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
+                "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": ""},
@@ -51,15 +51,7 @@ class ComfyUIDeployExternalLora:
 
     CATEGORY = "deploy"
 
-    def run(
+    def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None, lora_url=None):
-        self,
-        input_id,
-        default_lora_name=None,
-        lora_save_name=None,
-        display_name=None,
-        description=None,
-        lora_url=None,
-    ):
         import requests
         import os
         import uuid
@@ -79,9 +71,9 @@ class ComfyUIDeployExternalLora:
                 folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
             )
             print(destination_path)
-            print("Downloading external lora - " + lora_url + " to " + destination_path)
+            print("Downloading external lora - " + input_id + " to " + destination_path)
             response = requests.get(
-                lora_url,
+                input_id,
                 headers={"User-Agent": "Mozilla/5.0"},
                 allow_redirects=True,
             )

comfy-nodes/external_video.py

@@ -764,7 +764,7 @@ class ComfyUIDeployExternalVideo:
                 "optional": {
                     "meta_batch": ("VHS_BatchManager",),
                     "vae": ("VAE",),
-                    "default_video": (sorted(files),),
+                    "default_value": (sorted(files),),
                     "display_name": (
                         "STRING",
                         {"multiline": False, "default": ""},
@@ -834,7 +834,7 @@ class ComfyUIDeployExternalVideo:
                 ):
                     out_file.write(chunk)
         else:
-            video = kwargs.get("default_video", None)
+            video = kwargs.get("default_value", "")
             if video is None:
                 raise "No default video given and no external video provided"
             video_path = folder_paths.get_annotated_filepath(video.strip('"'))

custom_routes.py

@@ -59,7 +59,7 @@ print(f"max_retries: {max_retries}, retry_delay_multiplier: {retry_delay_multipl
 
 import time
 
-async def async_request_with_retry(method, url, disable_timeout=False, token=None, **kwargs):
+async def async_request_with_retry(method, url, disable_timeout=False, **kwargs):
     global client_session
     await ensure_client_session()
     retry_delay = 1  # Start with 1 second delay
@@ -72,11 +72,6 @@ async def async_request_with_retry(method, url, disable_timeout=False, token=Non
                 timeout = ClientTimeout(total=None, connect=initial_timeout)
                 kwargs['timeout'] = timeout
 
-            if token is not None:
-                if 'headers' not in kwargs:
-                    kwargs['headers'] = {}
-                kwargs['headers']['Authorization'] = f"Bearer {token}"
-
             request_start = time.time()
             async with client_session.request(method, url, **kwargs) as response:
                 request_end = time.time()
@@ -366,14 +361,6 @@ def send_prompt(sid: str, inputs: StreamingPrompt):
 
 @server.PromptServer.instance.routes.post("/comfyui-deploy/run")
 async def comfy_deploy_run(request):
-    # Extract the bearer token from the Authorization header
-    auth_header = request.headers.get('Authorization')
-    token = None
-    if auth_header:
-        parts = auth_header.split()
-        if len(parts) == 2 and parts[0].lower() == 'bearer':
-            token = parts[1]
-
     data = await request.json()
 
     # In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
@@ -389,14 +376,13 @@ async def comfy_deploy_run(request):
     prompt = {
         "prompt": workflow_api,
         "client_id": "comfy_deploy_instance", #api.client_id
-        "prompt_id": prompt_id,
+        "prompt_id": prompt_id
     }
 
     prompt_metadata[prompt_id] = SimplePrompt(
         status_endpoint=data.get('status_endpoint'),
         file_upload_endpoint=data.get('file_upload_endpoint'),
-        workflow_api=workflow_api,
+        workflow_api=workflow_api
-        token=token
     )
 
     try:
@@ -434,7 +420,7 @@ async def comfy_deploy_run(request):
 
     return web.json_response(res, status=status)
 
-async def stream_prompt(data, token):
+async def stream_prompt(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
@@ -454,8 +440,7 @@ async def stream_prompt(data, token):
     prompt_metadata[prompt_id] = SimplePrompt(
         status_endpoint=data.get('status_endpoint'),
         file_upload_endpoint=data.get('file_upload_endpoint'),
-        workflow_api=workflow_api,
+        workflow_api=workflow_api
-        token=token
     )
 
     # log('info', "Begin prompt", prompt=prompt)
@@ -504,14 +489,6 @@ comfy_message_queues: Dict[str, asyncio.Queue] = {}
 async def stream_response(request):
     response = web.StreamResponse(status=200, reason='OK', headers={'Content-Type': 'text/event-stream'})
     await response.prepare(request)
-    
-    # Extract the bearer token from the Authorization header
-    auth_header = request.headers.get('Authorization')
-    token = None
-    if auth_header:
-        parts = auth_header.split()
-        if len(parts) == 2 and parts[0].lower() == 'bearer':
-            token = parts[1]
 
     pending = True
     data = await request.json()
@@ -523,7 +500,7 @@ async def stream_response(request):
         log('info', 'Streaming prompt')
 
         try:
-            result = await stream_prompt(data=data, token=token)
+            result = await stream_prompt(data=data)
             await response.write(f"event: event_update\ndata: {json.dumps(result)}\n\n".encode('utf-8'))
             # await response.write(.encode('utf-8'))
             await response.drain()  # Ensure the buffer is flushed
@@ -1068,7 +1045,6 @@ async def update_run_live_status(prompt_id, live_status, calculated_progress: fl
         return
 
     status_endpoint = prompt_metadata[prompt_id].status_endpoint
-    token = prompt_metadata[prompt_id].token
 
     if (status_endpoint is None):
         return
@@ -1092,7 +1068,7 @@ async def update_run_live_status(prompt_id, live_status, calculated_progress: fl
         })
 
     # requests.post(status_endpoint, json=body)
-    await async_request_with_retry('POST', status_endpoint, token=token, json=body)
+    await async_request_with_retry('POST', status_endpoint, json=body)
 
 
 async def update_run(prompt_id: str, status: Status):
@@ -1123,8 +1099,7 @@ async def update_run(prompt_id: str, status: Status):
         try:
             # requests.post(status_endpoint, json=body)
             if (status_endpoint is not None):
-                token = prompt_metadata[prompt_id].token
+                await async_request_with_retry('POST', status_endpoint, json=body)
-                await async_request_with_retry('POST', status_endpoint, token=token, json=body)
 
             if (status_endpoint is not None) and cd_enable_run_log and (status == Status.SUCCESS or status == Status.FAILED):
                 try:
@@ -1154,7 +1129,7 @@ async def update_run(prompt_id: str, status: Status):
                             ]
                         }
 
-                        await async_request_with_retry('POST', status_endpoint, token=token, json=body)
+                        await async_request_with_retry('POST', status_endpoint, json=body)
                         # requests.post(status_endpoint, json=body)
                 except Exception as log_error:
                     logger.info(f"Error reading log file: {log_error}")
@@ -1205,7 +1180,7 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
     logger.info(f"Uploading file {file}")
 
     file_upload_endpoint = prompt_metadata[prompt_id].file_upload_endpoint
-    token = prompt_metadata[prompt_id].token
+
     filename = quote(filename)
     prompt_id = quote(prompt_id)
     content_type = quote(content_type)
@@ -1217,7 +1192,7 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
 
         start_time = time.time()  # Start timing here
         logger.info(f"Target URL: {target_url}")
-        result = await async_request_with_retry("GET", target_url, disable_timeout=True, token=token)
+        result = await async_request_with_retry("GET", target_url, disable_timeout=True)
         end_time = time.time()  # End timing after the request is complete
         logger.info("Time taken for getting file upload endpoint: {:.2f} seconds".format(end_time - start_time))
         ok = await result.json()
@@ -1244,8 +1219,6 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
             if file_download_url is not None:
                 item["url"] = file_download_url
             item["upload_duration"] = end_time - start_time
-            if ok.get("is_public") is not None:
-                item["is_public"] = ok.get("is_public")
 
 def have_pending_upload(prompt_id):
     if prompt_id in prompt_metadata and len(prompt_metadata[prompt_id].uploading_nodes) > 0:
@@ -1379,7 +1352,6 @@ async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=T
         await asyncio.gather(*upload_tasks)
 
         status_endpoint = prompt_metadata[prompt_id].status_endpoint
-        token = prompt_metadata[prompt_id].token
         if have_upload:
             if status_endpoint is not None:
                 body = {
@@ -1388,7 +1360,7 @@ async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=T
                     "node_meta": node_meta,
                 }
                 # pprint(body)
-                await async_request_with_retry('POST', status_endpoint, token=token, json=body)
+                await async_request_with_retry('POST', status_endpoint, json=body)
             await update_file_status(prompt_id, data, False, node_id=node_id)
     except Exception as e:
         await handle_error(prompt_id, data, e)
@@ -1426,8 +1398,7 @@ async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None):
             await handle_error(prompt_id, data, e)
     # requests.post(status_endpoint, json=body)
     elif status_endpoint is not None:
-        token = prompt_metadata[prompt_id].token
+        await async_request_with_retry('POST', status_endpoint, json=body)
-        await async_request_with_retry('POST', status_endpoint, token=token, json=body)
 
     await send('outputs_uploaded', {
         "prompt_id": prompt_id

globals.py

@@ -29,8 +29,6 @@ class SimplePrompt(BaseModel):
     status_endpoint: Optional[str]
     file_upload_endpoint: Optional[str]
     
-    token: Optional[str]
-    
     workflow_api: dict
     status: Status = Status.NOT_STARTED
     progress: set = set()