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
13 changed files with 43 additions and 53 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)"},
), ),
} }
} }
+4 -8
View File
@@ -31,15 +31,11 @@ class ComfyUIDeployExternalLora:
), ),
"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,12 +47,12 @@ class ComfyUIDeployExternalLora:
CATEGORY = "deploy" CATEGORY = "deploy"
def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None, lora_url=None): def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=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
+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", "") 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('"'))
+5 -11
View File
@@ -259,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:
@@ -292,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
@@ -992,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'))
@@ -1320,7 +1315,7 @@ async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=T
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
@@ -1331,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: