Compare commits
55
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e2fcf67aec | ||
|
|
69f63f4869 | ||
|
|
50860cd500 | ||
|
|
2eb02fc92e | ||
|
|
5c6defbe62 | ||
|
|
d1c54b2b6d | ||
|
|
3a6c3b1ae9 | ||
|
|
aea456cba9 | ||
|
|
8c5e5c4277 | ||
|
|
02430ee62d | ||
|
|
764a8fee82 | ||
|
|
61acffd355 | ||
|
|
aa47f3523f | ||
|
|
7ed4284a6f | ||
|
|
a403daa314 | ||
|
|
ba9b187dcc | ||
|
|
1243fa4e58 | ||
|
|
0d1537963c | ||
|
|
0083b38dcc | ||
|
|
b8dded1535 | ||
|
|
4927d81e73 | ||
|
|
fb6bb2357a | ||
|
|
086d642360 | ||
|
|
212daa838c | ||
|
|
c08b68c41f | ||
|
|
5a78ca97bd | ||
|
|
1f5a88b888 | ||
|
|
946571e32e | ||
|
|
e692beb009 | ||
|
|
3d099f88ea | ||
|
|
65f7576748 | ||
|
|
2d72cd8175 | ||
|
|
5554c95f44 | ||
|
|
c1003f7e31 | ||
|
|
71d60a5dd1 | ||
|
|
e011711600 | ||
|
|
4df9d38e56 | ||
|
|
9cd626e1f6 | ||
|
|
503dca8fb6 | ||
|
|
73c149b4cb | ||
|
|
65b5b0b8c7 | ||
|
|
9d6ee85402 | ||
|
|
cdaed8a571 | ||
|
|
3129e89cce | ||
|
|
7a693eabc8 | ||
|
|
8f677e520d | ||
|
|
4c8d32c5b0 | ||
|
|
a99d2568e0 | ||
|
|
649b61c580 | ||
|
|
edff5685f9 | ||
|
|
9fc0c2b4a2 | ||
|
|
d34e2e99b1 | ||
|
|
f85043db07 | ||
|
|
894d8e1503 | ||
|
|
a1031487e1 |
@@ -8,6 +8,16 @@ class ComfyUIDeployExternalBoolean:
|
|||||||
{"multiline": False, "default": "input_bool"},
|
{"multiline": False, "default": "input_bool"},
|
||||||
),
|
),
|
||||||
"default_value": ("BOOLEAN", {"default": False})
|
"default_value": ("BOOLEAN", {"default": False})
|
||||||
|
},
|
||||||
|
"optional": {
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,7 +26,7 @@ class ComfyUIDeployExternalBoolean:
|
|||||||
|
|
||||||
FUNCTION = "run"
|
FUNCTION = "run"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
print(f"Node '{input_id}' processing with switch set to {default_value}")
|
print(f"Node '{input_id}' processing with switch set to {default_value}")
|
||||||
return [default_value]
|
return [default_value]
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,14 @@ class ComfyUIDeployExternalCheckpoint:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_value": (folder_paths.get_filename_list("checkpoints"), ),
|
"default_value": (folder_paths.get_filename_list("checkpoints"), ),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,7 +41,7 @@ class ComfyUIDeployExternalCheckpoint:
|
|||||||
|
|
||||||
CATEGORY = "deploy"
|
CATEGORY = "deploy"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
import requests
|
import requests
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
|
|||||||
@@ -0,0 +1,108 @@
|
|||||||
|
from PIL import Image, ImageOps
|
||||||
|
import numpy as np
|
||||||
|
import torch
|
||||||
|
import folder_paths
|
||||||
|
|
||||||
|
|
||||||
|
class AnyType(str):
|
||||||
|
def __ne__(self, __value: object) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
WILDCARD = AnyType("*")
|
||||||
|
|
||||||
|
|
||||||
|
class ComfyUIDeployExternalFaceModel:
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"input_id": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": "input_reactor_face_model"},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
"optional": {
|
||||||
|
"default_face_model_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"face_model_save_name": ( # if `default_face_model_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": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
|
"face_model_url": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
RETURN_TYPES = (WILDCARD,)
|
||||||
|
RETURN_NAMES = ("path",)
|
||||||
|
|
||||||
|
FUNCTION = "run"
|
||||||
|
|
||||||
|
CATEGORY = "deploy"
|
||||||
|
|
||||||
|
def run(
|
||||||
|
self,
|
||||||
|
input_id,
|
||||||
|
default_face_model_name=None,
|
||||||
|
face_model_save_name=None,
|
||||||
|
display_name=None,
|
||||||
|
description=None,
|
||||||
|
face_model_url=None,
|
||||||
|
):
|
||||||
|
import requests
|
||||||
|
import os
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
if face_model_url and face_model_url.startswith("http"):
|
||||||
|
if face_model_save_name:
|
||||||
|
existing_face_models = folder_paths.get_filename_list("reactor/faces")
|
||||||
|
# Check if face_model_save_name exists in the list
|
||||||
|
if face_model_save_name in existing_face_models:
|
||||||
|
print(f"using face model: {face_model_save_name}")
|
||||||
|
return (face_model_save_name,)
|
||||||
|
else:
|
||||||
|
face_model_save_name = str(uuid.uuid4()) + ".safetensors"
|
||||||
|
print(face_model_save_name)
|
||||||
|
print(folder_paths.folder_names_and_paths["reactor/faces"][0][0])
|
||||||
|
destination_path = os.path.join(
|
||||||
|
folder_paths.folder_names_and_paths["reactor/faces"][0][0],
|
||||||
|
face_model_save_name,
|
||||||
|
)
|
||||||
|
|
||||||
|
print(destination_path)
|
||||||
|
print(
|
||||||
|
"Downloading external face model - "
|
||||||
|
+ face_model_url
|
||||||
|
+ " to "
|
||||||
|
+ destination_path
|
||||||
|
)
|
||||||
|
response = requests.get(
|
||||||
|
face_model_url,
|
||||||
|
headers={"User-Agent": "Mozilla/5.0"},
|
||||||
|
allow_redirects=True,
|
||||||
|
)
|
||||||
|
with open(destination_path, "wb") as out_file:
|
||||||
|
out_file.write(response.content)
|
||||||
|
return (face_model_save_name,)
|
||||||
|
else:
|
||||||
|
print(f"using face model: {default_face_model_name}")
|
||||||
|
return (default_face_model_name,)
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalFaceModel": ComfyUIDeployExternalFaceModel}
|
||||||
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||||
|
"ComfyUIDeployExternalFaceModel": "External Face Model (ComfyUI Deploy)"
|
||||||
|
}
|
||||||
@@ -15,6 +15,14 @@ class ComfyUIDeployExternalImage:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_value": ("IMAGE",),
|
"default_value": ("IMAGE",),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +33,7 @@ class ComfyUIDeployExternalImage:
|
|||||||
|
|
||||||
CATEGORY = "image"
|
CATEGORY = "image"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
image = default_value
|
image = default_value
|
||||||
try:
|
try:
|
||||||
if input_id.startswith('http'):
|
if input_id.startswith('http'):
|
||||||
|
|||||||
@@ -15,6 +15,14 @@ class ComfyUIDeployExternalImageAlpha:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_value": ("IMAGE",),
|
"default_value": ("IMAGE",),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,7 +33,7 @@ class ComfyUIDeployExternalImageAlpha:
|
|||||||
|
|
||||||
CATEGORY = "image"
|
CATEGORY = "image"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
image = default_value
|
image = default_value
|
||||||
try:
|
try:
|
||||||
if input_id.startswith('http'):
|
if input_id.startswith('http'):
|
||||||
|
|||||||
@@ -21,6 +21,14 @@ class ComfyUIDeployExternalImageBatch:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_value": ("IMAGE",),
|
"default_value": ("IMAGE",),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,14 +39,34 @@ class ComfyUIDeployExternalImageBatch:
|
|||||||
|
|
||||||
CATEGORY = "image"
|
CATEGORY = "image"
|
||||||
|
|
||||||
def run(self, input_id, images=None, default_value=None):
|
def process_image(self, image):
|
||||||
|
image = ImageOps.exif_transpose(image)
|
||||||
|
image = image.convert("RGB")
|
||||||
|
image = np.array(image).astype(np.float32) / 255.0
|
||||||
|
image_tensor = torch.from_numpy(image)[None,]
|
||||||
|
return image_tensor
|
||||||
|
|
||||||
|
def run(self, input_id, images=None, default_value=None, display_name=None, description=None):
|
||||||
|
import requests
|
||||||
|
import zipfile
|
||||||
|
import io
|
||||||
|
|
||||||
processed_images = []
|
processed_images = []
|
||||||
try:
|
try:
|
||||||
images_list = json.loads(images) # Assuming images is a JSON array string
|
images_list = json.loads(images) # Assuming images is a JSON array string
|
||||||
print(images_list)
|
print(images_list)
|
||||||
for img_input in images_list:
|
for img_input in images_list:
|
||||||
if img_input.startswith('http'):
|
if img_input.startswith('http') and img_input.endswith('.zip'):
|
||||||
import requests
|
print("Fetching zip file from url: ", img_input)
|
||||||
|
response = requests.get(img_input)
|
||||||
|
zip_file = zipfile.ZipFile(io.BytesIO(response.content))
|
||||||
|
for file_name in zip_file.namelist():
|
||||||
|
if file_name.lower().endswith(('.png', '.jpg', '.jpeg')):
|
||||||
|
with zip_file.open(file_name) as file:
|
||||||
|
image = Image.open(file)
|
||||||
|
image = self.process_image(image)
|
||||||
|
processed_images.append(image)
|
||||||
|
elif img_input.startswith('http'):
|
||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
print("Fetching image from url: ", img_input)
|
print("Fetching image from url: ", img_input)
|
||||||
response = requests.get(img_input)
|
response = requests.get(img_input)
|
||||||
|
|||||||
@@ -29,6 +29,18 @@ class ComfyUIDeployExternalLora:
|
|||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": False, "default": ""},
|
{"multiline": False, "default": ""},
|
||||||
),
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
|
"lora_url": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -39,12 +51,20 @@ class ComfyUIDeployExternalLora:
|
|||||||
|
|
||||||
CATEGORY = "deploy"
|
CATEGORY = "deploy"
|
||||||
|
|
||||||
def run(self, input_id, default_lora_name=None, lora_save_name=None):
|
def run(
|
||||||
|
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 default_lora_name.startswith("http"):
|
if lora_url and lora_url.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
|
||||||
@@ -59,9 +79,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 - " + input_id + " to " + destination_path)
|
print("Downloading external lora - " + lora_url + " to " + destination_path)
|
||||||
response = requests.get(
|
response = requests.get(
|
||||||
input_id,
|
lora_url,
|
||||||
headers={"User-Agent": "Mozilla/5.0"},
|
headers={"User-Agent": "Mozilla/5.0"},
|
||||||
allow_redirects=True,
|
allow_redirects=True,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -18,6 +18,14 @@ class ComfyUIDeployExternalNumber:
|
|||||||
"FLOAT",
|
"FLOAT",
|
||||||
{"multiline": True, "display": "number", "default": 0, "min": -2147483647, "max": 2147483647, "step": 0.01},
|
{"multiline": True, "display": "number", "default": 0, "min": -2147483647, "max": 2147483647, "step": 0.01},
|
||||||
),
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +36,7 @@ class ComfyUIDeployExternalNumber:
|
|||||||
|
|
||||||
CATEGORY = "number"
|
CATEGORY = "number"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
try:
|
try:
|
||||||
float_value = float(input_id)
|
float_value = float(input_id)
|
||||||
print("my number", float_value)
|
print("my number", float_value)
|
||||||
|
|||||||
@@ -18,6 +18,14 @@ class ComfyUIDeployExternalNumberInt:
|
|||||||
"INT",
|
"INT",
|
||||||
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0},
|
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0},
|
||||||
),
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +36,7 @@ class ComfyUIDeployExternalNumberInt:
|
|||||||
|
|
||||||
CATEGORY = "number"
|
CATEGORY = "number"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
if not input_id or (isinstance(input_id, str) and not input_id.strip().isdigit()):
|
if not input_id or (isinstance(input_id, str) and not input_id.strip().isdigit()):
|
||||||
return [default_value]
|
return [default_value]
|
||||||
return [int(input_id)]
|
return [int(input_id)]
|
||||||
|
|||||||
@@ -21,6 +21,14 @@ class ComfyUIDeployExternalNumberSlider:
|
|||||||
"FLOAT",
|
"FLOAT",
|
||||||
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 1, "step": 0.01},
|
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 1, "step": 0.01},
|
||||||
),
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -31,7 +39,7 @@ class ComfyUIDeployExternalNumberSlider:
|
|||||||
|
|
||||||
CATEGORY = "number"
|
CATEGORY = "number"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None, min_value=0, max_value=1):
|
def run(self, input_id, default_value=None, min_value=0, max_value=1, display_name=None, description=None):
|
||||||
try:
|
try:
|
||||||
float_value = float(input_id)
|
float_value = float(input_id)
|
||||||
if min_value <= float_value <= max_value:
|
if min_value <= float_value <= max_value:
|
||||||
|
|||||||
@@ -18,6 +18,14 @@ class ComfyUIDeployExternalText:
|
|||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": True, "default": ""},
|
{"multiline": True, "default": ""},
|
||||||
),
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,7 +36,7 @@ class ComfyUIDeployExternalText:
|
|||||||
|
|
||||||
CATEGORY = "text"
|
CATEGORY = "text"
|
||||||
|
|
||||||
def run(self, input_id, default_value=None):
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
return [default_value]
|
return [default_value]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,46 @@
|
|||||||
|
class AnyType(str):
|
||||||
|
def __ne__(self, __value: object) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
WILDCARD = AnyType("*")
|
||||||
|
|
||||||
|
class ComfyUIDeployExternalTextAny:
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"input_id": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": "input_text"},
|
||||||
|
),
|
||||||
|
},
|
||||||
|
"optional": {
|
||||||
|
"default_value": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RETURN_TYPES = (WILDCARD,)
|
||||||
|
RETURN_NAMES = ("text",)
|
||||||
|
|
||||||
|
FUNCTION = "run"
|
||||||
|
|
||||||
|
CATEGORY = "text"
|
||||||
|
|
||||||
|
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||||
|
return [default_value]
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {"ComfyUIDeployExternalTextAny": ComfyUIDeployExternalTextAny}
|
||||||
|
NODE_DISPLAY_NAME_MAPPINGS = {"ComfyUIDeployExternalTextAny": "External Text Any (ComfyUI Deploy)"}
|
||||||
@@ -17,6 +17,16 @@ class ComfyUIDeployExternalTextList:
|
|||||||
"STRING",
|
"STRING",
|
||||||
{"multiline": True, "default": "[]"},
|
{"multiline": True, "default": "[]"},
|
||||||
),
|
),
|
||||||
|
},
|
||||||
|
"optional": {
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +39,7 @@ class ComfyUIDeployExternalTextList:
|
|||||||
|
|
||||||
CATEGORY = "text"
|
CATEGORY = "text"
|
||||||
|
|
||||||
def run(self, input_id, text=None):
|
def run(self, input_id, text=None, display_name=None, description=None):
|
||||||
text_list = []
|
text_list = []
|
||||||
try:
|
try:
|
||||||
text_list = json.loads(text) # Assuming text is a JSON array string
|
text_list = json.loads(text) # Assuming text is a JSON array string
|
||||||
|
|||||||
@@ -764,7 +764,15 @@ class ComfyUIDeployExternalVideo:
|
|||||||
"optional": {
|
"optional": {
|
||||||
"meta_batch": ("VHS_BatchManager",),
|
"meta_batch": ("VHS_BatchManager",),
|
||||||
"vae": ("VAE",),
|
"vae": ("VAE",),
|
||||||
"default_value": (sorted(files),),
|
"default_video": (sorted(files),),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
},
|
},
|
||||||
"hidden": {
|
"hidden": {
|
||||||
"unique_id": "UNIQUE_ID"
|
"unique_id": "UNIQUE_ID"
|
||||||
@@ -826,7 +834,7 @@ class ComfyUIDeployExternalVideo:
|
|||||||
):
|
):
|
||||||
out_file.write(chunk)
|
out_file.write(chunk)
|
||||||
else:
|
else:
|
||||||
video = kwargs.get("default_value", "")
|
video = kwargs.get("default_video", None)
|
||||||
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('"'))
|
||||||
|
|||||||
+268
-49
@@ -1,4 +1,5 @@
|
|||||||
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
|
||||||
@@ -23,7 +24,7 @@ from typing import Dict, List, Union, Any, Optional
|
|||||||
from PIL import Image
|
from PIL import Image
|
||||||
import copy
|
import copy
|
||||||
import struct
|
import struct
|
||||||
from aiohttp import web, ClientSession, ClientError, ClientTimeout
|
from aiohttp import web, ClientSession, ClientError, ClientTimeout, ClientResponseError
|
||||||
import atexit
|
import atexit
|
||||||
|
|
||||||
# Global session
|
# Global session
|
||||||
@@ -56,39 +57,65 @@ 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}")
|
||||||
|
|
||||||
async def async_request_with_retry(method, url, disable_timeout=False, **kwargs):
|
import time
|
||||||
|
|
||||||
|
async def async_request_with_retry(method, url, disable_timeout=False, token=None, **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
|
||||||
|
|
||||||
|
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:
|
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}")
|
|
||||||
|
|
||||||
# Wait before retrying
|
|
||||||
await asyncio.sleep(retry_delay)
|
await asyncio.sleep(retry_delay)
|
||||||
retry_delay *= retry_delay_multiplier # Exponential backoff
|
retry_delay *= retry_delay_multiplier
|
||||||
|
|
||||||
# If all retries fail, raise an exception
|
total_time = time.time() - start_time
|
||||||
raise Exception(f"Request failed after {max_retries} attempts")
|
raise Exception(f"Request failed after {max_retries} attempts and {total_time:.2f} seconds")
|
||||||
|
|
||||||
from logging import basicConfig, getLogger
|
from logging import basicConfig, getLogger
|
||||||
|
|
||||||
@@ -166,6 +193,9 @@ bypass_upload = os.environ.get('CD_BYPASS_UPLOAD', 'false').lower() == 'true'
|
|||||||
|
|
||||||
logger.info(f"CD_BYPASS_UPLOAD {bypass_upload}")
|
logger.info(f"CD_BYPASS_UPLOAD {bypass_upload}")
|
||||||
|
|
||||||
|
create_native_run_endpoint = None
|
||||||
|
status_endpoint = None
|
||||||
|
file_upload_endpoint = None
|
||||||
|
|
||||||
def clear_current_prompt(sid):
|
def clear_current_prompt(sid):
|
||||||
prompt_server = server.PromptServer.instance
|
prompt_server = server.PromptServer.instance
|
||||||
@@ -234,13 +264,18 @@ def apply_random_seed_to_workflow(workflow_api):
|
|||||||
workflow_api (dict): The workflow API dictionary to modify.
|
workflow_api (dict): The workflow API dictionary to modify.
|
||||||
"""
|
"""
|
||||||
for key in workflow_api:
|
for key in workflow_api:
|
||||||
if 'inputs' in workflow_api[key] and 'seed' in workflow_api[key]['inputs']:
|
if 'inputs' in workflow_api[key]:
|
||||||
|
if 'seed' in workflow_api[key]['inputs']:
|
||||||
if isinstance(workflow_api[key]['inputs']['seed'], list):
|
if isinstance(workflow_api[key]['inputs']['seed'], list):
|
||||||
continue
|
continue
|
||||||
if workflow_api[key]['class_type'] == "PromptExpansion":
|
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")
|
logger.info(f"Applied random seed {workflow_api[key]['inputs']['seed']} to PromptExpansion")
|
||||||
continue
|
continue
|
||||||
|
workflow_api[key]['inputs']['seed'] = randomSeed()
|
||||||
|
logger.info(f"Applied random seed {workflow_api[key]['inputs']['seed']} to {workflow_api[key]['class_type']}")
|
||||||
|
|
||||||
|
if 'noise_seed' in workflow_api[key]['inputs']:
|
||||||
if workflow_api[key]['class_type'] == "RandomNoise":
|
if workflow_api[key]['class_type'] == "RandomNoise":
|
||||||
workflow_api[key]['inputs']['noise_seed'] = randomSeed()
|
workflow_api[key]['inputs']['noise_seed'] = randomSeed()
|
||||||
logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to RandomNoise")
|
logger.info(f"Applied random noise_seed {workflow_api[key]['inputs']['noise_seed']} to RandomNoise")
|
||||||
@@ -253,8 +288,6 @@ def apply_random_seed_to_workflow(workflow_api):
|
|||||||
workflow_api[key]['inputs']['noise_seed'] = randomSeed()
|
workflow_api[key]['inputs']['noise_seed'] = randomSeed()
|
||||||
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
|
||||||
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):
|
def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
|
||||||
# Loop through each of the inputs and replace them
|
# Loop through each of the inputs and replace them
|
||||||
@@ -279,7 +312,7 @@ def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
|
|||||||
value['inputs']["input_id"] = new_value
|
value['inputs']["input_id"] = new_value
|
||||||
|
|
||||||
# Fix for external text default value
|
# Fix for external text default value
|
||||||
if (value["class_type"] == "ComfyUIDeployExternalText"):
|
if (value["class_type"] == "ComfyUIDeployExternalText" or value["class_type"] == "ComfyUIDeployExternalTextAny"):
|
||||||
value['inputs']["default_value"] = new_value
|
value['inputs']["default_value"] = new_value
|
||||||
|
|
||||||
if (value["class_type"] == "ComfyUIDeployExternalCheckpoint"):
|
if (value["class_type"] == "ComfyUIDeployExternalCheckpoint"):
|
||||||
@@ -289,7 +322,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"]["default_lora_name"] = new_value
|
value["inputs"]["lora_url"] = new_value
|
||||||
|
|
||||||
if value["class_type"] == "ComfyUIDeployExternalSlider":
|
if value["class_type"] == "ComfyUIDeployExternalSlider":
|
||||||
value["inputs"]["default_value"] = new_value
|
value["inputs"]["default_value"] = new_value
|
||||||
@@ -297,9 +330,13 @@ def apply_inputs_to_workflow(workflow_api: Any, inputs: Any, sid: str = None):
|
|||||||
if value["class_type"] == "ComfyUIDeployExternalBoolean":
|
if value["class_type"] == "ComfyUIDeployExternalBoolean":
|
||||||
value["inputs"]["default_value"] = new_value
|
value["inputs"]["default_value"] = new_value
|
||||||
|
|
||||||
|
if value["class_type"] == "ComfyUIDeployExternalFaceModel":
|
||||||
|
value["inputs"]["face_model_url"] = new_value
|
||||||
|
|
||||||
def send_prompt(sid: str, inputs: StreamingPrompt):
|
def send_prompt(sid: str, inputs: StreamingPrompt):
|
||||||
# workflow_api = inputs.workflow_api
|
# workflow_api = inputs.workflow_api
|
||||||
workflow_api = copy.deepcopy(inputs.workflow_api)
|
workflow_api = copy.deepcopy(inputs.workflow_api)
|
||||||
|
workflow = copy.deepcopy(inputs.workflow)
|
||||||
|
|
||||||
# Random seed
|
# Random seed
|
||||||
apply_random_seed_to_workflow(workflow_api)
|
apply_random_seed_to_workflow(workflow_api)
|
||||||
@@ -315,7 +352,8 @@ def send_prompt(sid: str, inputs: StreamingPrompt):
|
|||||||
prompt = {
|
prompt = {
|
||||||
"prompt": workflow_api,
|
"prompt": workflow_api,
|
||||||
"client_id": sid, #"comfy_deploy_instance", #api.client_id
|
"client_id": sid, #"comfy_deploy_instance", #api.client_id
|
||||||
"prompt_id": prompt_id
|
"prompt_id": prompt_id,
|
||||||
|
"extra_data": {"extra_pnginfo": {"workflow": workflow}},
|
||||||
}
|
}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -334,15 +372,55 @@ def send_prompt(sid: str, inputs: StreamingPrompt):
|
|||||||
logger.info(f"error: {error_type}, {e}")
|
logger.info(f"error: {error_type}, {e}")
|
||||||
logger.info(f"stack trace: {stack_trace_short}")
|
logger.info(f"stack trace: {stack_trace_short}")
|
||||||
|
|
||||||
|
|
||||||
|
# # Add custom logic here
|
||||||
|
# if 'prompt_id' in response:
|
||||||
|
# prompt_id = response['prompt_id']
|
||||||
|
# if prompt_id in prompt_metadata:
|
||||||
|
# metadata = prompt_metadata[prompt_id]
|
||||||
|
|
||||||
|
# # Add additional information to the response
|
||||||
|
# response['status_endpoint'] = metadata.status_endpoint
|
||||||
|
# response['file_upload_endpoint'] = metadata.file_upload_endpoint
|
||||||
|
|
||||||
|
return response
|
||||||
|
|
||||||
|
|
||||||
@server.PromptServer.instance.routes.post("/comfyui-deploy/run")
|
@server.PromptServer.instance.routes.post("/comfyui-deploy/run")
|
||||||
async def comfy_deploy_run(request):
|
async def comfy_deploy_run(request):
|
||||||
|
# Extract the bearer token from the Authorization header
|
||||||
data = await request.json()
|
data = await request.json()
|
||||||
|
|
||||||
|
client_id = data.get("client_id")
|
||||||
|
# We proxy the request to Comfy Deploy, this is a native run
|
||||||
|
if "is_native_run" in data:
|
||||||
|
async with aiohttp.ClientSession() as session:
|
||||||
|
pprint(data)
|
||||||
|
# headers = request.headers.copy()
|
||||||
|
# headers['Content-Type'] = 'application/json'
|
||||||
|
async with session.post(data.get("native_run_api_endpoint"), json=data, headers={
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Authorization': request.headers.get('Authorization')
|
||||||
|
}) as response:
|
||||||
|
data = await response.json()
|
||||||
|
print(data)
|
||||||
|
|
||||||
|
if "cd_token" in data:
|
||||||
|
token = data["cd_token"]
|
||||||
|
else:
|
||||||
|
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]
|
||||||
|
|
||||||
# In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
|
# 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")
|
workflow_api = data.get("workflow_api_raw")
|
||||||
# The prompt id generated from comfy deploy, can be None
|
# The prompt id generated from comfy deploy, can be None
|
||||||
prompt_id = data.get("prompt_id")
|
prompt_id = data.get("prompt_id")
|
||||||
inputs = data.get("inputs")
|
inputs = data.get("inputs")
|
||||||
|
workflow = data.get("workflow")
|
||||||
|
|
||||||
# Now it handles directly in here
|
# Now it handles directly in here
|
||||||
apply_random_seed_to_workflow(workflow_api)
|
apply_random_seed_to_workflow(workflow_api)
|
||||||
@@ -350,14 +428,16 @@ async def comfy_deploy_run(request):
|
|||||||
|
|
||||||
prompt = {
|
prompt = {
|
||||||
"prompt": workflow_api,
|
"prompt": workflow_api,
|
||||||
"client_id": "comfy_deploy_instance", #api.client_id
|
"client_id": "comfy_deploy_instance" if client_id is None else client_id,
|
||||||
"prompt_id": prompt_id
|
"prompt_id": prompt_id,
|
||||||
|
"extra_data": {"extra_pnginfo": {"workflow": workflow}}
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_metadata[prompt_id] = SimplePrompt(
|
prompt_metadata[prompt_id] = SimplePrompt(
|
||||||
status_endpoint=data.get('status_endpoint'),
|
status_endpoint=data.get('status_endpoint'),
|
||||||
file_upload_endpoint=data.get('file_upload_endpoint'),
|
file_upload_endpoint=data.get('file_upload_endpoint'),
|
||||||
workflow_api=workflow_api
|
workflow_api=workflow_api,
|
||||||
|
token=token
|
||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -395,12 +475,13 @@ async def comfy_deploy_run(request):
|
|||||||
|
|
||||||
return web.json_response(res, status=status)
|
return web.json_response(res, status=status)
|
||||||
|
|
||||||
async def stream_prompt(data):
|
async def stream_prompt(data, token):
|
||||||
# In older version, we use workflow_api, but this has inputs already swapped in nextjs frontend, which is tricky
|
# 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")
|
workflow_api = data.get("workflow_api_raw")
|
||||||
# The prompt id generated from comfy deploy, can be None
|
# The prompt id generated from comfy deploy, can be None
|
||||||
prompt_id = data.get("prompt_id")
|
prompt_id = data.get("prompt_id")
|
||||||
inputs = data.get("inputs")
|
inputs = data.get("inputs")
|
||||||
|
workflow = data.get("workflow")
|
||||||
|
|
||||||
# Now it handles directly in here
|
# Now it handles directly in here
|
||||||
apply_random_seed_to_workflow(workflow_api)
|
apply_random_seed_to_workflow(workflow_api)
|
||||||
@@ -409,13 +490,15 @@ async def stream_prompt(data):
|
|||||||
prompt = {
|
prompt = {
|
||||||
"prompt": workflow_api,
|
"prompt": workflow_api,
|
||||||
"client_id": "comfy_deploy_instance", #api.client_id
|
"client_id": "comfy_deploy_instance", #api.client_id
|
||||||
"prompt_id": prompt_id
|
"prompt_id": prompt_id,
|
||||||
|
"extra_data": {"extra_pnginfo": {"workflow": workflow}},
|
||||||
}
|
}
|
||||||
|
|
||||||
prompt_metadata[prompt_id] = SimplePrompt(
|
prompt_metadata[prompt_id] = SimplePrompt(
|
||||||
status_endpoint=data.get('status_endpoint'),
|
status_endpoint=data.get('status_endpoint'),
|
||||||
file_upload_endpoint=data.get('file_upload_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)
|
# log('info', "Begin prompt", prompt=prompt)
|
||||||
@@ -465,6 +548,14 @@ async def stream_response(request):
|
|||||||
response = web.StreamResponse(status=200, reason='OK', headers={'Content-Type': 'text/event-stream'})
|
response = web.StreamResponse(status=200, reason='OK', headers={'Content-Type': 'text/event-stream'})
|
||||||
await response.prepare(request)
|
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
|
pending = True
|
||||||
data = await request.json()
|
data = await request.json()
|
||||||
|
|
||||||
@@ -475,7 +566,7 @@ async def stream_response(request):
|
|||||||
log('info', 'Streaming prompt')
|
log('info', 'Streaming prompt')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
result = await stream_prompt(data=data)
|
result = await stream_prompt(data=data, token=token)
|
||||||
await response.write(f"event: event_update\ndata: {json.dumps(result)}\n\n".encode('utf-8'))
|
await response.write(f"event: event_update\ndata: {json.dumps(result)}\n\n".encode('utf-8'))
|
||||||
# await response.write(.encode('utf-8'))
|
# await response.write(.encode('utf-8'))
|
||||||
await response.drain() # Ensure the buffer is flushed
|
await response.drain() # Ensure the buffer is flushed
|
||||||
@@ -604,9 +695,10 @@ 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,
|
||||||
# "x-amz-acl": "public-read",
|
# "Content-Length": str(file_size)
|
||||||
"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({
|
||||||
@@ -733,6 +825,7 @@ async def websocket_handler(request):
|
|||||||
inputs={},
|
inputs={},
|
||||||
status_endpoint=status_endpoint,
|
status_endpoint=status_endpoint,
|
||||||
file_upload_endpoint=request.rel_url.query.get('file_upload_endpoint', None),
|
file_upload_endpoint=request.rel_url.query.get('file_upload_endpoint', None),
|
||||||
|
workflow=workflow["workflow"],
|
||||||
)
|
)
|
||||||
|
|
||||||
await update_realtime_run_status(realtime_id, status_endpoint, Status.RUNNING)
|
await update_realtime_run_status(realtime_id, status_endpoint, Status.RUNNING)
|
||||||
@@ -922,6 +1015,7 @@ async def send_json_override(self, event, data, sid=None):
|
|||||||
"data": data
|
"data": data
|
||||||
})
|
})
|
||||||
|
|
||||||
|
asyncio.create_task(update_run_ws_event(prompt_id, event, data))
|
||||||
# event_emitter.emit("send_json", {
|
# event_emitter.emit("send_json", {
|
||||||
# "event": event,
|
# "event": event,
|
||||||
# "data": data
|
# "data": data
|
||||||
@@ -989,17 +1083,22 @@ 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'))
|
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'))
|
||||||
# update_run_with_output(prompt_id, data.get('output'))
|
# update_run_with_output(prompt_id, data.get('output'))
|
||||||
|
|
||||||
@@ -1014,6 +1113,7 @@ async def update_run_live_status(prompt_id, live_status, calculated_progress: fl
|
|||||||
return
|
return
|
||||||
|
|
||||||
status_endpoint = prompt_metadata[prompt_id].status_endpoint
|
status_endpoint = prompt_metadata[prompt_id].status_endpoint
|
||||||
|
token = prompt_metadata[prompt_id].token
|
||||||
|
|
||||||
if (status_endpoint is None):
|
if (status_endpoint is None):
|
||||||
return
|
return
|
||||||
@@ -1037,7 +1137,27 @@ async def update_run_live_status(prompt_id, live_status, calculated_progress: fl
|
|||||||
})
|
})
|
||||||
|
|
||||||
# requests.post(status_endpoint, json=body)
|
# requests.post(status_endpoint, json=body)
|
||||||
await async_request_with_retry('POST', status_endpoint, json=body)
|
await async_request_with_retry('POST', status_endpoint, token=token, json=body)
|
||||||
|
|
||||||
|
async def update_run_ws_event(prompt_id: str, event: str, data: dict):
|
||||||
|
if prompt_id not in prompt_metadata:
|
||||||
|
return
|
||||||
|
|
||||||
|
# print("update_run_ws_event", prompt_id, event, data)
|
||||||
|
status_endpoint = prompt_metadata[prompt_id].status_endpoint
|
||||||
|
|
||||||
|
if status_endpoint is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
token = prompt_metadata[prompt_id].token
|
||||||
|
body = {
|
||||||
|
"run_id": prompt_id,
|
||||||
|
"ws_event": {
|
||||||
|
"event": event,
|
||||||
|
"data": data,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
await async_request_with_retry('POST', status_endpoint, token=token, json=body)
|
||||||
|
|
||||||
|
|
||||||
async def update_run(prompt_id: str, status: Status):
|
async def update_run(prompt_id: str, status: Status):
|
||||||
@@ -1068,7 +1188,8 @@ async def update_run(prompt_id: str, status: Status):
|
|||||||
try:
|
try:
|
||||||
# requests.post(status_endpoint, json=body)
|
# requests.post(status_endpoint, json=body)
|
||||||
if (status_endpoint is not None):
|
if (status_endpoint is not None):
|
||||||
await async_request_with_retry('POST', status_endpoint, json=body)
|
token = prompt_metadata[prompt_id].token
|
||||||
|
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):
|
if (status_endpoint is not None) and cd_enable_run_log and (status == Status.SUCCESS or status == Status.FAILED):
|
||||||
try:
|
try:
|
||||||
@@ -1098,7 +1219,7 @@ async def update_run(prompt_id: str, status: Status):
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
await async_request_with_retry('POST', status_endpoint, json=body)
|
await async_request_with_retry('POST', status_endpoint, token=token, json=body)
|
||||||
# requests.post(status_endpoint, json=body)
|
# requests.post(status_endpoint, json=body)
|
||||||
except Exception as log_error:
|
except Exception as log_error:
|
||||||
logger.info(f"Error reading log file: {log_error}")
|
logger.info(f"Error reading log file: {log_error}")
|
||||||
@@ -1119,7 +1240,48 @@ async def update_run(prompt_id: str, status: Status):
|
|||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
async def upload_file(prompt_id, filename, subfolder=None, content_type="image/png", type="output"):
|
async def file_sender(file_object, chunk_size):
|
||||||
|
while True:
|
||||||
|
chunk = await file_object.read(chunk_size)
|
||||||
|
if not chunk:
|
||||||
|
break
|
||||||
|
yield chunk
|
||||||
|
|
||||||
|
|
||||||
|
chunk_size = 1024 * 1024 # 1MB chunks, adjust as needed
|
||||||
|
|
||||||
|
async def upload_with_retry(session, url, headers, data, max_retries=3, initial_delay=1):
|
||||||
|
start_time = time.time() # Start timing here
|
||||||
|
for attempt in range(max_retries):
|
||||||
|
try:
|
||||||
|
async with session.put(url, headers=headers, data=data) as response:
|
||||||
|
upload_duration = time.time() - start_time
|
||||||
|
logger.info(f"Upload attempt {attempt + 1} completed in {upload_duration:.2f} seconds")
|
||||||
|
logger.info(f"Upload response status: {response.status}")
|
||||||
|
|
||||||
|
response.raise_for_status() # This will raise an exception for 4xx and 5xx status codes
|
||||||
|
|
||||||
|
response_text = await response.text()
|
||||||
|
logger.info(f"Response body: {response_text[:1000]}...")
|
||||||
|
|
||||||
|
logger.info("Upload successful")
|
||||||
|
return response # Successful upload, exit the retry loop
|
||||||
|
|
||||||
|
except (ClientError, ClientResponseError) as e:
|
||||||
|
logger.error(f"Upload attempt {attempt + 1} failed: {str(e)}")
|
||||||
|
if attempt < max_retries - 1: # If it's not the last attempt
|
||||||
|
delay = initial_delay * (2 ** attempt) # Exponential backoff
|
||||||
|
logger.info(f"Retrying in {delay} seconds...")
|
||||||
|
await asyncio.sleep(delay)
|
||||||
|
else:
|
||||||
|
logger.error("Max retries reached. Upload failed.")
|
||||||
|
raise # Re-raise the last exception if all retries are exhausted
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Unexpected error during upload: {str(e)}")
|
||||||
|
logger.error(traceback.format_exc())
|
||||||
|
raise # Re-raise unexpected exceptions immediately
|
||||||
|
|
||||||
|
async def upload_file(prompt_id, filename, subfolder=None, content_type="image/png", type="output", item=None):
|
||||||
"""
|
"""
|
||||||
Uploads file to S3 bucket using S3 client object
|
Uploads file to S3 bucket using S3 client object
|
||||||
:return: None
|
:return: None
|
||||||
@@ -1149,7 +1311,7 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
|
|||||||
logger.info(f"Uploading file {file}")
|
logger.info(f"Uploading file {file}")
|
||||||
|
|
||||||
file_upload_endpoint = prompt_metadata[prompt_id].file_upload_endpoint
|
file_upload_endpoint = prompt_metadata[prompt_id].file_upload_endpoint
|
||||||
|
token = prompt_metadata[prompt_id].token
|
||||||
filename = quote(filename)
|
filename = quote(filename)
|
||||||
prompt_id = quote(prompt_id)
|
prompt_id = quote(prompt_id)
|
||||||
content_type = quote(content_type)
|
content_type = quote(content_type)
|
||||||
@@ -1157,26 +1319,53 @@ async def upload_file(prompt_id, filename, subfolder=None, content_type="image/p
|
|||||||
target_url = f"{file_upload_endpoint}?file_name={filename}&run_id={prompt_id}&type={content_type}&version=v2"
|
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
|
start_time = time.time() # Start timing here
|
||||||
result = await async_request_with_retry("GET", target_url, disable_timeout=True)
|
logger.info(f"Target URL: {target_url}")
|
||||||
|
result = await async_request_with_retry("GET", target_url, disable_timeout=True, token=token)
|
||||||
end_time = time.time() # End timing after the request is complete
|
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))
|
logger.info("Time taken for getting file upload endpoint: {:.2f} seconds".format(end_time - start_time))
|
||||||
ok = await result.json()
|
ok = await result.json()
|
||||||
|
|
||||||
start_time = time.time() # Start timing here
|
logger.info(f"Result: {ok}")
|
||||||
|
|
||||||
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))
|
||||||
|
# logger.info(f"Image size: {size}")
|
||||||
|
|
||||||
|
start_time = time.time() # Start timing here
|
||||||
headers = {
|
headers = {
|
||||||
# "x-amz-acl": "public-read",
|
|
||||||
"Content-Type": content_type,
|
"Content-Type": content_type,
|
||||||
"Content-Length": str(len(data)),
|
"Content-Length": size,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logger.info(headers)
|
||||||
|
|
||||||
|
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}")
|
||||||
|
|
||||||
|
async with aiohttp.ClientSession() as session:
|
||||||
|
try:
|
||||||
|
response = await upload_with_retry(session, ok.get("url"), headers, data)
|
||||||
|
# Process successful response...
|
||||||
|
except Exception as e:
|
||||||
|
# Handle final failure...
|
||||||
|
logger.error(f"Upload ultimately failed: {str(e)}")
|
||||||
|
|
||||||
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
|
||||||
|
if ok.get("is_public") is not None:
|
||||||
|
item["is_public"] = ok.get("is_public")
|
||||||
|
|
||||||
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:
|
||||||
logger.info(f"Have pending upload {len(prompt_metadata[prompt_id].uploading_nodes)}")
|
logger.info(f"Have pending upload {len(prompt_metadata[prompt_id].uploading_nodes)}")
|
||||||
@@ -1289,30 +1478,55 @@ 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
|
||||||
))
|
))
|
||||||
|
# await upload_file(
|
||||||
|
# prompt_id,
|
||||||
|
# item.get("filename"),
|
||||||
|
# subfolder=item.get("subfolder"),
|
||||||
|
# type=item.get("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):
|
async def upload_in_background(prompt_id: str, data, node_id=None, have_upload=True, node_meta=None):
|
||||||
try:
|
try:
|
||||||
|
# await handle_upload(prompt_id, data, 'images', "content_type", "image/png")
|
||||||
|
# await handle_upload(prompt_id, data, 'files', "content_type", "image/png")
|
||||||
|
# await handle_upload(prompt_id, data, 'gifs', "format", "image/gif")
|
||||||
|
# await handle_upload(prompt_id, data, 'mesh', "format", "application/octet-stream")
|
||||||
upload_tasks = [
|
upload_tasks = [
|
||||||
handle_upload(prompt_id, data, 'images', "content_type", "image/png"),
|
handle_upload(prompt_id, data, "images", "content_type", "image/png"),
|
||||||
handle_upload(prompt_id, data, 'files', "content_type", "image/png"),
|
handle_upload(prompt_id, data, "files", "content_type", "image/png"),
|
||||||
handle_upload(prompt_id, data, 'gifs', "format", "image/gif"),
|
handle_upload(prompt_id, data, "gifs", "format", "image/gif"),
|
||||||
handle_upload(prompt_id, data, 'mesh', "format", "application/octet-stream")
|
handle_upload(
|
||||||
|
prompt_id, data, "mesh", "format", "application/octet-stream"
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
await asyncio.gather(*upload_tasks)
|
await asyncio.gather(*upload_tasks)
|
||||||
|
|
||||||
|
status_endpoint = prompt_metadata[prompt_id].status_endpoint
|
||||||
|
token = prompt_metadata[prompt_id].token
|
||||||
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, token=token, 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):
|
async def update_run_with_output(prompt_id, data, node_id=None, node_meta=None):
|
||||||
if prompt_id not in prompt_metadata:
|
if prompt_id not in prompt_metadata:
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -1323,8 +1537,12 @@ async def update_run_with_output(prompt_id, data, node_id=None):
|
|||||||
|
|
||||||
body = {
|
body = {
|
||||||
"run_id": prompt_id,
|
"run_id": prompt_id,
|
||||||
"output_data": data
|
"output_data": data,
|
||||||
|
"node_meta": node_meta,
|
||||||
}
|
}
|
||||||
|
pprint(body)
|
||||||
|
have_upload_media = False
|
||||||
|
if data is not None:
|
||||||
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:
|
||||||
print("CD_BYPASS_UPLOAD is enabled, skipping the upload of the output:", node_id)
|
print("CD_BYPASS_UPLOAD is enabled, skipping the upload of the output:", node_id)
|
||||||
@@ -1337,15 +1555,16 @@ async def update_run_with_output(prompt_id, data, node_id=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))
|
# asyncio.create_task(upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload_media, node_meta=node_meta))
|
||||||
|
await upload_in_background(prompt_id, data, node_id=node_id, have_upload=have_upload_media, node_meta=node_meta)
|
||||||
# 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)
|
||||||
if status_endpoint is not None:
|
elif status_endpoint is not None:
|
||||||
await async_request_with_retry('POST', status_endpoint, json=body)
|
token = prompt_metadata[prompt_id].token
|
||||||
|
await async_request_with_retry('POST', status_endpoint, token=token, json=body)
|
||||||
|
|
||||||
await send('outputs_uploaded', {
|
await send('outputs_uploaded', {
|
||||||
"prompt_id": prompt_id
|
"prompt_id": prompt_id
|
||||||
|
|||||||
@@ -24,11 +24,14 @@ class StreamingPrompt(BaseModel):
|
|||||||
running_prompt_ids: set[str] = set()
|
running_prompt_ids: set[str] = set()
|
||||||
status_endpoint: Optional[str]
|
status_endpoint: Optional[str]
|
||||||
file_upload_endpoint: Optional[str]
|
file_upload_endpoint: Optional[str]
|
||||||
|
workflow: Any
|
||||||
|
|
||||||
class SimplePrompt(BaseModel):
|
class SimplePrompt(BaseModel):
|
||||||
status_endpoint: Optional[str]
|
status_endpoint: Optional[str]
|
||||||
file_upload_endpoint: Optional[str]
|
file_upload_endpoint: Optional[str]
|
||||||
|
|
||||||
|
token: Optional[str]
|
||||||
|
|
||||||
workflow_api: dict
|
workflow_api: dict
|
||||||
status: Status = Status.NOT_STARTED
|
status: Status = Status.NOT_STARTED
|
||||||
progress: set = set()
|
progress: set = set()
|
||||||
|
|||||||
+115
-42
@@ -83,6 +83,23 @@ function dispatchAPIEventData(data) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const context = {
|
||||||
|
selectedWorkflowInfo: null,
|
||||||
|
};
|
||||||
|
// let selectedWorkflowInfo = {
|
||||||
|
// workflow_id: "05da8f2b-63af-4c0c-86dd-08d01ec512b7",
|
||||||
|
// machine_id: "45ac5f85-b7b6-436f-8d97-2383b25485f3",
|
||||||
|
// native_run_api_endpoint: "http://localhost:3011/api/run",
|
||||||
|
// };
|
||||||
|
|
||||||
|
function getSelectedWorkflowInfo() {
|
||||||
|
return context.selectedWorkflowInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
function setSelectedWorkflowInfo(info) {
|
||||||
|
context.selectedWorkflowInfo = info;
|
||||||
|
}
|
||||||
|
|
||||||
/** @typedef {import('../../../web/types/comfy.js').ComfyExtension} ComfyExtension*/
|
/** @typedef {import('../../../web/types/comfy.js').ComfyExtension} ComfyExtension*/
|
||||||
/** @type {ComfyExtension} */
|
/** @type {ComfyExtension} */
|
||||||
const ext = {
|
const ext = {
|
||||||
@@ -103,10 +120,10 @@ const ext = {
|
|||||||
|
|
||||||
sendEventToCD("cd_plugin_onInit");
|
sendEventToCD("cd_plugin_onInit");
|
||||||
|
|
||||||
app.queuePrompt = ((originalFunction) => async () => {
|
// app.queuePrompt = ((originalFunction) => async () => {
|
||||||
// const prompt = await app.graphToPrompt();
|
// // const prompt = await app.graphToPrompt();
|
||||||
sendEventToCD("cd_plugin_onQueuePromptTrigger");
|
// sendEventToCD("cd_plugin_onQueuePromptTrigger");
|
||||||
})(app.queuePrompt);
|
// })(app.queuePrompt);
|
||||||
|
|
||||||
// // Intercept the onkeydown event
|
// // Intercept the onkeydown event
|
||||||
// window.addEventListener(
|
// window.addEventListener(
|
||||||
@@ -192,11 +209,13 @@ const ext = {
|
|||||||
|
|
||||||
registerCustomNodes() {
|
registerCustomNodes() {
|
||||||
/** @type {LGraphNode}*/
|
/** @type {LGraphNode}*/
|
||||||
class ComfyDeploy {
|
class ComfyDeploy extends LGraphNode {
|
||||||
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 = "";
|
||||||
@@ -204,62 +223,75 @@ const ext = {
|
|||||||
this.properties.version = "";
|
this.properties.version = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
ComfyWidgets.STRING(
|
this.addWidget(
|
||||||
this,
|
"text",
|
||||||
"workflow_name",
|
"workflow_name",
|
||||||
[
|
this.properties.workflow_name,
|
||||||
"",
|
(v) => {
|
||||||
{
|
this.properties.workflow_name = v;
|
||||||
default: this.properties.workflow_name,
|
|
||||||
multiline: false,
|
|
||||||
},
|
},
|
||||||
],
|
{ multiline: false },
|
||||||
app,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
ComfyWidgets.STRING(
|
this.addWidget(
|
||||||
this,
|
"text",
|
||||||
"workflow_id",
|
"workflow_id",
|
||||||
[
|
this.properties.workflow_id,
|
||||||
"",
|
(v) => {
|
||||||
{
|
this.properties.workflow_id = v;
|
||||||
default: this.properties.workflow_id,
|
|
||||||
multiline: false,
|
|
||||||
},
|
},
|
||||||
],
|
{ multiline: false },
|
||||||
app,
|
|
||||||
);
|
);
|
||||||
|
|
||||||
ComfyWidgets.STRING(
|
this.addWidget(
|
||||||
this,
|
"text",
|
||||||
"version",
|
"version",
|
||||||
["", { default: this.properties.version, multiline: false }],
|
this.properties.version,
|
||||||
app,
|
(v) => {
|
||||||
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load default visibility
|
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
|
||||||
LiteGraph.registerNodeType(
|
LiteGraph.registerNodeType(
|
||||||
"ComfyDeploy",
|
"ComfyDeploy",
|
||||||
Object.assign(ComfyDeploy, {
|
Object.assign(ComfyDeploy, {
|
||||||
title_mode: LiteGraph.NORMAL_TITLE,
|
|
||||||
title: "Comfy Deploy",
|
title: "Comfy Deploy",
|
||||||
|
title_mode: LiteGraph.NORMAL_TITLE,
|
||||||
collapsable: true,
|
collapsable: true,
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
@@ -281,6 +313,14 @@ const ext = {
|
|||||||
// This part of the code would depend on how the ComfyUI expects to receive and process the workflow data
|
// This part of the code would depend on how the ComfyUI expects to receive and process the workflow data
|
||||||
// For demonstration, let's assume there's a loadWorkflow method in the ComfyUI API
|
// For demonstration, let's assume there's a loadWorkflow method in the ComfyUI API
|
||||||
if (comfyUIWorkflow && app && app.loadGraphData) {
|
if (comfyUIWorkflow && app && app.loadGraphData) {
|
||||||
|
try {
|
||||||
|
await window["app"].ui.settings.setSettingValueAsync(
|
||||||
|
"Comfy.Validation.Workflows",
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.warning("Error setting validation to false, is fine to ignore this", error);
|
||||||
|
}
|
||||||
console.log("loadGraphData");
|
console.log("loadGraphData");
|
||||||
app.loadGraphData(comfyUIWorkflow);
|
app.loadGraphData(comfyUIWorkflow);
|
||||||
}
|
}
|
||||||
@@ -368,6 +408,8 @@ const ext = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
animate();
|
animate();
|
||||||
|
} else if (message.type === "workflow_info") {
|
||||||
|
setSelectedWorkflowInfo(message.data);
|
||||||
}
|
}
|
||||||
// else if (message.type === "refresh") {
|
// else if (message.type === "refresh") {
|
||||||
// sendEventToCD("cd_plugin_onRefresh");
|
// sendEventToCD("cd_plugin_onRefresh");
|
||||||
@@ -1482,3 +1524,34 @@ async function loadWorkflowApi(versionId) {
|
|||||||
// Show an error message to the user
|
// Show an error message to the user
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const orginal_fetch_api = api.fetchApi;
|
||||||
|
api.fetchApi = async (route, options) => {
|
||||||
|
console.log("Fetch API called with args:", route, options);
|
||||||
|
|
||||||
|
const info = getSelectedWorkflowInfo();
|
||||||
|
if (info && route.startsWith("/prompt")) {
|
||||||
|
const body = JSON.parse(options.body);
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
client_id: body.client_id,
|
||||||
|
workflow_api_json: body.prompt,
|
||||||
|
workflow: body?.extra_data?.extra_pnginfo?.workflow,
|
||||||
|
is_native_run: true,
|
||||||
|
machine_id: info.machine_id,
|
||||||
|
workflow_id: info.workflow_id,
|
||||||
|
native_run_api_endpoint: info.native_run_api_endpoint,
|
||||||
|
};
|
||||||
|
|
||||||
|
return await fetch("/comfyui-deploy/run", {
|
||||||
|
method: "POST",
|
||||||
|
headers: {
|
||||||
|
Authorization: `Bearer ${info.cd_token}`,
|
||||||
|
"Content-Type": "application/json",
|
||||||
|
},
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return await orginal_fetch_api.call(api, route, options);
|
||||||
|
};
|
||||||
|
|||||||
@@ -6,4 +6,5 @@ export const customInputNodes: Record<string, string> = {
|
|||||||
ComfyUIDeployExternalNumberInt: "integer",
|
ComfyUIDeployExternalNumberInt: "integer",
|
||||||
ComfyUIDeployExternalLora: "string - (public lora download url)",
|
ComfyUIDeployExternalLora: "string - (public lora download url)",
|
||||||
ComfyUIDeployExternalCheckpoint: "string - (public checkpoints download url)",
|
ComfyUIDeployExternalCheckpoint: "string - (public checkpoints download url)",
|
||||||
|
ComfyUIDeployExternalFaceModel: "string - (public face model download url)",
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user