Compare commits

..
Author SHA1 Message Date
nick f5940ac899 better 2024-08-20 19:43:04 -07:00
nick 67703abb8a syntax 2024-08-20 19:41:23 -07:00
nick dfee31f0ed fix: noise seed 2024-08-20 19:36:29 -07:00
14 changed files with 164 additions and 227 deletions
+2 -2
View File
@@ -12,11 +12,11 @@ class ComfyUIDeployExternalBoolean:
"optional": { "optional": {
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -25,11 +25,11 @@ class ComfyUIDeployExternalCheckpoint:
"default_value": (folder_paths.get_filename_list("checkpoints"), ), "default_value": (folder_paths.get_filename_list("checkpoints"), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -17,11 +17,11 @@ class ComfyUIDeployExternalImage:
"default_value": ("IMAGE",), "default_value": ("IMAGE",),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -17,11 +17,11 @@ class ComfyUIDeployExternalImageAlpha:
"default_value": ("IMAGE",), "default_value": ("IMAGE",),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -23,11 +23,11 @@ class ComfyUIDeployExternalImageBatch:
"default_value": ("IMAGE",), "default_value": ("IMAGE",),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+8 -20
View File
@@ -25,21 +25,17 @@ class ComfyUIDeployExternalLora:
}, },
"optional": { "optional": {
"default_lora_name": (folder_paths.get_filename_list("loras"),), "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", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": ""},
), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
),
"lora_url": (
"STRING",
{"multiline": False, "default": ""},
), ),
}, },
} }
@@ -51,20 +47,12 @@ class ComfyUIDeployExternalLora:
CATEGORY = "deploy" CATEGORY = "deploy"
def run( def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None):
self,
input_id,
default_lora_name=None,
lora_save_name=None,
display_name=None,
description=None,
lora_url=None,
):
import requests import requests
import os import os
import uuid import uuid
if lora_url and lora_url.startswith("http"): if default_lora_name.startswith("http"):
if lora_save_name: if lora_save_name:
existing_loras = folder_paths.get_filename_list("loras") existing_loras = folder_paths.get_filename_list("loras")
# Check if lora_save_name exists in the list # Check if lora_save_name exists in the list
@@ -79,9 +67,9 @@ class ComfyUIDeployExternalLora:
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
) )
print(destination_path) print(destination_path)
print("Downloading external lora - " + lora_url + " to " + destination_path) print("Downloading external lora - " + input_id + " to " + destination_path)
response = requests.get( response = requests.get(
lora_url, input_id,
headers={"User-Agent": "Mozilla/5.0"}, headers={"User-Agent": "Mozilla/5.0"},
allow_redirects=True, allow_redirects=True,
) )
+2 -2
View File
@@ -20,11 +20,11 @@ class ComfyUIDeployExternalNumber:
), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -20,11 +20,11 @@ class ComfyUIDeployExternalNumberInt:
), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -23,11 +23,11 @@ class ComfyUIDeployExternalNumberSlider:
), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -20,11 +20,11 @@ class ComfyUIDeployExternalText:
), ),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+2 -2
View File
@@ -21,11 +21,11 @@ class ComfyUIDeployExternalTextList:
"optional": { "optional": {
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
} }
} }
+4 -4
View File
@@ -764,14 +764,14 @@ class ComfyUIDeployExternalVideo:
"optional": { "optional": {
"meta_batch": ("VHS_BatchManager",), "meta_batch": ("VHS_BatchManager",),
"vae": ("VAE",), "vae": ("VAE",),
"default_video": (sorted(files),), "default_value": (sorted(files),),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": "Name of the node (optional)"},
), ),
"description": ( "description": (
"STRING", "STRING",
{"multiline": True, "default": ""}, {"multiline": True, "default": "Description of the node (optional)"},
), ),
}, },
"hidden": { "hidden": {
@@ -834,7 +834,7 @@ class ComfyUIDeployExternalVideo:
): ):
out_file.write(chunk) out_file.write(chunk)
else: else:
video = kwargs.get("default_video", None) video = kwargs.get("default_value", "")
if video is None: if video is None:
raise "No default video given and no external video provided" raise "No default video given and no external video provided"
video_path = folder_paths.get_annotated_filepath(video.strip('"')) video_path = folder_paths.get_annotated_filepath(video.strip('"'))
+44 -94
View File
@@ -1,5 +1,4 @@
from io import BytesIO from io import BytesIO
from pprint import pprint
from aiohttp import web from aiohttp import web
import os import os
import requests import requests
@@ -34,7 +33,7 @@ client_session = None
# global client_session # global client_session
# if client_session is None: # if client_session is None:
# client_session = aiohttp.ClientSession() # client_session = aiohttp.ClientSession()
async def ensure_client_session(): async def ensure_client_session():
global client_session global client_session
if client_session is None: if client_session is None:
@@ -44,7 +43,7 @@ async def cleanup():
global client_session global client_session
if client_session: if client_session:
await client_session.close() await client_session.close()
def exit_handler(): def exit_handler():
print("Exiting the application. Initiating cleanup...") print("Exiting the application. Initiating cleanup...")
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
@@ -57,60 +56,39 @@ retry_delay_multiplier = float(os.environ.get('RETRY_DELAY_MULTIPLIER', '2'))
print(f"max_retries: {max_retries}, retry_delay_multiplier: {retry_delay_multiplier}") print(f"max_retries: {max_retries}, retry_delay_multiplier: {retry_delay_multiplier}")
import time
async def async_request_with_retry(method, url, disable_timeout=False, **kwargs): async def async_request_with_retry(method, url, disable_timeout=False, **kwargs):
global client_session global client_session
await ensure_client_session() await ensure_client_session()
# async with aiohttp.ClientSession() as client_session:
retry_delay = 1 # Start with 1 second delay retry_delay = 1 # Start with 1 second delay
initial_timeout = 5 # 5 seconds timeout for the initial connection initial_timeout = 5 # 5 seconds timeout for the initial connection
start_time = time.time()
for attempt in range(max_retries): for attempt in range(max_retries):
try: try:
# Set a timeout for the initial connection
if not disable_timeout: if not disable_timeout:
timeout = ClientTimeout(total=None, connect=initial_timeout) timeout = ClientTimeout(total=None, connect=initial_timeout)
kwargs['timeout'] = timeout kwargs['timeout'] = timeout
request_start = time.time()
async with client_session.request(method, url, **kwargs) as response: async with client_session.request(method, url, **kwargs) as response:
request_end = time.time()
logger.info(f"Request attempt {attempt + 1} took {request_end - request_start:.2f} seconds")
if response.status != 200:
error_body = await response.text()
logger.error(f"Request failed with status {response.status} and body {error_body}")
# raise Exception(f"Request failed with status {response.status}")
response.raise_for_status() response.raise_for_status()
if method.upper() == 'GET': if method.upper() == 'GET':
await response.read() await response.read()
total_time = time.time() - start_time
logger.info(f"Request succeeded after {total_time:.2f} seconds (attempt {attempt + 1}/{max_retries})")
return response return response
except asyncio.TimeoutError: except asyncio.TimeoutError:
logger.warning(f"Request timed out after {initial_timeout} seconds (attempt {attempt + 1}/{max_retries})") logger.warning(f"Request timed out after {initial_timeout} seconds (attempt {attempt + 1}/{max_retries})")
except ClientError as e: except ClientError as e:
end_time = time.time()
logger.error(f"Request failed (attempt {attempt + 1}/{max_retries}): {e}")
logger.error(f"Time taken for failed attempt: {end_time - request_start:.2f} seconds")
logger.error(f"Total time elapsed: {end_time - start_time:.2f} seconds")
# Log the response body for ClientError as well
if hasattr(e, 'response') and e.response is not None:
error_body = await e.response.text()
logger.error(f"Error response body: {error_body}")
if attempt == max_retries - 1: if attempt == max_retries - 1:
logger.error(f"Request failed after {max_retries} attempts: {e}") logger.error(f"Request failed after {max_retries} attempts: {e}")
raise # raise
logger.warning(f"Request failed (attempt {attempt + 1}/{max_retries}): {e}")
await asyncio.sleep(retry_delay)
retry_delay *= retry_delay_multiplier
total_time = time.time() - start_time # Wait before retrying
raise Exception(f"Request failed after {max_retries} attempts and {total_time:.2f} seconds") 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 from logging import basicConfig, getLogger
@@ -138,7 +116,7 @@ def log(level, message, **kwargs):
getattr(logger, level)(message, **kwargs) getattr(logger, level)(message, **kwargs)
else: else:
getattr(logger, level)(f"{message} {kwargs}") getattr(logger, level)(f"{message} {kwargs}")
# For a span, you might need to create a context manager # For a span, you might need to create a context manager
from contextlib import contextmanager from contextlib import contextmanager
@@ -281,7 +259,7 @@ def apply_random_seed_to_workflow(workflow_api):
logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to SamplerCustom") logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to SamplerCustom")
continue continue
def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None): def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str | None = None):
# Loop through each of the inputs and replace them # Loop through each of the inputs and replace them
for key, value in workflow_api.items(): for key, value in workflow_api.items():
if 'inputs' in value: if 'inputs' in value:
@@ -314,7 +292,7 @@ def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
value['inputs']["images"] = new_value value['inputs']["images"] = new_value
if value["class_type"] == "ComfyUIDeployExternalLora": if value["class_type"] == "ComfyUIDeployExternalLora":
value["inputs"]["lora_url"] = new_value value["inputs"]["default_lora_name"] = new_value
if value["class_type"] == "ComfyUIDeployExternalSlider": if value["class_type"] == "ComfyUIDeployExternalSlider":
value["inputs"]["default_value"] = new_value value["inputs"]["default_value"] = new_value
@@ -629,10 +607,9 @@ async def upload_file_endpoint(request):
with open(file_path, 'rb') as f: with open(file_path, 'rb') as f:
headers = { headers = {
"Content-Type": file_type, "Content-Type": file_type,
# "Content-Length": str(file_size) # "x-amz-acl": "public-read",
"Content-Length": str(file_size)
} }
if content.get('include_acl') is True:
headers["x-amz-acl"] = "public-read"
upload_response = await async_request_with_retry('PUT', upload_url, data=f, headers=headers) upload_response = await async_request_with_retry('PUT', upload_url, data=f, headers=headers)
if upload_response.status == 200: if upload_response.status == 200:
return web.json_response({ return web.json_response({
@@ -878,19 +855,19 @@ async def send(event, data, sid=None):
except Exception as e: except Exception as e:
logger.info(f"Exception: {e}") logger.info(f"Exception: {e}")
traceback.print_exc() traceback.print_exc()
@server.PromptServer.instance.routes.get('/comfydeploy/{tail:.*}') @server.PromptServer.instance.routes.get('/comfydeploy/{tail:.*}')
@server.PromptServer.instance.routes.post('/comfydeploy/{tail:.*}') @server.PromptServer.instance.routes.post('/comfydeploy/{tail:.*}')
async def proxy_to_comfydeploy(request): async def proxy_to_comfydeploy(request):
# Get the base URL # Get the base URL
base_url = f'https://www.comfydeploy.com/{request.match_info["tail"]}' base_url = f'https://www.comfydeploy.com/{request.match_info["tail"]}'
# Get all query parameters # Get all query parameters
query_params = request.query_string query_params = request.query_string
# Construct the full target URL with query parameters # Construct the full target URL with query parameters
target_url = f"{base_url}?{query_params}" if query_params else base_url target_url = f"{base_url}?{query_params}" if query_params else base_url
# print(f"Proxying request to: {target_url}") # print(f"Proxying request to: {target_url}")
try: try:
@@ -1015,22 +992,17 @@ async def send_json_override(self, event, data, sid=None):
# await update_run_with_output(prompt_id, data) # await update_run_with_output(prompt_id, data)
if event == 'executed' and 'node' in data and 'output' in data: if event == 'executed' and 'node' in data and 'output' in data:
node_meta = None
if prompt_id in prompt_metadata: if prompt_id in prompt_metadata:
node = data.get('node') node = data.get('node')
class_type = prompt_metadata[prompt_id].workflow_api[node]['class_type'] class_type = prompt_metadata[prompt_id].workflow_api[node]['class_type']
logger.info(f"Executed {class_type} {data}") logger.info(f"Executed {class_type} {data}")
node_meta = {
"node_id": node,
"node_class": class_type,
}
if class_type == "PreviewImage": if class_type == "PreviewImage":
logger.info("Skipping preview image") logger.info("Skipping preview image")
return return
else: else:
logger.info(f"Executed {data}") logger.info(f"Executed {data}")
await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node'), node_meta=node_meta) await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node'))
# await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node')) # await update_run_with_output(prompt_id, data.get('output'), node_id=data.get('node'))
# update_run_with_output(prompt_id, data.get('output')) # update_run_with_output(prompt_id, data.get('output'))
@@ -1150,7 +1122,7 @@ async def update_run(prompt_id: str, status: Status):
}) })
async def upload_file(prompt_id, filename, subfolder=None, content_type="image/png", type="output", item=None): async def upload_file(prompt_id, filename, subfolder=None, content_type="image/png", type="output"):
""" """
Uploads file to S3 bucket using S3 client object Uploads file to S3 bucket using S3 client object
:return: None :return: None
@@ -1185,40 +1157,28 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
prompt_id = quote(prompt_id) prompt_id = quote(prompt_id)
content_type = quote(content_type) content_type = quote(content_type)
target_url = f"{file_upload_endpoint}?file_name={filename}&run_id={prompt_id}&type={content_type}&version=v2"
start_time = time.time() # Start timing here
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()
start_time = time.time() # Start timing here
async with aiofiles.open(file, 'rb') as f: async with aiofiles.open(file, 'rb') as f:
data = await f.read() data = await f.read()
size = str(len(data))
target_url = f"{file_upload_endpoint}?file_name={filename}&run_id={prompt_id}&type={content_type}&version=v2"
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)
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()
logger.info(f"Result: {ok}")
start_time = time.time() # Start timing here
headers = { headers = {
# "x-amz-acl": "public-read",
"Content-Type": content_type, "Content-Type": content_type,
# "Content-Length": size, "Content-Length": str(len(data)),
} }
if ok.get('include_acl') is True:
headers["x-amz-acl"] = "public-read"
# response = requests.put(ok.get("url"), headers=headers, data=data) # response = requests.put(ok.get("url"), headers=headers, data=data)
response = await async_request_with_retry('PUT', ok.get("url"), headers=headers, data=data) response = await async_request_with_retry('PUT', ok.get("url"), headers=headers, data=data)
logger.info(f"Upload file response status: {response.status}, status text: {response.reason}") logger.info(f"Upload file response status: {response.status}, status text: {response.reason}")
end_time = time.time() # End timing after the request is complete end_time = time.time() # End timing after the request is complete
logger.info("Upload time: {:.2f} seconds".format(end_time - start_time)) logger.info("Upload time: {:.2f} seconds".format(end_time - start_time))
if item is not None:
file_download_url = ok.get("download_url")
if file_download_url is not None:
item["url"] = file_download_url
item["upload_duration"] = end_time - start_time
def have_pending_upload(prompt_id): def have_pending_upload(prompt_id):
if prompt_id in prompt_metadata and len(prompt_metadata[prompt_id].uploading_nodes) > 0: if prompt_id in prompt_metadata and len(prompt_metadata[prompt_id].uploading_nodes) > 0:
@@ -1332,15 +1292,14 @@ async def handle_upload(prompt_id: str, data, key: str, content_type_key: str, d
item.get("filename"), item.get("filename"),
subfolder=item.get("subfolder"), subfolder=item.get("subfolder"),
type=item.get("type"), type=item.get("type"),
content_type=file_type, content_type=file_type
item=item
)) ))
# Execute all upload tasks concurrently # Execute all upload tasks concurrently
await asyncio.gather(*upload_tasks) await asyncio.gather(*upload_tasks)
# Upload files in the background # Upload files in the background
async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True, node_meta=None): async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True):
try: try:
upload_tasks = [ upload_tasks = [
handle_upload(prompt_id, data, 'images', "content_type", "image/png"), handle_upload(prompt_id, data, 'images', "content_type", "image/png"),
@@ -1351,21 +1310,12 @@ async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=T
await asyncio.gather(*upload_tasks) await asyncio.gather(*upload_tasks)
status_endpoint = prompt_metadata[prompt_id].status_endpoint
if have_upload: if have_upload:
if status_endpoint is not None:
body = {
"run_id": prompt_id,
"output_data": data,
"node_meta": node_meta,
}
# pprint(body)
await async_request_with_retry('POST', status_endpoint, json=body)
await update_file_status(prompt_id, data, False, node_id=node_id) await update_file_status(prompt_id, data, False, node_id=node_id)
except Exception as e: except Exception as e:
await handle_error(prompt_id, data, e) await handle_error(prompt_id, data, e)
async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None): async def update_run_with_output(prompt_id, data, node_id=None):
if prompt_id not in prompt_metadata: if prompt_id not in prompt_metadata:
return return
@@ -1376,8 +1326,7 @@ async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None):
body = { body = {
"run_id": prompt_id, "run_id": prompt_id,
"output_data": data, "output_data": data
"node_meta": node_meta,
} }
have_upload_media = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data have_upload_media = 'images' in data or 'files' in data or 'gifs' in data or 'mesh' in data
if bypass_upload and have_upload_media: if bypass_upload and have_upload_media:
@@ -1391,13 +1340,14 @@ async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None):
if have_upload_media: if have_upload_media:
await update_file_status(prompt_id, data, True, node_id=node_id) await update_file_status(prompt_id, data, True, node_id=node_id)
asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload_media, node_meta=node_meta)) asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload_media))
# await upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload) # await upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload)
except Exception as e: except Exception as e:
await handle_error(prompt_id, data, e) await handle_error(prompt_id, data, e)
# requests.post(status_endpoint, json=body) # requests.post(status_endpoint, json=body)
elif status_endpoint is not None: if status_endpoint is not None:
await async_request_with_retry('POST', status_endpoint, json=body) await async_request_with_retry('POST', status_endpoint, json=body)
await send('outputs_uploaded', { await send('outputs_uploaded', {
@@ -1457,4 +1407,4 @@ if cd_enable_log:
@server.PromptServer.instance.routes.get("/comfyui-deploy/filename_list_cache") @server.PromptServer.instance.routes.get("/comfyui-deploy/filename_list_cache")
async def get_filename_list_cache(_): async def get_filename_list_cache(_):
from folder_paths import filename_list_cache from folder_paths import filename_list_cache
return web.json_response({'filename_list': filename_list_cache}) return web.json_response({'filename_list': filename_list_cache})
+88 -89
View File
@@ -192,13 +192,11 @@ const ext = {
registerCustomNodes() { registerCustomNodes() {
/** @type {LGraphNode}*/ /** @type {LGraphNode}*/
class ComfyDeploy extends LGraphNode { class ComfyDeploy {
color = LGraphCanvas.node_colors.yellow.color;
bgcolor = LGraphCanvas.node_colors.yellow.bgcolor;
groupcolor = LGraphCanvas.node_colors.yellow.groupcolor;
constructor() { constructor() {
super();
this.color = LGraphCanvas.node_colors.yellow.color;
this.bgcolor = LGraphCanvas.node_colors.yellow.bgcolor;
this.groupcolor = LGraphCanvas.node_colors.yellow.groupcolor;
if (!this.properties) { if (!this.properties) {
this.properties = {}; this.properties = {};
this.properties.workflow_name = ""; this.properties.workflow_name = "";
@@ -206,75 +204,65 @@ const ext = {
this.properties.version = ""; this.properties.version = "";
} }
this.addWidget( ComfyWidgets.STRING(
"text", this,
"workflow_name", "workflow_name",
this.properties.workflow_name, [
(v) => { "",
this.properties.workflow_name = v; {
}, default: this.properties.workflow_name,
{ multiline: false } multiline: false,
},
],
app,
); );
this.addWidget( ComfyWidgets.STRING(
"text", this,
"workflow_id", "workflow_id",
this.properties.workflow_id, [
(v) => { "",
this.properties.workflow_id = v; {
}, default: this.properties.workflow_id,
{ multiline: false } multiline: false,
},
],
app,
); );
this.addWidget( ComfyWidgets.STRING(
"text", this,
"version", "version",
this.properties.version, ["", { default: this.properties.version, multiline: false }],
(v) => { app,
this.properties.version = v;
},
{ multiline: false }
); );
// this.widgets.forEach((w) => {
// // w.computeSize = () => [200,10]
// w.computedHeight = 2;
// })
this.widgets_start_y = 10; this.widgets_start_y = 10;
this.setSize(this.computeSize());
// const config = { };
// console.log(this);
this.serialize_widgets = true; this.serialize_widgets = true;
this.isVirtualNode = true; this.isVirtualNode = true;
} }
onExecute() {
// This method is called when the node is executed
// You can add any necessary logic here
}
onSerialize(o) {
// This method is called when the node is being serialized
// Ensure all necessary data is saved
if (!o.properties) {
o.properties = {};
}
o.properties.workflow_name = this.properties.workflow_name;
o.properties.workflow_id = this.properties.workflow_id;
o.properties.version = this.properties.version;
}
onConfigure(o) {
// This method is called when the node is being configured (e.g., when loading a saved graph)
// Ensure all necessary data is restored
if (o.properties) {
this.properties = { ...this.properties, ...o.properties };
this.widgets[0].value = this.properties.workflow_name || "";
this.widgets[1].value = this.properties.workflow_id || "";
this.widgets[2].value = this.properties.version || "1";
}
}
} }
// Register the node type // Load default visibility
LiteGraph.registerNodeType("ComfyDeploy", Object.assign(ComfyDeploy, {
title: "Comfy Deploy", LiteGraph.registerNodeType(
title_mode: LiteGraph.NORMAL_TITLE, "ComfyDeploy",
collapsable: true, Object.assign(ComfyDeploy, {
})); title_mode: LiteGraph.NORMAL_TITLE,
title: "Comfy Deploy",
collapsable: true,
}),
);
ComfyDeploy.category = "deploy"; ComfyDeploy.category = "deploy";
}, },
@@ -443,10 +431,10 @@ function createDynamicUIHtml(data) {
<h3 style="font-size: 14px; font-weight: semibold; margin-bottom: 8px;">Missing Nodes</h3> <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> <p style="font-size: 12px;">These nodes are not found with any matching custom_nodes in the ComfyUI Manager Database</p>
${data.missing_nodes ${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> </div>
`; `;
} }
@@ -454,14 +442,17 @@ function createDynamicUIHtml(data) {
Object.values(data.custom_nodes).forEach((node) => { Object.values(data.custom_nodes).forEach((node) => {
html += ` html += `
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;"> <div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
<a href="${node.url <a href="${
}" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${node.name node.url
}</a> }" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${
node.name
}</a>
<p style="font-size: 14px; color: #4b5563;">${node.hash}</p> <p style="font-size: 14px; color: #4b5563;">${node.hash}</p>
${node.warning ${
? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>` node.warning
: "" ? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
} : ""
}
</div> </div>
`; `;
}); });
@@ -475,8 +466,9 @@ function createDynamicUIHtml(data) {
Object.entries(data.models).forEach(([section, items]) => { Object.entries(data.models).forEach(([section, items]) => {
html += ` html += `
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;"> <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1) <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
}</h3>`; section.charAt(0).toUpperCase() + section.slice(1)
}</h3>`;
items.forEach((item) => { items.forEach((item) => {
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`; html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
}); });
@@ -492,8 +484,9 @@ function createDynamicUIHtml(data) {
Object.entries(data.files).forEach(([section, items]) => { Object.entries(data.files).forEach(([section, items]) => {
html += ` html += `
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;"> <div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1) <h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
}</h3>`; section.charAt(0).toUpperCase() + section.slice(1)
}</h3>`;
items.forEach((item) => { items.forEach((item) => {
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`; html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
}); });
@@ -1013,12 +1006,14 @@ export class LoadingDialog extends ComfyDialog {
showLoading(title, message) { showLoading(title, message) {
this.show(` this.show(`
<div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset"> <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 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${
}</h3> this.loadingIcon
${message }</h3>
? `<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> </div>
`); `);
} }
@@ -1284,17 +1279,21 @@ export class ConfigDialog extends ComfyDialog {
</label> </label>
<label style="color: white; width: 100%;"> <label style="color: white; width: 100%;">
Endpoint: Endpoint:
<input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${data.endpoint <input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${
}"> data.endpoint
}">
</label> </label>
<div style="color: white;"> <div style="color: white;">
API Key: User / Org <button style="font-size: 18px;">${data.displayName ?? "" API Key: User / Org <button style="font-size: 18px;">${
}</button> data.displayName ?? ""
<input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${data.apiKey }</button>
}"> <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;"> <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> </button>
</div> </div>
</div> </div>