Compare commits
117
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02f499a4dc | ||
|
|
67d27bd4aa | ||
|
|
8ee2f88e72 | ||
|
|
c17a029173 | ||
|
|
c82f0c2bf0 | ||
|
|
fdbf24207f | ||
|
|
0a9d0d3e3e | ||
|
|
d41c4de352 | ||
|
|
0779136134 | ||
|
|
fe116a4655 | ||
|
|
7dd8a7e67e | ||
|
|
778e6fefe6 | ||
|
|
fd310e8478 | ||
|
|
3a3b93d564 | ||
|
|
82c564228d | ||
|
|
ad0a23434b | ||
|
|
292f77f06b | ||
|
|
a139424b91 | ||
|
|
44a91d2093 | ||
|
|
7cff930861 | ||
|
|
ce464c6ce4 | ||
|
|
1c7998c554 | ||
|
|
66d1e42409 | ||
|
|
8882f4983c | ||
|
|
492b81c340 | ||
|
|
8b05ed26c9 | ||
|
|
ce67604926 | ||
|
|
c115c22a91 | ||
|
|
2f33bcf497 | ||
|
|
bcf466c472 | ||
|
|
f812d9d698 | ||
|
|
101b6cca57 | ||
|
|
ae68aae011 | ||
|
|
07926158f0 | ||
|
|
ce92dd0570 | ||
|
|
e2fcf67aec | ||
|
|
79650f48d0 | ||
|
|
69f63f4869 | ||
|
|
50860cd500 | ||
|
|
2eb02fc92e | ||
|
|
5c6defbe62 | ||
|
|
d1c54b2b6d | ||
|
|
3a6c3b1ae9 | ||
|
|
aea456cba9 | ||
|
|
8c5e5c4277 | ||
|
|
02430ee62d | ||
|
|
764a8fee82 | ||
|
|
61acffd355 | ||
|
|
aa47f3523f | ||
|
|
7ed4284a6f | ||
|
|
a403daa314 | ||
|
|
ba9b187dcc | ||
|
|
1243fa4e58 | ||
|
|
0d1537963c | ||
|
|
0083b38dcc | ||
|
|
b8dded1535 | ||
|
|
4927d81e73 | ||
|
|
0e70db4013 | ||
|
|
06805e310d | ||
|
|
fb6bb2357a | ||
|
|
086d642360 | ||
|
|
212daa838c | ||
|
|
c08b68c41f | ||
|
|
5a78ca97bd | ||
|
|
1f5a88b888 | ||
|
|
946571e32e | ||
|
|
e692beb009 | ||
|
|
3d099f88ea | ||
|
|
65f7576748 | ||
|
|
2d72cd8175 | ||
|
|
5554c95f44 | ||
|
|
c1003f7e31 | ||
|
|
71d60a5dd1 | ||
|
|
e011711600 | ||
|
|
4cd7d7a8f9 | ||
|
|
4df9d38e56 | ||
|
|
9cd626e1f6 | ||
|
|
503dca8fb6 | ||
|
|
73c149b4cb | ||
|
|
65b5b0b8c7 | ||
|
|
9d6ee85402 | ||
|
|
cdaed8a571 | ||
|
|
3129e89cce | ||
|
|
7a693eabc8 | ||
|
|
8f677e520d | ||
|
|
4c8d32c5b0 | ||
|
|
a99d2568e0 | ||
|
|
649b61c580 | ||
|
|
edff5685f9 | ||
|
|
9fc0c2b4a2 | ||
|
|
d34e2e99b1 | ||
|
|
f85043db07 | ||
|
|
894d8e1503 | ||
|
|
08d631d1eb | ||
|
|
a1031487e1 | ||
|
|
ca41207192 | ||
|
|
507d5ef631 | ||
|
|
dd1d9df23f | ||
|
|
3a14e49ca5 | ||
|
|
8147c4bfb7 | ||
|
|
10268825d9 | ||
|
|
f6ea252652 | ||
|
|
98cd5ef79c | ||
|
|
4bce5cadfb | ||
|
|
f362671041 | ||
|
|
0582d1d869 | ||
|
|
ce073a86c7 | ||
|
|
3a85a1edf2 | ||
|
|
369c1456a9 | ||
|
|
01e323b7e2 | ||
|
|
db684d044a | ||
|
|
8e12803ea1 | ||
|
|
7585d5049a | ||
|
|
772bb09240 | ||
|
|
9a7e18e651 | ||
|
|
a02c8d237f | ||
|
|
2ba5a0ff3d |
@@ -0,0 +1,46 @@
|
||||
import json
|
||||
|
||||
|
||||
class AnyType(str):
|
||||
"""A special class that is always equal in not equal comparisons. Credit to pythongosssss"""
|
||||
|
||||
def __ne__(self, __value: object) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
any = AnyType("*")
|
||||
|
||||
|
||||
class ComfyDeployStdOutputAny:
|
||||
@classmethod
|
||||
def INPUT_TYPES(cls): # pylint: disable = invalid-name, missing-function-docstring
|
||||
return {
|
||||
"required": {
|
||||
"name": ("STRING", {"default": "ComfyUI"}),
|
||||
"source": (any, {}), # Use "*" to accept any input type
|
||||
},
|
||||
}
|
||||
|
||||
CATEGORY = "output"
|
||||
RETURN_TYPES = ()
|
||||
FUNCTION = "run"
|
||||
OUTPUT_NODE = True
|
||||
|
||||
def run(self, name, source=None):
|
||||
value = "None"
|
||||
if source is not None:
|
||||
try:
|
||||
value = json.dumps(source)
|
||||
except Exception:
|
||||
try:
|
||||
value = str(source)
|
||||
except Exception:
|
||||
value = "source exists, but could not be serialized."
|
||||
|
||||
return {"ui": {name: (value,)}}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {"ComfyDeployStdOutputAny": ComfyDeployStdOutputAny}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"ComfyDeployStdOutputAny": "Standard Any Output (ComfyDeploy)"
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
import os
|
||||
import json
|
||||
import numpy as np
|
||||
from PIL import Image
|
||||
from PIL.PngImagePlugin import PngInfo
|
||||
import folder_paths
|
||||
|
||||
|
||||
class ComfyDeployStdOutputImage:
|
||||
def __init__(self):
|
||||
self.output_dir = folder_paths.get_output_directory()
|
||||
self.type = "output"
|
||||
self.prefix_append = ""
|
||||
self.compress_level = 4
|
||||
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
"images": ("IMAGE", {"tooltip": "The images to save."}),
|
||||
"filename_prefix": (
|
||||
"STRING",
|
||||
{
|
||||
"default": "ComfyUI",
|
||||
"tooltip": "The prefix for the file to save. This may include formatting information such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes.",
|
||||
},
|
||||
),
|
||||
"file_type": (["png", "jpg", "webp"], {"default": "webp"}),
|
||||
"quality": ("INT", {"default": 80, "min": 1, "max": 100, "step": 1}),
|
||||
},
|
||||
"hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
|
||||
}
|
||||
|
||||
RETURN_TYPES = ()
|
||||
FUNCTION = "run"
|
||||
|
||||
OUTPUT_NODE = True
|
||||
|
||||
CATEGORY = "output"
|
||||
DESCRIPTION = "Saves the input images to your ComfyUI output directory."
|
||||
|
||||
def run(
|
||||
self,
|
||||
images,
|
||||
filename_prefix="ComfyUI",
|
||||
file_type="png",
|
||||
quality=80,
|
||||
prompt=None,
|
||||
extra_pnginfo=None,
|
||||
):
|
||||
filename_prefix += self.prefix_append
|
||||
full_output_folder, filename, counter, subfolder, filename_prefix = (
|
||||
folder_paths.get_save_image_path(
|
||||
filename_prefix, self.output_dir, images[0].shape[1], images[0].shape[0]
|
||||
)
|
||||
)
|
||||
results = list()
|
||||
for batch_number, image in enumerate(images):
|
||||
i = 255.0 * image.cpu().numpy()
|
||||
img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
|
||||
metadata = PngInfo()
|
||||
if prompt is not None:
|
||||
metadata.add_text("prompt", json.dumps(prompt))
|
||||
if extra_pnginfo is not None:
|
||||
for x in extra_pnginfo:
|
||||
metadata.add_text(x, json.dumps(extra_pnginfo[x]))
|
||||
|
||||
filename_with_batch_num = filename.replace("%batch_num%", str(batch_number))
|
||||
file = f"{filename_with_batch_num}_{counter:05}_.{file_type}"
|
||||
file_path = os.path.join(full_output_folder, file)
|
||||
|
||||
if file_type == "png":
|
||||
img.save(
|
||||
file_path, pnginfo=metadata, compress_level=self.compress_level
|
||||
)
|
||||
elif file_type == "jpg":
|
||||
img.save(file_path, quality=quality, optimize=True)
|
||||
elif file_type == "webp":
|
||||
img.save(file_path, quality=quality)
|
||||
|
||||
results.append(
|
||||
{"filename": file, "subfolder": subfolder, "type": self.type}
|
||||
)
|
||||
counter += 1
|
||||
|
||||
return {"ui": {"images": results}}
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {"ComfyDeployStdOutputImage": ComfyDeployStdOutputImage}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||
"ComfyDeployStdOutputImage": "Standard Image Output (ComfyDeploy)"
|
||||
}
|
||||
@@ -8,6 +8,16 @@ class ComfyUIDeployExternalBoolean:
|
||||
{"multiline": False, "default": "input_bool"},
|
||||
),
|
||||
"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"
|
||||
|
||||
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}")
|
||||
return [default_value]
|
||||
|
||||
|
||||
@@ -23,6 +23,14 @@ class ComfyUIDeployExternalCheckpoint:
|
||||
},
|
||||
"optional": {
|
||||
"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"
|
||||
|
||||
def run(self, input_id, default_value=None):
|
||||
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||
import requests
|
||||
import os
|
||||
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": {
|
||||
"default_value": ("IMAGE",),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +33,7 @@ class ComfyUIDeployExternalImage:
|
||||
|
||||
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
|
||||
try:
|
||||
if input_id.startswith('http'):
|
||||
|
||||
@@ -15,6 +15,14 @@ class ComfyUIDeployExternalImageAlpha:
|
||||
},
|
||||
"optional": {
|
||||
"default_value": ("IMAGE",),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +33,7 @@ class ComfyUIDeployExternalImageAlpha:
|
||||
|
||||
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
|
||||
try:
|
||||
if input_id.startswith('http'):
|
||||
|
||||
@@ -21,6 +21,14 @@ class ComfyUIDeployExternalImageBatch:
|
||||
},
|
||||
"optional": {
|
||||
"default_value": ("IMAGE",),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,14 +39,34 @@ class ComfyUIDeployExternalImageBatch:
|
||||
|
||||
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 = []
|
||||
try:
|
||||
images_list = json.loads(images) # Assuming images is a JSON array string
|
||||
print(images_list)
|
||||
for img_input in images_list:
|
||||
if img_input.startswith('http'):
|
||||
import requests
|
||||
if img_input.startswith('http') and img_input.endswith('.zip'):
|
||||
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
|
||||
print("Fetching image from url: ", img_input)
|
||||
response = requests.get(img_input)
|
||||
|
||||
@@ -4,12 +4,15 @@ import numpy as np
|
||||
import torch
|
||||
import folder_paths
|
||||
|
||||
|
||||
class AnyType(str):
|
||||
def __ne__(self, __value: object) -> bool:
|
||||
return False
|
||||
|
||||
|
||||
WILDCARD = AnyType("*")
|
||||
|
||||
|
||||
class ComfyUIDeployExternalLora:
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
@@ -22,6 +25,22 @@ class ComfyUIDeployExternalLora:
|
||||
},
|
||||
"optional": {
|
||||
"default_lora_name": (folder_paths.get_filename_list("loras"),),
|
||||
"lora_save_name": ( # if `default_lora_name` is a link to download a file, we will attempt to save it with this name
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
"lora_url": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
},
|
||||
}
|
||||
|
||||
@@ -32,28 +51,43 @@ class ComfyUIDeployExternalLora:
|
||||
|
||||
CATEGORY = "deploy"
|
||||
|
||||
def run(self, input_id, default_lora_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 os
|
||||
import uuid
|
||||
|
||||
if default_lora_name.startswith("http"):
|
||||
unique_filename = str(uuid.uuid4()) + ".safetensors"
|
||||
print(unique_filename)
|
||||
if lora_url and lora_url.startswith("http"):
|
||||
if lora_save_name:
|
||||
existing_loras = folder_paths.get_filename_list("loras")
|
||||
# Check if lora_save_name exists in the list
|
||||
if lora_save_name in existing_loras:
|
||||
print(f"using lora: {lora_save_name}")
|
||||
return (lora_save_name,)
|
||||
else:
|
||||
lora_save_name = str(uuid.uuid4()) + ".safetensors"
|
||||
print(lora_save_name)
|
||||
print(folder_paths.folder_names_and_paths["loras"][0][0])
|
||||
destination_path = os.path.join(
|
||||
folder_paths.folder_names_and_paths["loras"][0][0], unique_filename
|
||||
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
|
||||
)
|
||||
print(destination_path)
|
||||
print("Downloading external lora - " + input_id + " to " + destination_path)
|
||||
print("Downloading external lora - " + lora_url + " to " + destination_path)
|
||||
response = requests.get(
|
||||
input_id,
|
||||
lora_url,
|
||||
headers={"User-Agent": "Mozilla/5.0"},
|
||||
allow_redirects=True,
|
||||
)
|
||||
with open(destination_path, "wb") as out_file:
|
||||
out_file.write(response.content)
|
||||
return (unique_filename,)
|
||||
return (lora_save_name,)
|
||||
else:
|
||||
print(f"using lora: {default_lora_name}")
|
||||
return (default_lora_name,)
|
||||
|
||||
@@ -16,7 +16,15 @@ class ComfyUIDeployExternalNumber:
|
||||
"optional": {
|
||||
"default_value": (
|
||||
"FLOAT",
|
||||
{"multiline": True, "display": "number", "default": 0, "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"
|
||||
|
||||
def run(self, input_id, default_value=None):
|
||||
def run(self, input_id, default_value=None, display_name=None, description=None):
|
||||
try:
|
||||
float_value = float(input_id)
|
||||
print("my number", float_value)
|
||||
|
||||
@@ -16,7 +16,15 @@ class ComfyUIDeployExternalNumberInt:
|
||||
"optional": {
|
||||
"default_value": (
|
||||
"INT",
|
||||
{"multiline": True, "display": "number", "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"
|
||||
|
||||
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()):
|
||||
return [default_value]
|
||||
return [int(input_id)]
|
||||
|
||||
@@ -11,15 +11,23 @@ class ComfyUIDeployExternalNumberSlider:
|
||||
"optional": {
|
||||
"default_value": (
|
||||
"FLOAT",
|
||||
{"multiline": True, "display": "number", "default": 0.5, "step": 0.01},
|
||||
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0.5, "step": 0.01},
|
||||
),
|
||||
"min_value": (
|
||||
"FLOAT",
|
||||
{"multiline": True, "display": "number", "default": 0, "step": 0.01},
|
||||
{"multiline": True, "display": "number", "min": -2147483647, "max": 2147483647, "default": 0, "step": 0.01},
|
||||
),
|
||||
"max_value": (
|
||||
"FLOAT",
|
||||
{"multiline": True, "display": "number", "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"
|
||||
|
||||
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:
|
||||
float_value = float(input_id)
|
||||
if min_value <= float_value <= max_value:
|
||||
|
||||
@@ -18,6 +18,14 @@ class ComfyUIDeployExternalText:
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +36,7 @@ class ComfyUIDeployExternalText:
|
||||
|
||||
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]
|
||||
|
||||
|
||||
|
||||
@@ -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)"}
|
||||
@@ -764,7 +764,15 @@ class ComfyUIDeployExternalVideo:
|
||||
"optional": {
|
||||
"meta_batch": ("VHS_BatchManager",),
|
||||
"vae": ("VAE",),
|
||||
"default_value": (sorted(files),),
|
||||
"default_video": (sorted(files),),
|
||||
"display_name": (
|
||||
"STRING",
|
||||
{"multiline": False, "default": ""},
|
||||
),
|
||||
"description": (
|
||||
"STRING",
|
||||
{"multiline": True, "default": ""},
|
||||
),
|
||||
},
|
||||
"hidden": {
|
||||
"unique_id": "UNIQUE_ID"
|
||||
@@ -796,8 +804,6 @@ class ComfyUIDeployExternalVideo:
|
||||
meta_batch = kwargs.get("meta_batch")
|
||||
unique_id = kwargs.get("unique_id")
|
||||
|
||||
video = kwargs.get("default_value")
|
||||
video_path = folder_paths.get_annotated_filepath(video.strip('"'))
|
||||
|
||||
input_dir = folder_paths.get_input_directory()
|
||||
if input_id.startswith("http"):
|
||||
@@ -827,8 +833,11 @@ class ComfyUIDeployExternalVideo:
|
||||
leave=True,
|
||||
):
|
||||
out_file.write(chunk)
|
||||
|
||||
print("video path: ", video_path)
|
||||
else:
|
||||
video = kwargs.get("default_video", None)
|
||||
if video is None:
|
||||
raise "No default video given and no external video provided"
|
||||
video_path = folder_paths.get_annotated_filepath(video.strip('"'))
|
||||
|
||||
return load_video_cv(
|
||||
video=video_path,
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
import folder_paths
|
||||
class AnyType(str):
|
||||
def __ne__(self, __value: object) -> bool:
|
||||
return False
|
||||
|
||||
from os import walk
|
||||
|
||||
WILDCARD = AnyType("*")
|
||||
|
||||
MODEL_EXTENSIONS = {
|
||||
"safetensors": "SafeTensors file format",
|
||||
"ckpt": "Checkpoint file",
|
||||
"pth": "PyTorch serialized file",
|
||||
"pkl": "Pickle file",
|
||||
"onnx": "ONNX file",
|
||||
}
|
||||
|
||||
def fetch_files(path):
|
||||
for (dirpath, dirnames, filenames) in walk(path):
|
||||
fs = []
|
||||
if len(dirnames) > 0:
|
||||
for dirname in dirnames:
|
||||
fs.extend(fetch_files(f"{dirpath}/{dirname}"))
|
||||
for filename in filenames:
|
||||
# Remove "./models/" from the beginning of dirpath
|
||||
relative_dirpath = dirpath.replace("./models/", "", 1)
|
||||
file_path = f"{relative_dirpath}/{filename}"
|
||||
|
||||
# Only add files that are known model extensions
|
||||
file_extension = filename.split('.')[-1].lower()
|
||||
if file_extension in MODEL_EXTENSIONS:
|
||||
fs.append(file_path)
|
||||
|
||||
return fs
|
||||
allModels = fetch_files("./models")
|
||||
|
||||
class ComfyUIDeployModalList:
|
||||
@classmethod
|
||||
def INPUT_TYPES(s):
|
||||
return {
|
||||
"required": {
|
||||
"model": (allModels, ),
|
||||
}
|
||||
}
|
||||
|
||||
RETURN_TYPES = (WILDCARD,)
|
||||
RETURN_NAMES = ("model",)
|
||||
|
||||
FUNCTION = "run"
|
||||
|
||||
CATEGORY = "model"
|
||||
|
||||
def run(self, model=""):
|
||||
# Split the model path by '/' and select the last item
|
||||
model_name = model.split('/')[-1]
|
||||
return [model_name]
|
||||
|
||||
|
||||
NODE_CLASS_MAPPINGS = {"ComfyUIDeployModelList": ComfyUIDeployModalList}
|
||||
NODE_DISPLAY_NAME_MAPPINGS = {"ComfyUIDeployModelList": "Model List (ComfyUI Deploy)"}
|
||||
+856
-316
File diff suppressed because it is too large
Load Diff
+27
-7
@@ -6,10 +6,12 @@ from PIL import Image, ImageOps
|
||||
from io import BytesIO
|
||||
from pydantic import BaseModel as PydanticBaseModel
|
||||
|
||||
|
||||
class BaseModel(PydanticBaseModel):
|
||||
class Config:
|
||||
arbitrary_types_allowed = True
|
||||
|
||||
|
||||
class Status(Enum):
|
||||
NOT_STARTED = "not-started"
|
||||
RUNNING = "running"
|
||||
@@ -17,6 +19,7 @@ class Status(Enum):
|
||||
FAILED = "failed"
|
||||
UPLOADING = "uploading"
|
||||
|
||||
|
||||
class StreamingPrompt(BaseModel):
|
||||
workflow_api: Any
|
||||
auth_token: str
|
||||
@@ -24,42 +27,52 @@ class StreamingPrompt(BaseModel):
|
||||
running_prompt_ids: set[str] = set()
|
||||
status_endpoint: Optional[str]
|
||||
file_upload_endpoint: Optional[str]
|
||||
workflow: Any
|
||||
gpu_event_id: Optional[str] = None
|
||||
|
||||
|
||||
class SimplePrompt(BaseModel):
|
||||
status_endpoint: Optional[str]
|
||||
file_upload_endpoint: Optional[str]
|
||||
|
||||
token: Optional[str]
|
||||
|
||||
workflow_api: dict
|
||||
status: Status = Status.NOT_STARTED
|
||||
progress: set = set()
|
||||
last_updated_node: Optional[str] = None,
|
||||
last_updated_node: Optional[str] = None
|
||||
uploading_nodes: set = set()
|
||||
done: bool = False
|
||||
is_realtime: bool = False,
|
||||
start_time: Optional[float] = None,
|
||||
is_realtime: bool = False
|
||||
start_time: Optional[float] = None
|
||||
gpu_event_id: Optional[str] = None
|
||||
|
||||
|
||||
sockets = dict()
|
||||
prompt_metadata: dict[str, SimplePrompt] = {}
|
||||
streaming_prompt_metadata: dict[str, StreamingPrompt] = {}
|
||||
|
||||
|
||||
class BinaryEventTypes:
|
||||
PREVIEW_IMAGE = 1
|
||||
UNENCODED_PREVIEW_IMAGE = 2
|
||||
|
||||
|
||||
max_output_id_length = 24
|
||||
|
||||
|
||||
async def send_image(image_data, sid=None, output_id: str = None):
|
||||
max_length = max_output_id_length
|
||||
output_id = output_id[:max_length]
|
||||
padded_output_id = output_id.ljust(max_length, '\x00')
|
||||
encoded_output_id = padded_output_id.encode('ascii', 'replace')
|
||||
padded_output_id = output_id.ljust(max_length, "\x00")
|
||||
encoded_output_id = padded_output_id.encode("ascii", "replace")
|
||||
|
||||
image_type = image_data[0]
|
||||
image = image_data[1]
|
||||
max_size = image_data[2]
|
||||
quality = image_data[3]
|
||||
if max_size is not None:
|
||||
if hasattr(Image, 'Resampling'):
|
||||
if hasattr(Image, "Resampling"):
|
||||
resampling = Image.Resampling.BILINEAR
|
||||
else:
|
||||
resampling = Image.ANTIALIAS
|
||||
@@ -88,12 +101,18 @@ async def send_image(image_data, sid=None, output_id:str = None):
|
||||
preview_bytes = bytesIO.getvalue()
|
||||
await send_bytes(BinaryEventTypes.PREVIEW_IMAGE, preview_bytes, sid=sid)
|
||||
|
||||
|
||||
async def send_socket_catch_exception(function, message):
|
||||
try:
|
||||
await function(message)
|
||||
except (aiohttp.ClientError, aiohttp.ClientPayloadError, ConnectionResetError) as err:
|
||||
except (
|
||||
aiohttp.ClientError,
|
||||
aiohttp.ClientPayloadError,
|
||||
ConnectionResetError,
|
||||
) as err:
|
||||
print("send error:", err)
|
||||
|
||||
|
||||
def encode_bytes(event, data):
|
||||
if not isinstance(event, int):
|
||||
raise RuntimeError(f"Binary event types must be integers, got {event}")
|
||||
@@ -103,6 +122,7 @@ def encode_bytes(event, data):
|
||||
message.extend(data)
|
||||
return message
|
||||
|
||||
|
||||
async def send_bytes(event, data, sid=None):
|
||||
message = encode_bytes(event, data)
|
||||
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
[project]
|
||||
name = "comfyui-deploy"
|
||||
description = "Open source comfyui deployment platform, a vercel for generative workflow infra."
|
||||
version = "1.0.0"
|
||||
version = "1.1.0"
|
||||
license = "LICENSE"
|
||||
dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg"]
|
||||
|
||||
|
||||
@@ -2,4 +2,5 @@ aiofiles
|
||||
pydantic
|
||||
opencv-python
|
||||
imageio-ffmpeg
|
||||
brotli
|
||||
# logfire
|
||||
+481
-67
@@ -2,6 +2,7 @@ import { app } from "./app.js";
|
||||
import { api } from "./api.js";
|
||||
import { ComfyWidgets, LGraphNode } from "./widgets.js";
|
||||
import { generateDependencyGraph } from "https://esm.sh/[email protected]";
|
||||
import { ComfyDeploy } from "https://esm.sh/[email protected]";
|
||||
|
||||
const loadingIcon = `<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 24 24"><g fill="none" stroke="#888888" stroke-linecap="round" stroke-width="2"><path stroke-dasharray="60" stroke-dashoffset="60" stroke-opacity=".3" d="M12 3C16.9706 3 21 7.02944 21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3Z"><animate fill="freeze" attributeName="stroke-dashoffset" dur="1.3s" values="60;0"/></path><path stroke-dasharray="15" stroke-dashoffset="15" d="M12 3C16.9706 3 21 7.02944 21 12"><animate fill="freeze" attributeName="stroke-dashoffset" dur="0.3s" values="15;0"/><animateTransform attributeName="transform" dur="1.5s" repeatCount="indefinite" type="rotate" values="0 12 12;360 12 12"/></path></g></svg>`;
|
||||
|
||||
@@ -82,11 +83,52 @@ 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",
|
||||
// };
|
||||
|
||||
async function getSelectedWorkflowInfo() {
|
||||
const workflow_info_promise = new Promise((resolve) => {
|
||||
try {
|
||||
const handleMessage = (event) => {
|
||||
try {
|
||||
const message = JSON.parse(event.data);
|
||||
if (message.type === "workflow_info") {
|
||||
resolve(message.data);
|
||||
window.removeEventListener("message", handleMessage);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
resolve(undefined);
|
||||
}
|
||||
};
|
||||
window.addEventListener("message", handleMessage);
|
||||
sendEventToCD("workflow_info");
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
resolve(undefined);
|
||||
}
|
||||
});
|
||||
|
||||
return workflow_info_promise;
|
||||
}
|
||||
|
||||
function setSelectedWorkflowInfo(info) {
|
||||
context.selectedWorkflowInfo = info;
|
||||
}
|
||||
|
||||
/** @typedef {import('../../../web/types/comfy.js').ComfyExtension} ComfyExtension*/
|
||||
/** @type {ComfyExtension} */
|
||||
const ext = {
|
||||
name: "BennyKok.ComfyUIDeploy",
|
||||
|
||||
native_mode: false,
|
||||
|
||||
init(app) {
|
||||
addButton();
|
||||
|
||||
@@ -96,16 +138,17 @@ const ext = {
|
||||
const org_display = queryParams.get("org_display");
|
||||
const origin = queryParams.get("origin");
|
||||
const workspace_mode = queryParams.get("workspace_mode");
|
||||
this.native_mode = queryParams.get("native_mode") === "true";
|
||||
|
||||
if (workspace_mode) {
|
||||
document.querySelector(".comfy-menu").style.display = "none";
|
||||
|
||||
sendEventToCD("cd_plugin_onInit");
|
||||
|
||||
app.queuePrompt = ((originalFunction) => async () => {
|
||||
// const prompt = await app.graphToPrompt();
|
||||
sendEventToCD("cd_plugin_onQueuePromptTrigger");
|
||||
})(app.queuePrompt);
|
||||
// app.queuePrompt = ((originalFunction) => async () => {
|
||||
// // const prompt = await app.graphToPrompt();
|
||||
// sendEventToCD("cd_plugin_onQueuePromptTrigger");
|
||||
// })(app.queuePrompt);
|
||||
|
||||
// // Intercept the onkeydown event
|
||||
// window.addEventListener(
|
||||
@@ -191,11 +234,13 @@ const ext = {
|
||||
|
||||
registerCustomNodes() {
|
||||
/** @type {LGraphNode}*/
|
||||
class ComfyDeploy {
|
||||
color = LGraphCanvas.node_colors.yellow.color;
|
||||
bgcolor = LGraphCanvas.node_colors.yellow.bgcolor;
|
||||
groupcolor = LGraphCanvas.node_colors.yellow.groupcolor;
|
||||
class ComfyDeploy extends LGraphNode {
|
||||
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) {
|
||||
this.properties = {};
|
||||
this.properties.workflow_name = "";
|
||||
@@ -203,50 +248,75 @@ const ext = {
|
||||
this.properties.version = "";
|
||||
}
|
||||
|
||||
ComfyWidgets.STRING(
|
||||
this,
|
||||
this.addWidget(
|
||||
"text",
|
||||
"workflow_name",
|
||||
["", { default: this.properties.workflow_name, multiline: false }],
|
||||
app,
|
||||
this.properties.workflow_name,
|
||||
(v) => {
|
||||
this.properties.workflow_name = v;
|
||||
},
|
||||
{ multiline: false },
|
||||
);
|
||||
|
||||
ComfyWidgets.STRING(
|
||||
this,
|
||||
this.addWidget(
|
||||
"text",
|
||||
"workflow_id",
|
||||
["", { default: this.properties.workflow_id, multiline: false }],
|
||||
app,
|
||||
this.properties.workflow_id,
|
||||
(v) => {
|
||||
this.properties.workflow_id = v;
|
||||
},
|
||||
{ multiline: false },
|
||||
);
|
||||
|
||||
ComfyWidgets.STRING(
|
||||
this,
|
||||
this.addWidget(
|
||||
"text",
|
||||
"version",
|
||||
["", { default: this.properties.version, multiline: false }],
|
||||
app,
|
||||
this.properties.version,
|
||||
(v) => {
|
||||
this.properties.version = v;
|
||||
},
|
||||
{ multiline: false },
|
||||
);
|
||||
|
||||
// this.widgets.forEach((w) => {
|
||||
// // w.computeSize = () => [200,10]
|
||||
// w.computedHeight = 2;
|
||||
// })
|
||||
|
||||
this.widgets_start_y = 10;
|
||||
this.setSize(this.computeSize());
|
||||
|
||||
// const config = { };
|
||||
|
||||
// console.log(this);
|
||||
this.serialize_widgets = 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(
|
||||
"ComfyDeploy",
|
||||
Object.assign(ComfyDeploy, {
|
||||
title_mode: LiteGraph.NORMAL_TITLE,
|
||||
title: "Comfy Deploy",
|
||||
title_mode: LiteGraph.NORMAL_TITLE,
|
||||
collapsable: true,
|
||||
}),
|
||||
);
|
||||
@@ -268,6 +338,17 @@ const ext = {
|
||||
// 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
|
||||
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");
|
||||
app.loadGraphData(comfyUIWorkflow);
|
||||
}
|
||||
@@ -278,7 +359,11 @@ const ext = {
|
||||
sendEventToCD("cd_plugin_onDeployChanges", prompt);
|
||||
} else if (message.type === "queue_prompt") {
|
||||
const prompt = await app.graphToPrompt();
|
||||
if (typeof api.handlePromptGenerated === "function") {
|
||||
api.handlePromptGenerated(prompt);
|
||||
} else {
|
||||
console.warn("api.handlePromptGenerated is not a function");
|
||||
}
|
||||
sendEventToCD("cd_plugin_onQueuePrompt", prompt);
|
||||
} else if (message.type === "get_prompt") {
|
||||
const prompt = await app.graphToPrompt();
|
||||
@@ -301,6 +386,58 @@ const ext = {
|
||||
|
||||
app.graph.add(node);
|
||||
app.graph.afterChange();
|
||||
} else if (message.type === "zoom_to_node") {
|
||||
const nodeId = message.data.nodeId;
|
||||
const position = message.data.position;
|
||||
|
||||
const node = app.graph.getNodeById(nodeId);
|
||||
if (!node) return;
|
||||
|
||||
const canvas = app.canvas;
|
||||
const targetScale = 1;
|
||||
const targetOffsetX =
|
||||
canvas.canvas.width / 4 - position[0] - node.size[0] / 2;
|
||||
const targetOffsetY =
|
||||
canvas.canvas.height / 4 - position[1] - node.size[1] / 2;
|
||||
|
||||
const startScale = canvas.ds.scale;
|
||||
const startOffsetX = canvas.ds.offset[0];
|
||||
const startOffsetY = canvas.ds.offset[1];
|
||||
|
||||
const duration = 400; // Animation duration in milliseconds
|
||||
const startTime = Date.now();
|
||||
|
||||
function easeOutCubic(t) {
|
||||
return 1 - Math.pow(1 - t, 3);
|
||||
}
|
||||
|
||||
function lerp(start, end, t) {
|
||||
return start * (1 - t) + end * t;
|
||||
}
|
||||
|
||||
function animate() {
|
||||
const currentTime = Date.now();
|
||||
const elapsedTime = currentTime - startTime;
|
||||
const t = Math.min(elapsedTime / duration, 1);
|
||||
|
||||
const easedT = easeOutCubic(t);
|
||||
|
||||
const currentScale = lerp(startScale, targetScale, easedT);
|
||||
const currentOffsetX = lerp(startOffsetX, targetOffsetX, easedT);
|
||||
const currentOffsetY = lerp(startOffsetY, targetOffsetY, easedT);
|
||||
|
||||
canvas.setZoom(currentScale);
|
||||
canvas.ds.offset = [currentOffsetX, currentOffsetY];
|
||||
canvas.draw(true, true);
|
||||
|
||||
if (t < 1) {
|
||||
requestAnimationFrame(animate);
|
||||
}
|
||||
}
|
||||
|
||||
animate();
|
||||
} else if (message.type === "workflow_info") {
|
||||
setSelectedWorkflowInfo(message.data);
|
||||
}
|
||||
// else if (message.type === "refresh") {
|
||||
// sendEventToCD("cd_plugin_onRefresh");
|
||||
@@ -320,6 +457,25 @@ const ext = {
|
||||
// }
|
||||
});
|
||||
|
||||
if (this.native_mode) {
|
||||
// console.log("native mode", window, window.app);
|
||||
try {
|
||||
await app.ui.settings.setSettingValueAsync("Comfy.UseNewMenu", "Top");
|
||||
await app.ui.settings.setSettingValueAsync(
|
||||
"Comfy.Sidebar.Size",
|
||||
"small"
|
||||
);
|
||||
await app.ui.settings.setSettingValueAsync(
|
||||
"Comfy.Sidebar.Location",
|
||||
"right"
|
||||
);
|
||||
localStorage.setItem("Comfy.MenuPosition.Docked", "true");
|
||||
console.log("native mode manmanman");
|
||||
} catch (error) {
|
||||
console.error("Error setting validation to false", error);
|
||||
}
|
||||
}
|
||||
|
||||
app.graph.onAfterChange = ((originalFunction) =>
|
||||
async function () {
|
||||
const prompt = await app.graphToPrompt();
|
||||
@@ -375,11 +531,14 @@ function createDynamicUIHtml(data) {
|
||||
Object.values(data.custom_nodes).forEach((node) => {
|
||||
html += `
|
||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 16px;">
|
||||
<a href="${node.url
|
||||
}" target="_blank" style="font-size: 18px; font-weight: semibold; color: white; text-decoration: none;">${node.name
|
||||
<a href="${
|
||||
node.url
|
||||
}" 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>
|
||||
${node.warning
|
||||
${
|
||||
node.warning
|
||||
? `<p style="font-size: 14px; color: #d69e2e;">${node.warning}</p>`
|
||||
: ""
|
||||
}
|
||||
@@ -396,7 +555,8 @@ function createDynamicUIHtml(data) {
|
||||
Object.entries(data.models).forEach(([section, items]) => {
|
||||
html += `
|
||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
|
||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
|
||||
section.charAt(0).toUpperCase() + section.slice(1)
|
||||
}</h3>`;
|
||||
items.forEach((item) => {
|
||||
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
||||
@@ -413,7 +573,8 @@ function createDynamicUIHtml(data) {
|
||||
Object.entries(data.files).forEach(([section, items]) => {
|
||||
html += `
|
||||
<div style="border-bottom: 1px solid #e2e8f0; padding-top: 8px; padding-bottom: 8px;">
|
||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${section.charAt(0).toUpperCase() + section.slice(1)
|
||||
<h3 style="font-size: 18px; font-weight: semibold; margin-bottom: 8px;">${
|
||||
section.charAt(0).toUpperCase() + section.slice(1)
|
||||
}</h3>`;
|
||||
items.forEach((item) => {
|
||||
html += `<p style="font-size: 14px; color: ${textColor};">${item.name}</p>`;
|
||||
@@ -426,6 +587,7 @@ function createDynamicUIHtml(data) {
|
||||
return html;
|
||||
}
|
||||
|
||||
// Modify the existing deployWorkflow function
|
||||
async function deployWorkflow() {
|
||||
const deploy = document.getElementById("deploy-button");
|
||||
|
||||
@@ -572,30 +734,30 @@ async function deployWorkflow() {
|
||||
console.log(hash);
|
||||
return hash.file_hash;
|
||||
},
|
||||
handleFileUpload: async (file, hash, prevhash) => {
|
||||
console.log("Uploading ", file);
|
||||
loadingDialog.showLoading("Uploading file", file);
|
||||
try {
|
||||
const { download_url } = await fetch(`/comfyui-deploy/upload-file`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({
|
||||
file_path: file,
|
||||
token: apiKey,
|
||||
url: endpoint + "/api/upload-url",
|
||||
}),
|
||||
})
|
||||
.then((x) => x.json())
|
||||
.catch(() => {
|
||||
loadingDialog.close();
|
||||
confirmDialog.confirm("Error", "Unable to upload file " + file);
|
||||
});
|
||||
loadingDialog.showLoading("Uploaded file", file);
|
||||
console.log(download_url);
|
||||
return download_url;
|
||||
} catch (error) {
|
||||
return undefined;
|
||||
}
|
||||
},
|
||||
// handleFileUpload: async (file, hash, prevhash) => {
|
||||
// console.log("Uploading ", file);
|
||||
// loadingDialog.showLoading("Uploading file", file);
|
||||
// try {
|
||||
// const { download_url } = await fetch(`/comfyui-deploy/upload-file`, {
|
||||
// method: "POST",
|
||||
// body: JSON.stringify({
|
||||
// file_path: file,
|
||||
// token: apiKey,
|
||||
// url: endpoint + "/api/upload-url",
|
||||
// }),
|
||||
// })
|
||||
// .then((x) => x.json())
|
||||
// .catch(() => {
|
||||
// loadingDialog.close();
|
||||
// confirmDialog.confirm("Error", "Unable to upload file " + file);
|
||||
// });
|
||||
// loadingDialog.showLoading("Uploaded file", file);
|
||||
// console.log(download_url);
|
||||
// return download_url;
|
||||
// } catch (error) {
|
||||
// return undefined;
|
||||
// }
|
||||
// },
|
||||
existingDependencies: existing_workflow.dependencies,
|
||||
});
|
||||
|
||||
@@ -620,6 +782,15 @@ async function deployWorkflow() {
|
||||
"Check dependencies",
|
||||
// JSON.stringify(deps, null, 2),
|
||||
`
|
||||
<div>
|
||||
You will need to create a cloud machine with the following configuration on ComfyDeploy
|
||||
<ol style="text-align: left; margin-top: 10px;">
|
||||
<li>Review the dependencies listed in the graph below</li>
|
||||
<li>Create a new cloud machine with the required configuration</li>
|
||||
<li>Install missing models and check missing files</li>
|
||||
<li>Deploy your workflow to the newly created machine</li>
|
||||
</ol>
|
||||
</div>
|
||||
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">${loadingIcon}</div>
|
||||
<iframe
|
||||
style="z-index: 10; min-width: 600px; max-width: 1024px; min-height: 600px; border: none; background-color: transparent;"
|
||||
@@ -689,6 +860,14 @@ async function deployWorkflow() {
|
||||
`<span style="color:green;">Deployed successfully!</span> <a style="color:white;" target="_blank" href=${endpoint}/workflows/${data.workflow_id}>-> View here</a> <br/> <br/> Workflow ID: ${data.workflow_id} <br/> Workflow Name: ${workflow_name} <br/> Workflow Version: ${data.version} <br/>`,
|
||||
);
|
||||
|
||||
// // Refresh the workflows list in the sidebar
|
||||
// const sidebarEl = document.querySelector(
|
||||
// '.comfy-sidebar-tab[data-id="search"]',
|
||||
// );
|
||||
// if (sidebarEl) {
|
||||
// refreshWorkflowsList(sidebarEl);
|
||||
// }
|
||||
|
||||
setTimeout(() => {
|
||||
title.textContent = "Deploy";
|
||||
title.style.color = "white";
|
||||
@@ -706,6 +885,85 @@ async function deployWorkflow() {
|
||||
}
|
||||
}
|
||||
|
||||
// Add this function to refresh the workflows list
|
||||
function refreshWorkflowsList(el) {
|
||||
const workflowsList = el.querySelector("#workflows-list");
|
||||
const workflowsLoading = el.querySelector("#workflows-loading");
|
||||
|
||||
workflowsLoading.style.display = "flex";
|
||||
workflowsList.style.display = "none";
|
||||
workflowsList.innerHTML = "";
|
||||
|
||||
client.workflows
|
||||
.getAll({
|
||||
page: "1",
|
||||
pageSize: "10",
|
||||
})
|
||||
.then((result) => {
|
||||
workflowsLoading.style.display = "none";
|
||||
workflowsList.style.display = "block";
|
||||
|
||||
if (result.length === 0) {
|
||||
workflowsList.innerHTML =
|
||||
"<li style='color: #bdbdbd;'>No workflows found</li>";
|
||||
return;
|
||||
}
|
||||
|
||||
result.forEach((workflow) => {
|
||||
const li = document.createElement("li");
|
||||
li.style.marginBottom = "15px";
|
||||
li.style.padding = "15px";
|
||||
li.style.backgroundColor = "#2a2a2a";
|
||||
li.style.borderRadius = "8px";
|
||||
li.style.boxShadow = "0 2px 4px rgba(0,0,0,0.1)";
|
||||
|
||||
const lastRun = workflow.runs[0];
|
||||
const lastRunStatus = lastRun ? lastRun.status : "No runs";
|
||||
const statusColor =
|
||||
lastRunStatus === "success"
|
||||
? "#4CAF50"
|
||||
: lastRunStatus === "error"
|
||||
? "#F44336"
|
||||
: "#FFC107";
|
||||
|
||||
const timeAgo = getTimeAgo(new Date(workflow.updatedAt));
|
||||
|
||||
li.innerHTML = `
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px;">
|
||||
<div style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
|
||||
<strong style="font-size: 18px; color: #e0e0e0;">${workflow.name}</strong>
|
||||
</div>
|
||||
<span style="font-size: 12px; color: ${statusColor}; margin-left: 10px;">Last run: ${lastRunStatus}</span>
|
||||
</div>
|
||||
<div style="font-size: 14px; color: #bdbdbd; margin-bottom: 10px;">Last updated ${timeAgo}</div>
|
||||
<div style="display: flex; gap: 10px;">
|
||||
<button class="open-cloud-btn" style="padding: 5px 10px; background-color: #4CAF50; color: white; border: none; border-radius: 4px; cursor: pointer;">Open in Cloud</button>
|
||||
<button class="load-api-btn" style="padding: 5px 10px; background-color: #2196F3; color: white; border: none; border-radius: 4px; cursor: pointer;">Load Workflow</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
const openCloudBtn = li.querySelector(".open-cloud-btn");
|
||||
openCloudBtn.onclick = () =>
|
||||
window.open(
|
||||
`${getData().endpoint}/workflows/${workflow.id}?workspace=true`,
|
||||
"_blank",
|
||||
);
|
||||
|
||||
const loadApiBtn = li.querySelector(".load-api-btn");
|
||||
loadApiBtn.onclick = () => loadWorkflowApi(workflow.versions[0].id);
|
||||
|
||||
workflowsList.appendChild(li);
|
||||
});
|
||||
})
|
||||
.catch((error) => {
|
||||
console.error("Error fetching workflows:", error);
|
||||
workflowsLoading.style.display = "none";
|
||||
workflowsList.style.display = "block";
|
||||
workflowsList.innerHTML =
|
||||
"<li style='color: #F44336;'>Error fetching workflows</li>";
|
||||
});
|
||||
}
|
||||
|
||||
function addButton() {
|
||||
const menu = document.querySelector(".comfy-menu");
|
||||
|
||||
@@ -837,9 +1095,11 @@ export class LoadingDialog extends ComfyDialog {
|
||||
showLoading(title, message) {
|
||||
this.show(`
|
||||
<div style="width: 400px; display: flex; gap: 18px; flex-direction: column; overflow: unset">
|
||||
<h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${this.loadingIcon
|
||||
<h3 style="margin: 0px; display: flex; align-items: center; justify-content: center; gap: 12px;">${title} ${
|
||||
this.loadingIcon
|
||||
}</h3>
|
||||
${message
|
||||
${
|
||||
message
|
||||
? `<label style="max-width: 100%; white-space: pre-wrap; word-wrap: break-word;">${message}</label>`
|
||||
: ""
|
||||
}
|
||||
@@ -1108,16 +1368,20 @@ export class ConfigDialog extends ComfyDialog {
|
||||
</label>
|
||||
<label style="color: white; width: 100%;">
|
||||
Endpoint:
|
||||
<input id="endpoint" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="text" value="${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>
|
||||
<div style="color: white;">
|
||||
API Key: User / Org <button style="font-size: 18px;">${data.displayName ?? ""
|
||||
API Key: User / Org <button style="font-size: 18px;">${
|
||||
data.displayName ?? ""
|
||||
}</button>
|
||||
<input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${data.apiKey
|
||||
<input id="apiKey" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;" type="password" value="${
|
||||
data.apiKey
|
||||
}">
|
||||
<button id="loginButton" style="margin-top: 8px; width: 100%; height:40px; box-sizing: border-box; padding: 0px 6px;">
|
||||
${data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
|
||||
${
|
||||
data.apiKey ? "Re-login with ComfyDeploy" : "Login with ComfyDeploy"
|
||||
}
|
||||
</button>
|
||||
</div>
|
||||
@@ -1192,3 +1456,153 @@ export class ConfigDialog extends ComfyDialog {
|
||||
}
|
||||
|
||||
export const configDialog = new ConfigDialog();
|
||||
|
||||
const currentOrigin = window.location.origin;
|
||||
const client = new ComfyDeploy({
|
||||
bearerAuth: getData().apiKey,
|
||||
serverURL: `${currentOrigin}/comfydeploy/api/`,
|
||||
});
|
||||
|
||||
app.extensionManager.registerSidebarTab({
|
||||
id: "search",
|
||||
icon: "pi pi-cloud-upload",
|
||||
title: "Deploy",
|
||||
tooltip: "Deploy and Configure",
|
||||
type: "custom",
|
||||
render: (el) => {
|
||||
el.innerHTML = `
|
||||
<div style="padding: 20px;">
|
||||
<h3>Comfy Deploy</h3>
|
||||
<div id="deploy-container" style="margin-bottom: 20px;"></div>
|
||||
<div id="workflows-container">
|
||||
<h4>Your Workflows</h4>
|
||||
<div id="workflows-loading" style="display: flex; justify-content: center; align-items: center; height: 100px;">
|
||||
${loadingIcon}
|
||||
</div>
|
||||
<ul id="workflows-list" style="list-style-type: none; padding: 0; display: none;"></ul>
|
||||
</div>
|
||||
<div id="config-container"></div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
// Add deploy button
|
||||
const deployContainer = el.querySelector("#deploy-container");
|
||||
const deployButton = document.createElement("button");
|
||||
deployButton.id = "sidebar-deploy-button";
|
||||
deployButton.style.display = "flex";
|
||||
deployButton.style.alignItems = "center";
|
||||
deployButton.style.justifyContent = "center";
|
||||
deployButton.style.width = "100%";
|
||||
deployButton.style.marginBottom = "10px";
|
||||
deployButton.style.padding = "10px";
|
||||
deployButton.style.fontSize = "16px";
|
||||
deployButton.style.fontWeight = "bold";
|
||||
deployButton.style.backgroundColor = "#4CAF50";
|
||||
deployButton.style.color = "white";
|
||||
deployButton.style.border = "none";
|
||||
deployButton.style.borderRadius = "5px";
|
||||
deployButton.style.cursor = "pointer";
|
||||
deployButton.innerHTML = `<i class="pi pi-cloud-upload" style="margin-right: 8px;"></i><div id='sidebar-button-title'>Deploy</div>`;
|
||||
deployButton.onclick = async () => {
|
||||
await deployWorkflow();
|
||||
// Refresh the workflows list after deployment
|
||||
refreshWorkflowsList(el);
|
||||
};
|
||||
deployContainer.appendChild(deployButton);
|
||||
|
||||
// Add config button
|
||||
const configContainer = el.querySelector("#config-container");
|
||||
const configButton = document.createElement("button");
|
||||
configButton.style.display = "flex";
|
||||
configButton.style.alignItems = "center";
|
||||
configButton.style.justifyContent = "center";
|
||||
configButton.style.width = "100%";
|
||||
configButton.style.padding = "8px";
|
||||
configButton.style.fontSize = "14px";
|
||||
configButton.style.backgroundColor = "#f0f0f0";
|
||||
configButton.style.color = "#333";
|
||||
configButton.style.border = "1px solid #ccc";
|
||||
configButton.style.borderRadius = "5px";
|
||||
configButton.style.cursor = "pointer";
|
||||
configButton.innerHTML = `<i class="pi pi-cog" style="margin-right: 8px;"></i>Configure`;
|
||||
configButton.onclick = () => {
|
||||
configDialog.show();
|
||||
};
|
||||
deployContainer.appendChild(configButton);
|
||||
|
||||
// Fetch and display workflows
|
||||
const workflowsList = el.querySelector("#workflows-list");
|
||||
const workflowsLoading = el.querySelector("#workflows-loading");
|
||||
|
||||
refreshWorkflowsList(el);
|
||||
},
|
||||
});
|
||||
|
||||
function getTimeAgo(date) {
|
||||
const seconds = Math.floor((new Date() - date) / 1000);
|
||||
let interval = seconds / 31536000;
|
||||
if (interval > 1) return Math.floor(interval) + " years ago";
|
||||
interval = seconds / 2592000;
|
||||
if (interval > 1) return Math.floor(interval) + " months ago";
|
||||
interval = seconds / 86400;
|
||||
if (interval > 1) return Math.floor(interval) + " days ago";
|
||||
interval = seconds / 3600;
|
||||
if (interval > 1) return Math.floor(interval) + " hours ago";
|
||||
interval = seconds / 60;
|
||||
if (interval > 1) return Math.floor(interval) + " minutes ago";
|
||||
return Math.floor(seconds) + " seconds ago";
|
||||
}
|
||||
|
||||
async function loadWorkflowApi(versionId) {
|
||||
try {
|
||||
const response = await client.comfyui.getWorkflowVersionVersionId({
|
||||
versionId: versionId,
|
||||
});
|
||||
// Implement the logic to load the workflow API into the ComfyUI interface
|
||||
console.log("Workflow API loaded:", response);
|
||||
await window["app"].ui.settings.setSettingValueAsync(
|
||||
"Comfy.Validation.Workflows",
|
||||
false,
|
||||
);
|
||||
app.loadGraphData(response.workflow);
|
||||
// You might want to update the UI or trigger some action in ComfyUI here
|
||||
} catch (error) {
|
||||
console.error("Error loading workflow API:", error);
|
||||
// Show an error message to the user
|
||||
}
|
||||
}
|
||||
|
||||
const orginal_fetch_api = api.fetchApi;
|
||||
api.fetchApi = async (route, options) => {
|
||||
console.log("Fetch API called with args:", route, options, ext.native_mode);
|
||||
|
||||
if (route.startsWith("/prompt") && ext.native_mode) {
|
||||
const info = await getSelectedWorkflowInfo();
|
||||
console.log("info", info);
|
||||
if (info) {
|
||||
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,
|
||||
gpu_event_id: info.gpu_event_id,
|
||||
};
|
||||
|
||||
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",
|
||||
ComfyUIDeployExternalLora: "string - (public lora download url)",
|
||||
ComfyUIDeployExternalCheckpoint: "string - (public checkpoints download url)",
|
||||
ComfyUIDeployExternalFaceModel: "string - (public face model download url)",
|
||||
};
|
||||
|
||||
@@ -51,7 +51,9 @@ const createRunRoute = createRoute({
|
||||
export const registerCreateRunRoute = (app: App) => {
|
||||
app.openapi(createRunRoute, async (c) => {
|
||||
const data = c.req.valid("json");
|
||||
const origin = new URL(c.req.url).origin;
|
||||
const proto = c.req.headers.get('x-forwarded-proto') || "http";
|
||||
const host = c.req.headers.get('x-forwarded-host') || c.req.headers.get('host');
|
||||
const origin = `${proto}://${host}` || new URL(c.req.url).origin;
|
||||
const apiKeyTokenData = c.get("apiKeyTokenData")!;
|
||||
|
||||
const { deployment_id, inputs } = data;
|
||||
|
||||
Reference in New Issue
Block a user