Compare commits
137
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5423b4ee6f | ||
|
|
2c1656756d | ||
|
|
ac843527d9 | ||
|
|
f39d216326 | ||
|
|
40ec37e58f | ||
|
|
1d63b21643 | ||
|
|
0e3baf22df | ||
|
|
1837065ed2 | ||
|
|
9a8f4795d1 | ||
|
|
c0c617c5d2 | ||
|
|
1e33435ae5 | ||
|
|
04161071f2 | ||
|
|
32d574475c | ||
|
|
1a017ee6a3 | ||
|
|
603223741a | ||
|
|
2bd8b23c60 | ||
|
|
a82e315d6c | ||
|
|
7fdfba6b6e | ||
|
|
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 | ||
|
|
e0eae1068b | ||
|
|
4f1a80fb64 | ||
|
|
b4273b1907 | ||
|
|
10ba00e3dd | ||
|
|
eb40fddb76 | ||
|
|
3c9d1865ca | ||
|
|
6fa38e9bb8 | ||
|
|
6e4532078f | ||
|
|
48d21f8d52 | ||
|
|
a2ac1adf01 |
@@ -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]
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,12 @@ import torch
|
|||||||
import folder_paths
|
import folder_paths
|
||||||
from tqdm import tqdm
|
from tqdm import tqdm
|
||||||
|
|
||||||
|
class AnyType(str):
|
||||||
|
def __ne__(self, __value: object) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
WILDCARD = AnyType("*")
|
||||||
|
|
||||||
class ComfyUIDeployExternalCheckpoint:
|
class ComfyUIDeployExternalCheckpoint:
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
@@ -17,17 +23,25 @@ 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": ""},
|
||||||
|
),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
RETURN_TYPES = (folder_paths.get_filename_list("checkpoints"),)
|
RETURN_TYPES = (WILDCARD,)
|
||||||
RETURN_NAMES = ("path",)
|
RETURN_NAMES = ("path",)
|
||||||
|
|
||||||
FUNCTION = "run"
|
FUNCTION = "run"
|
||||||
|
|
||||||
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)
|
||||||
|
|||||||
@@ -5,6 +5,14 @@ import torch
|
|||||||
import folder_paths
|
import folder_paths
|
||||||
|
|
||||||
|
|
||||||
|
class AnyType(str):
|
||||||
|
def __ne__(self, __value: object) -> bool:
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
WILDCARD = AnyType("*")
|
||||||
|
|
||||||
|
|
||||||
class ComfyUIDeployExternalLora:
|
class ComfyUIDeployExternalLora:
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
@@ -17,40 +25,81 @@ class ComfyUIDeployExternalLora:
|
|||||||
},
|
},
|
||||||
"optional": {
|
"optional": {
|
||||||
"default_lora_name": (folder_paths.get_filename_list("loras"),),
|
"default_lora_name": (folder_paths.get_filename_list("loras"),),
|
||||||
|
"lora_save_name": ( # if `default_lora_name` is a link to download a file, we will attempt to save it with this name
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"display_name": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
|
"description": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": True, "default": ""},
|
||||||
|
),
|
||||||
|
"lora_url": (
|
||||||
|
"STRING",
|
||||||
|
{"multiline": False, "default": ""},
|
||||||
|
),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
RETURN_TYPES = (folder_paths.get_filename_list("loras"),)
|
RETURN_TYPES = (WILDCARD,)
|
||||||
RETURN_NAMES = ("path",)
|
RETURN_NAMES = ("path",)
|
||||||
|
|
||||||
FUNCTION = "run"
|
FUNCTION = "run"
|
||||||
|
|
||||||
CATEGORY = "deploy"
|
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 requests
|
||||||
import os
|
import os
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
if default_lora_name.startswith("http"):
|
if lora_url:
|
||||||
unique_filename = str(uuid.uuid4()) + ".safetensors"
|
if lora_url.startswith("http"):
|
||||||
print(unique_filename)
|
if lora_save_name:
|
||||||
print(folder_paths.folder_names_and_paths["loras"][0][0])
|
existing_loras = folder_paths.get_filename_list("loras")
|
||||||
destination_path = os.path.join(
|
# Check if lora_save_name exists in the list
|
||||||
folder_paths.folder_names_and_paths["loras"][0][0], unique_filename
|
if lora_save_name in existing_loras:
|
||||||
)
|
print(f"using lora: {lora_save_name}")
|
||||||
print(destination_path)
|
return (lora_save_name,)
|
||||||
print("Downloading external lora - " + input_id + " to " + destination_path)
|
else:
|
||||||
response = requests.get(
|
lora_save_name = str(uuid.uuid4()) + ".safetensors"
|
||||||
input_id,
|
print(lora_save_name)
|
||||||
headers={"User-Agent": "Mozilla/5.0"},
|
print(folder_paths.folder_names_and_paths["loras"][0][0])
|
||||||
allow_redirects=True,
|
destination_path = os.path.join(
|
||||||
)
|
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
|
||||||
with open(destination_path, "wb") as out_file:
|
)
|
||||||
out_file.write(response.content)
|
print(destination_path)
|
||||||
return (unique_filename,)
|
print(
|
||||||
|
"Downloading external lora - "
|
||||||
|
+ lora_url
|
||||||
|
+ " to "
|
||||||
|
+ destination_path
|
||||||
|
)
|
||||||
|
response = requests.get(
|
||||||
|
lora_url,
|
||||||
|
headers={"User-Agent": "Mozilla/5.0"},
|
||||||
|
allow_redirects=True,
|
||||||
|
)
|
||||||
|
with open(destination_path, "wb") as out_file:
|
||||||
|
out_file.write(response.content)
|
||||||
|
print(f"Ext Lora loading: {lora_url} to {lora_save_name}")
|
||||||
|
return (lora_save_name,)
|
||||||
|
else:
|
||||||
|
print(f"Ext Lora loading: {lora_url}")
|
||||||
|
return (lora_url,)
|
||||||
else:
|
else:
|
||||||
print(f"using lora: {default_lora_name}")
|
print(f"Ext Lora loading: {default_lora_name}")
|
||||||
return (default_lora_name,)
|
return (default_lora_name,)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,15 @@ class ComfyUIDeployExternalNumber:
|
|||||||
"optional": {
|
"optional": {
|
||||||
"default_value": (
|
"default_value": (
|
||||||
"FLOAT",
|
"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"
|
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)
|
||||||
|
|||||||
@@ -16,7 +16,15 @@ class ComfyUIDeployExternalNumberInt:
|
|||||||
"optional": {
|
"optional": {
|
||||||
"default_value": (
|
"default_value": (
|
||||||
"INT",
|
"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"
|
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)]
|
||||||
|
|||||||
@@ -11,15 +11,23 @@ class ComfyUIDeployExternalNumberSlider:
|
|||||||
"optional": {
|
"optional": {
|
||||||
"default_value": (
|
"default_value": (
|
||||||
"FLOAT",
|
"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": (
|
"min_value": (
|
||||||
"FLOAT",
|
"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": (
|
"max_value": (
|
||||||
"FLOAT",
|
"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"
|
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:
|
||||||
|
|||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import re
|
||||||
|
|
||||||
|
|
||||||
|
class StringFunction:
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(s):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"action": (["append", "replace"], {}),
|
||||||
|
"tidy_tags": (["yes", "no"], {}),
|
||||||
|
},
|
||||||
|
"optional": {
|
||||||
|
"text_a": ("STRING", {"multiline": True, "dynamicPrompts": False}),
|
||||||
|
"text_b": ("STRING", {"multiline": True, "dynamicPrompts": False}),
|
||||||
|
"text_c": ("STRING", {"multiline": True, "dynamicPrompts": False}),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
RETURN_TYPES = ("STRING",)
|
||||||
|
FUNCTION = "exec"
|
||||||
|
CATEGORY = "utils"
|
||||||
|
OUTPUT_NODE = True
|
||||||
|
|
||||||
|
def exec(self, action, tidy_tags, text_a="", text_b="", text_c=""):
|
||||||
|
tidy_tags = tidy_tags == "yes"
|
||||||
|
out = ""
|
||||||
|
if action == "append":
|
||||||
|
out = (", " if tidy_tags else "").join(
|
||||||
|
filter(None, [text_a, text_b, text_c])
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if text_c is None:
|
||||||
|
text_c = ""
|
||||||
|
if text_b.startswith("/") and text_b.endswith("/"):
|
||||||
|
regex = text_b[1:-1]
|
||||||
|
out = re.sub(regex, text_c, text_a)
|
||||||
|
else:
|
||||||
|
out = text_a.replace(text_b, text_c)
|
||||||
|
if tidy_tags:
|
||||||
|
out = re.sub(r"\s{2,}", " ", out)
|
||||||
|
out = out.replace(" ,", ",")
|
||||||
|
out = re.sub(r",{2,}", ",", out)
|
||||||
|
out = out.strip()
|
||||||
|
return {"ui": {"text": (out,)}, "result": (out,)}
|
||||||
|
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"ComfyUIDeployStringCombine": StringFunction,
|
||||||
|
}
|
||||||
|
|
||||||
|
NODE_DISPLAY_NAME_MAPPINGS = {
|
||||||
|
"ComfyUIDeployStringCombine": "String Combine (ComfyUI Deploy)",
|
||||||
|
}
|
||||||
@@ -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)"}
|
||||||
+354
-84
@@ -1,10 +1,15 @@
|
|||||||
# credit goes to https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite and is meant to work with
|
# credit goes to https://github.com/Kosinkadink/ComfyUI-VideoHelperSuite
|
||||||
|
# Intended to work with https://github.com/NicholasKao1029/ComfyUI-VideoHelperSuite/tree/main
|
||||||
import os
|
import os
|
||||||
import itertools
|
import itertools
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import torch
|
import torch
|
||||||
|
from typing import Union
|
||||||
|
from torch import Tensor
|
||||||
import cv2
|
import cv2
|
||||||
|
import psutil
|
||||||
|
|
||||||
|
from collections.abc import Mapping
|
||||||
import folder_paths
|
import folder_paths
|
||||||
from comfy.utils import common_upscale
|
from comfy.utils import common_upscale
|
||||||
|
|
||||||
@@ -90,13 +95,25 @@ if gifski_path is None:
|
|||||||
gifski_path = shutil.which("gifski")
|
gifski_path = shutil.which("gifski")
|
||||||
|
|
||||||
|
|
||||||
|
def is_safe_path(path):
|
||||||
|
if "VHS_STRICT_PATHS" not in os.environ:
|
||||||
|
return True
|
||||||
|
basedir = os.path.abspath(".")
|
||||||
|
try:
|
||||||
|
common_path = os.path.commonpath([basedir, path])
|
||||||
|
except:
|
||||||
|
# Different drive on windows
|
||||||
|
return False
|
||||||
|
return common_path == basedir
|
||||||
|
|
||||||
|
|
||||||
def get_sorted_dir_files_from_directory(
|
def get_sorted_dir_files_from_directory(
|
||||||
directory: str,
|
directory: str,
|
||||||
skip_first_images: int = 0,
|
skip_first_images: int = 0,
|
||||||
select_every_nth: int = 1,
|
select_every_nth: int = 1,
|
||||||
extensions: Iterable = None,
|
extensions: Iterable = None,
|
||||||
):
|
):
|
||||||
directory = directory.strip()
|
directory = strip_path(directory)
|
||||||
dir_files = os.listdir(directory)
|
dir_files = os.listdir(directory)
|
||||||
dir_files = sorted(dir_files)
|
dir_files = sorted(dir_files)
|
||||||
dir_files = [os.path.join(directory, x) for x in dir_files]
|
dir_files = [os.path.join(directory, x) for x in dir_files]
|
||||||
@@ -177,18 +194,59 @@ def requeue_workflow(requeue_required=(-1, True)):
|
|||||||
|
|
||||||
|
|
||||||
def get_audio(file, start_time=0, duration=0):
|
def get_audio(file, start_time=0, duration=0):
|
||||||
args = [ffmpeg_path, "-v", "error", "-i", file]
|
args = [ffmpeg_path, "-i", file]
|
||||||
if start_time > 0:
|
if start_time > 0:
|
||||||
args += ["-ss", str(start_time)]
|
args += ["-ss", str(start_time)]
|
||||||
if duration > 0:
|
if duration > 0:
|
||||||
args += ["-t", str(duration)]
|
args += ["-t", str(duration)]
|
||||||
try:
|
try:
|
||||||
|
# TODO: scan for sample rate and maintain
|
||||||
res = subprocess.run(
|
res = subprocess.run(
|
||||||
args + ["-f", "wav", "-"], stdout=subprocess.PIPE, check=True
|
args + ["-f", "f32le", "-"], capture_output=True, check=True
|
||||||
).stdout
|
)
|
||||||
|
audio = torch.frombuffer(bytearray(res.stdout), dtype=torch.float32)
|
||||||
|
match = re.search(", (\\d+) Hz, (\\w+), ", res.stderr.decode("utf-8"))
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
return False
|
raise Exception(
|
||||||
return res
|
f"VHS failed to extract audio from {file}:\n" + e.stderr.decode("utf-8")
|
||||||
|
)
|
||||||
|
if match:
|
||||||
|
ar = int(match.group(1))
|
||||||
|
# NOTE: Just throwing an error for other channel types right now
|
||||||
|
# Will deal with issues if they come
|
||||||
|
ac = {"mono": 1, "stereo": 2}[match.group(2)]
|
||||||
|
else:
|
||||||
|
ar = 44100
|
||||||
|
ac = 2
|
||||||
|
audio = audio.reshape((-1, ac)).transpose(0, 1).unsqueeze(0)
|
||||||
|
return {"waveform": audio, "sample_rate": ar}
|
||||||
|
|
||||||
|
|
||||||
|
class LazyAudioMap(Mapping):
|
||||||
|
def __init__(self, file, start_time, duration):
|
||||||
|
self.file = file
|
||||||
|
self.start_time = start_time
|
||||||
|
self.duration = duration
|
||||||
|
self._dict = None
|
||||||
|
|
||||||
|
def __getitem__(self, key):
|
||||||
|
if self._dict is None:
|
||||||
|
self._dict = get_audio(self.file, self.start_time, self.duration)
|
||||||
|
return self._dict[key]
|
||||||
|
|
||||||
|
def __iter__(self):
|
||||||
|
if self._dict is None:
|
||||||
|
self._dict = get_audio(self.file, self.start_time, self.duration)
|
||||||
|
return iter(self._dict)
|
||||||
|
|
||||||
|
def __len__(self):
|
||||||
|
if self._dict is None:
|
||||||
|
self._dict = get_audio(self.file, self.start_time, self.duration)
|
||||||
|
return len(self._dict)
|
||||||
|
|
||||||
|
|
||||||
|
def lazy_get_audio(file, start_time=0, duration=0):
|
||||||
|
return LazyAudioMap(file, start_time, duration)
|
||||||
|
|
||||||
|
|
||||||
def lazy_eval(func):
|
def lazy_eval(func):
|
||||||
@@ -230,6 +288,19 @@ def validate_sequence(path):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def strip_path(path):
|
||||||
|
# This leaves whitespace inside quotes and only a single "
|
||||||
|
# thus ' ""test"' -> '"test'
|
||||||
|
# consider path.strip(string.whitespace+"\"")
|
||||||
|
# or weightier re.fullmatch("[\\s\"]*(.+?)[\\s\"]*", path).group(1)
|
||||||
|
path = path.strip()
|
||||||
|
if path.startswith('"'):
|
||||||
|
path = path[1:]
|
||||||
|
if path.endswith('"'):
|
||||||
|
path = path[:-1]
|
||||||
|
return path
|
||||||
|
|
||||||
|
|
||||||
def hash_path(path):
|
def hash_path(path):
|
||||||
if path is None:
|
if path is None:
|
||||||
return "input"
|
return "input"
|
||||||
@@ -286,6 +357,145 @@ def target_size(
|
|||||||
return (width, height)
|
return (width, height)
|
||||||
|
|
||||||
|
|
||||||
|
def validate_index(
|
||||||
|
index: int,
|
||||||
|
length: int = 0,
|
||||||
|
is_range: bool = False,
|
||||||
|
allow_negative=False,
|
||||||
|
allow_missing=False,
|
||||||
|
) -> int:
|
||||||
|
# if part of range, do nothing
|
||||||
|
if is_range:
|
||||||
|
return index
|
||||||
|
# otherwise, validate index
|
||||||
|
# validate not out of range - only when latent_count is passed in
|
||||||
|
if length > 0 and index > length - 1 and not allow_missing:
|
||||||
|
raise IndexError(f"Index '{index}' out of range for {length} item(s).")
|
||||||
|
# if negative, validate not out of range
|
||||||
|
if index < 0:
|
||||||
|
if not allow_negative:
|
||||||
|
raise IndexError(f"Negative indeces not allowed, but was '{index}'.")
|
||||||
|
conv_index = length + index
|
||||||
|
if conv_index < 0 and not allow_missing:
|
||||||
|
raise IndexError(
|
||||||
|
f"Index '{index}', converted to '{conv_index}' out of range for {length} item(s)."
|
||||||
|
)
|
||||||
|
index = conv_index
|
||||||
|
return index
|
||||||
|
|
||||||
|
|
||||||
|
def convert_to_index_int(
|
||||||
|
raw_index: str,
|
||||||
|
length: int = 0,
|
||||||
|
is_range: bool = False,
|
||||||
|
allow_negative=False,
|
||||||
|
allow_missing=False,
|
||||||
|
) -> int:
|
||||||
|
try:
|
||||||
|
return validate_index(
|
||||||
|
int(raw_index),
|
||||||
|
length=length,
|
||||||
|
is_range=is_range,
|
||||||
|
allow_negative=allow_negative,
|
||||||
|
allow_missing=allow_missing,
|
||||||
|
)
|
||||||
|
except ValueError as e:
|
||||||
|
raise ValueError(f"Index '{raw_index}' must be an integer.", e)
|
||||||
|
|
||||||
|
|
||||||
|
def convert_str_to_indexes(
|
||||||
|
indexes_str: str, length: int = 0, allow_missing=False
|
||||||
|
) -> list[int]:
|
||||||
|
if not indexes_str:
|
||||||
|
return []
|
||||||
|
int_indexes = list(range(0, length))
|
||||||
|
allow_negative = length > 0
|
||||||
|
chosen_indexes = []
|
||||||
|
# parse string - allow positive ints, negative ints, and ranges separated by ':'
|
||||||
|
groups = indexes_str.split(",")
|
||||||
|
groups = [g.strip() for g in groups]
|
||||||
|
for g in groups:
|
||||||
|
# parse range of indeces (e.g. 2:16)
|
||||||
|
if ":" in g:
|
||||||
|
index_range = g.split(":", 2)
|
||||||
|
index_range = [r.strip() for r in index_range]
|
||||||
|
|
||||||
|
start_index = index_range[0]
|
||||||
|
if len(start_index) > 0:
|
||||||
|
start_index = convert_to_index_int(
|
||||||
|
start_index,
|
||||||
|
length=length,
|
||||||
|
is_range=True,
|
||||||
|
allow_negative=allow_negative,
|
||||||
|
allow_missing=allow_missing,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
start_index = 0
|
||||||
|
end_index = index_range[1]
|
||||||
|
if len(end_index) > 0:
|
||||||
|
end_index = convert_to_index_int(
|
||||||
|
end_index,
|
||||||
|
length=length,
|
||||||
|
is_range=True,
|
||||||
|
allow_negative=allow_negative,
|
||||||
|
allow_missing=allow_missing,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
end_index = length
|
||||||
|
# support step as well, to allow things like reversing, every-other, etc.
|
||||||
|
step = 1
|
||||||
|
if len(index_range) > 2:
|
||||||
|
step = index_range[2]
|
||||||
|
if len(step) > 0:
|
||||||
|
step = convert_to_index_int(
|
||||||
|
step,
|
||||||
|
length=length,
|
||||||
|
is_range=True,
|
||||||
|
allow_negative=True,
|
||||||
|
allow_missing=True,
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
step = 1
|
||||||
|
# if latents were passed in, base indeces on known latent count
|
||||||
|
if len(int_indexes) > 0:
|
||||||
|
chosen_indexes.extend(int_indexes[start_index:end_index][::step])
|
||||||
|
# otherwise, assume indeces are valid
|
||||||
|
else:
|
||||||
|
chosen_indexes.extend(list(range(start_index, end_index, step)))
|
||||||
|
# parse individual indeces
|
||||||
|
else:
|
||||||
|
chosen_indexes.append(
|
||||||
|
convert_to_index_int(
|
||||||
|
g,
|
||||||
|
length=length,
|
||||||
|
allow_negative=allow_negative,
|
||||||
|
allow_missing=allow_missing,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
return chosen_indexes
|
||||||
|
|
||||||
|
|
||||||
|
def select_indexes(input_obj: Union[Tensor, list], idxs: list):
|
||||||
|
if type(input_obj) == Tensor:
|
||||||
|
return input_obj[idxs]
|
||||||
|
else:
|
||||||
|
return [input_obj[i] for i in idxs]
|
||||||
|
|
||||||
|
|
||||||
|
def select_indexes_from_str(
|
||||||
|
input_obj: Union[Tensor, list], indexes: str, err_if_missing=True, err_if_empty=True
|
||||||
|
):
|
||||||
|
real_idxs = convert_str_to_indexes(
|
||||||
|
indexes, len(input_obj), allow_missing=not err_if_missing
|
||||||
|
)
|
||||||
|
if err_if_empty and len(real_idxs) == 0:
|
||||||
|
raise Exception(f"Nothing was selected based on indexes found in '{indexes}'.")
|
||||||
|
return select_indexes(input_obj, real_idxs)
|
||||||
|
|
||||||
|
|
||||||
|
###
|
||||||
|
|
||||||
|
|
||||||
def cv_frame_generator(
|
def cv_frame_generator(
|
||||||
video,
|
video,
|
||||||
force_rate,
|
force_rate,
|
||||||
@@ -295,9 +505,10 @@ def cv_frame_generator(
|
|||||||
meta_batch=None,
|
meta_batch=None,
|
||||||
unique_id=None,
|
unique_id=None,
|
||||||
):
|
):
|
||||||
video_cap = cv2.VideoCapture(video)
|
video_cap = cv2.VideoCapture(strip_path(video))
|
||||||
if not video_cap.isOpened():
|
if not video_cap.isOpened():
|
||||||
raise ValueError(f"{video} could not be loaded with cv.")
|
raise ValueError(f"{video} could not be loaded with cv.")
|
||||||
|
pbar = None
|
||||||
|
|
||||||
# extract video metadata
|
# extract video metadata
|
||||||
fps = video_cap.get(cv2.CAP_PROP_FPS)
|
fps = video_cap.get(cv2.CAP_PROP_FPS)
|
||||||
@@ -319,6 +530,8 @@ def cv_frame_generator(
|
|||||||
target_frame_time = 1 / force_rate
|
target_frame_time = 1 / force_rate
|
||||||
|
|
||||||
yield (width, height, fps, duration, total_frames, target_frame_time)
|
yield (width, height, fps, duration, total_frames, target_frame_time)
|
||||||
|
if meta_batch is not None:
|
||||||
|
yield min(frame_load_cap, total_frames)
|
||||||
|
|
||||||
time_offset = target_frame_time - base_frame_time
|
time_offset = target_frame_time - base_frame_time
|
||||||
while video_cap.isOpened():
|
while video_cap.isOpened():
|
||||||
@@ -349,7 +562,8 @@ def cv_frame_generator(
|
|||||||
frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
|
frame = cv2.cvtColor(frame, cv2.COLOR_BGR2RGB)
|
||||||
# convert frame to comfyui's expected format
|
# convert frame to comfyui's expected format
|
||||||
# TODO: frame contains no exif information. Check if opencv2 has already applied
|
# TODO: frame contains no exif information. Check if opencv2 has already applied
|
||||||
frame = np.array(frame, dtype=np.float32) / 255.0
|
frame = np.array(frame, dtype=np.float32)
|
||||||
|
torch.from_numpy(frame).div_(255)
|
||||||
if prev_frame is not None:
|
if prev_frame is not None:
|
||||||
inp = yield prev_frame
|
inp = yield prev_frame
|
||||||
if inp is not None:
|
if inp is not None:
|
||||||
@@ -357,6 +571,8 @@ def cv_frame_generator(
|
|||||||
return
|
return
|
||||||
prev_frame = frame
|
prev_frame = frame
|
||||||
frames_added += 1
|
frames_added += 1
|
||||||
|
if pbar is not None:
|
||||||
|
pbar.update_absolute(frames_added, frame_load_cap)
|
||||||
# if cap exists and we've reached it, stop processing frames
|
# if cap exists and we've reached it, stop processing frames
|
||||||
if frame_load_cap > 0 and frames_added >= frame_load_cap:
|
if frame_load_cap > 0 and frames_added >= frame_load_cap:
|
||||||
break
|
break
|
||||||
@@ -367,6 +583,17 @@ def cv_frame_generator(
|
|||||||
yield prev_frame
|
yield prev_frame
|
||||||
|
|
||||||
|
|
||||||
|
def batched(it, n):
|
||||||
|
while batch := tuple(itertools.islice(it, n)):
|
||||||
|
yield batch
|
||||||
|
|
||||||
|
|
||||||
|
def batched_vae_encode(images, vae, frames_per_batch):
|
||||||
|
for batch in batched(images, frames_per_batch):
|
||||||
|
image_batch = torch.from_numpy(np.array(batch))
|
||||||
|
yield from vae.encode(image_batch).numpy()
|
||||||
|
|
||||||
|
|
||||||
def load_video_cv(
|
def load_video_cv(
|
||||||
video: str,
|
video: str,
|
||||||
force_rate: int,
|
force_rate: int,
|
||||||
@@ -378,6 +605,8 @@ def load_video_cv(
|
|||||||
select_every_nth: int,
|
select_every_nth: int,
|
||||||
meta_batch=None,
|
meta_batch=None,
|
||||||
unique_id=None,
|
unique_id=None,
|
||||||
|
memory_limit_mb=None,
|
||||||
|
vae=None,
|
||||||
):
|
):
|
||||||
if meta_batch is None or unique_id not in meta_batch.inputs:
|
if meta_batch is None or unique_id not in meta_batch.inputs:
|
||||||
gen = cv_frame_generator(
|
gen = cv_frame_generator(
|
||||||
@@ -401,30 +630,89 @@ def load_video_cv(
|
|||||||
total_frames,
|
total_frames,
|
||||||
target_frame_time,
|
target_frame_time,
|
||||||
)
|
)
|
||||||
|
meta_batch.total_frames = min(meta_batch.total_frames, next(gen))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
(gen, width, height, fps, duration, total_frames, target_frame_time) = (
|
(gen, width, height, fps, duration, total_frames, target_frame_time) = (
|
||||||
meta_batch.inputs[unique_id]
|
meta_batch.inputs[unique_id]
|
||||||
)
|
)
|
||||||
|
|
||||||
if meta_batch is not None:
|
memory_limit = None
|
||||||
gen = itertools.islice(gen, meta_batch.frames_per_batch)
|
if memory_limit_mb is not None:
|
||||||
|
memory_limit *= 2**20
|
||||||
|
else:
|
||||||
|
# TODO: verify if garbage collection should be performed here.
|
||||||
|
# leaves ~128 MB unreserved for safety
|
||||||
|
try:
|
||||||
|
memory_limit = (
|
||||||
|
psutil.virtual_memory().available + psutil.swap_memory().free
|
||||||
|
) - 2**27
|
||||||
|
except:
|
||||||
|
print(
|
||||||
|
"Failed to calculate available memory. Memory load limit has been disabled"
|
||||||
|
)
|
||||||
|
if memory_limit is not None:
|
||||||
|
if vae is not None:
|
||||||
|
# space required to load as f32, exist as latent with wiggle room, decode to f32
|
||||||
|
max_loadable_frames = int(
|
||||||
|
memory_limit // (width * height * 3 * (4 + 4 + 1 / 10))
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# TODO: use better estimate for when vae is not None
|
||||||
|
# Consider completely ignoring for load_latent case?
|
||||||
|
max_loadable_frames = int(memory_limit // (width * height * 3 * (0.1)))
|
||||||
|
if meta_batch is not None:
|
||||||
|
if meta_batch.frames_per_batch > max_loadable_frames:
|
||||||
|
raise RuntimeError(
|
||||||
|
f"Meta Batch set to {meta_batch.frames_per_batch} frames but only {max_loadable_frames} can fit in memory"
|
||||||
|
)
|
||||||
|
gen = itertools.islice(gen, meta_batch.frames_per_batch)
|
||||||
|
else:
|
||||||
|
original_gen = gen
|
||||||
|
gen = itertools.islice(gen, max_loadable_frames)
|
||||||
|
downscale_ratio = getattr(vae, "downscale_ratio", 8)
|
||||||
|
frames_per_batch = (1920 * 1080 * 16) // (width * height) or 1
|
||||||
|
if force_size != "Disabled" or vae is not None:
|
||||||
|
new_size = target_size(
|
||||||
|
width, height, force_size, custom_width, custom_height, downscale_ratio
|
||||||
|
)
|
||||||
|
if new_size[0] != width or new_size[1] != height:
|
||||||
|
|
||||||
# Some minor wizardry to eliminate a copy and reduce max memory by a factor of ~2
|
def rescale(frame):
|
||||||
images = torch.from_numpy(
|
s = torch.from_numpy(
|
||||||
np.fromiter(gen, np.dtype((np.float32, (height, width, 3))))
|
np.fromiter(frame, np.dtype((np.float32, (height, width, 3))))
|
||||||
)
|
)
|
||||||
|
s = s.movedim(-1, 1)
|
||||||
|
s = common_upscale(s, new_size[0], new_size[1], "lanczos", "center")
|
||||||
|
return s.movedim(1, -1).numpy()
|
||||||
|
|
||||||
|
gen = itertools.chain.from_iterable(
|
||||||
|
map(rescale, batched(gen, frames_per_batch))
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
new_size = width, height
|
||||||
|
if vae is not None:
|
||||||
|
gen = batched_vae_encode(gen, vae, frames_per_batch)
|
||||||
|
vw, vh = new_size[0] // downscale_ratio, new_size[1] // downscale_ratio
|
||||||
|
images = torch.from_numpy(np.fromiter(gen, np.dtype((np.float32, (4, vh, vw)))))
|
||||||
|
else:
|
||||||
|
# Some minor wizardry to eliminate a copy and reduce max memory by a factor of ~2
|
||||||
|
images = torch.from_numpy(
|
||||||
|
np.fromiter(gen, np.dtype((np.float32, (new_size[1], new_size[0], 3))))
|
||||||
|
)
|
||||||
|
if meta_batch is None and memory_limit is not None:
|
||||||
|
try:
|
||||||
|
next(original_gen)
|
||||||
|
raise RuntimeError(
|
||||||
|
f"Memory limit hit after loading {len(images)} frames. Stopping execution."
|
||||||
|
)
|
||||||
|
except StopIteration:
|
||||||
|
pass
|
||||||
if len(images) == 0:
|
if len(images) == 0:
|
||||||
raise RuntimeError("No frames generated")
|
raise RuntimeError("No frames generated")
|
||||||
if force_size != "Disabled":
|
|
||||||
new_size = target_size(width, height, force_size, custom_width, custom_height)
|
|
||||||
if new_size[0] != width or new_size[1] != height:
|
|
||||||
s = images.movedim(-1, 1)
|
|
||||||
s = common_upscale(s, new_size[0], new_size[1], "lanczos", "center")
|
|
||||||
images = s.movedim(1, -1)
|
|
||||||
|
|
||||||
# Setup lambda for lazy audio capture
|
# Setup lambda for lazy audio capture
|
||||||
audio = lambda: get_audio(
|
audio = lazy_get_audio(
|
||||||
video,
|
video,
|
||||||
skip_first_frames * target_frame_time,
|
skip_first_frames * target_frame_time,
|
||||||
frame_load_cap * target_frame_time * select_every_nth,
|
frame_load_cap * target_frame_time * select_every_nth,
|
||||||
@@ -440,13 +728,16 @@ def load_video_cv(
|
|||||||
"loaded_fps": 1 / target_frame_time,
|
"loaded_fps": 1 / target_frame_time,
|
||||||
"loaded_frame_count": len(images),
|
"loaded_frame_count": len(images),
|
||||||
"loaded_duration": len(images) * target_frame_time,
|
"loaded_duration": len(images) * target_frame_time,
|
||||||
"loaded_width": images.shape[2],
|
"loaded_width": new_size[0],
|
||||||
"loaded_height": images.shape[1],
|
"loaded_height": new_size[1],
|
||||||
}
|
}
|
||||||
|
if vae is None:
|
||||||
return (images, len(images), lazy_eval(audio), video_info)
|
return (images, len(images), audio, video_info, None)
|
||||||
|
else:
|
||||||
|
return (None, len(images), audio, video_info, {"samples": images})
|
||||||
|
|
||||||
|
|
||||||
|
# modeled after Video upload node
|
||||||
class ComfyUIDeployExternalVideo:
|
class ComfyUIDeployExternalVideo:
|
||||||
@classmethod
|
@classmethod
|
||||||
def INPUT_TYPES(s):
|
def INPUT_TYPES(s):
|
||||||
@@ -457,68 +748,46 @@ class ComfyUIDeployExternalVideo:
|
|||||||
file_parts = f.split(".")
|
file_parts = f.split(".")
|
||||||
if len(file_parts) > 1 and (file_parts[-1] in video_extensions):
|
if len(file_parts) > 1 and (file_parts[-1] in video_extensions):
|
||||||
files.append(f)
|
files.append(f)
|
||||||
return {
|
return {"required": {
|
||||||
"required": {
|
"input_id": (
|
||||||
"input_id": (
|
"STRING",
|
||||||
"STRING",
|
{"multiline": False, "default": "input_video"},
|
||||||
{"multiline": False, "default": "input_video"},
|
),
|
||||||
),
|
"force_rate": ("INT", {"default": 0, "min": 0, "max": 60, "step": 1}),
|
||||||
"force_rate": ("INT", {"default": 0, "min": 0, "max": 60, "step": 1}),
|
"force_size": (["Disabled", "Custom Height", "Custom Width", "Custom", "256x?", "?x256", "256x256", "512x?", "?x512", "512x512"],),
|
||||||
"force_size": (
|
"custom_width": ("INT", {"default": 512, "min": 0, "max": DIMMAX, "step": 8}),
|
||||||
[
|
"custom_height": ("INT", {"default": 512, "min": 0, "max": DIMMAX, "step": 8}),
|
||||||
"Disabled",
|
"frame_load_cap": ("INT", {"default": 0, "min": 0, "max": BIGMAX, "step": 1}),
|
||||||
"Custom Height",
|
"skip_first_frames": ("INT", {"default": 0, "min": 0, "max": BIGMAX, "step": 1}),
|
||||||
"Custom Width",
|
"select_every_nth": ("INT", {"default": 1, "min": 1, "max": BIGMAX, "step": 1}),
|
||||||
"Custom",
|
},
|
||||||
"256x?",
|
"optional": {
|
||||||
"?x256",
|
"meta_batch": ("VHS_BatchManager",),
|
||||||
"256x256",
|
"vae": ("VAE",),
|
||||||
"512x?",
|
"default_video": (sorted(files),),
|
||||||
"?x512",
|
"display_name": (
|
||||||
"512x512",
|
"STRING",
|
||||||
],
|
{"multiline": False, "default": ""},
|
||||||
),
|
),
|
||||||
"custom_width": (
|
"description": (
|
||||||
"INT",
|
"STRING",
|
||||||
{"default": 512, "min": 0, "max": DIMMAX, "step": 8},
|
{"multiline": True, "default": ""},
|
||||||
),
|
),
|
||||||
"custom_height": (
|
},
|
||||||
"INT",
|
"hidden": {
|
||||||
{"default": 512, "min": 0, "max": DIMMAX, "step": 8},
|
"unique_id": "UNIQUE_ID"
|
||||||
),
|
},
|
||||||
"frame_load_cap": (
|
}
|
||||||
"INT",
|
|
||||||
{"default": 0, "min": 0, "max": BIGMAX, "step": 1},
|
|
||||||
),
|
|
||||||
"skip_first_frames": (
|
|
||||||
"INT",
|
|
||||||
{"default": 0, "min": 0, "max": BIGMAX, "step": 1},
|
|
||||||
),
|
|
||||||
"select_every_nth": (
|
|
||||||
"INT",
|
|
||||||
{"default": 1, "min": 1, "max": BIGMAX, "step": 1},
|
|
||||||
),
|
|
||||||
},
|
|
||||||
"optional": {
|
|
||||||
"meta_batch": ("VHS_BatchManager",),
|
|
||||||
"default_value": (sorted(files),),
|
|
||||||
},
|
|
||||||
"hidden": {"unique_id": "UNIQUE_ID"},
|
|
||||||
}
|
|
||||||
|
|
||||||
CATEGORY = "Video Helper Suite 🎥🅥🅗🅢"
|
CATEGORY = "Video Helper Suite 🎥🅥🅗🅢"
|
||||||
|
|
||||||
RETURN_TYPES = (
|
RETURN_TYPES = ("IMAGE", "INT", "AUDIO", "VHS_VIDEOINFO", "LATENT")
|
||||||
"IMAGE",
|
|
||||||
"INT",
|
|
||||||
"VHS_AUDIO",
|
|
||||||
"VHS_VIDEOINFO",
|
|
||||||
)
|
|
||||||
RETURN_NAMES = (
|
RETURN_NAMES = (
|
||||||
"IMAGE",
|
"IMAGE",
|
||||||
"frame_count",
|
"frame_count",
|
||||||
"audio",
|
"audio",
|
||||||
"video_info",
|
"video_info",
|
||||||
|
"LATENT",
|
||||||
)
|
)
|
||||||
|
|
||||||
FUNCTION = "load_video"
|
FUNCTION = "load_video"
|
||||||
@@ -535,8 +804,6 @@ class ComfyUIDeployExternalVideo:
|
|||||||
meta_batch = kwargs.get("meta_batch")
|
meta_batch = kwargs.get("meta_batch")
|
||||||
unique_id = kwargs.get("unique_id")
|
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()
|
input_dir = folder_paths.get_input_directory()
|
||||||
if input_id.startswith("http"):
|
if input_id.startswith("http"):
|
||||||
@@ -566,8 +833,11 @@ class ComfyUIDeployExternalVideo:
|
|||||||
leave=True,
|
leave=True,
|
||||||
):
|
):
|
||||||
out_file.write(chunk)
|
out_file.write(chunk)
|
||||||
|
else:
|
||||||
print("video path: ", video_path)
|
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(
|
return load_video_cv(
|
||||||
video=video_path,
|
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)"}
|
||||||
+1409
-426
File diff suppressed because it is too large
Load Diff
+41
-20
@@ -6,10 +6,12 @@ from PIL import Image, ImageOps
|
|||||||
from io import BytesIO
|
from io import BytesIO
|
||||||
from pydantic import BaseModel as PydanticBaseModel
|
from pydantic import BaseModel as PydanticBaseModel
|
||||||
|
|
||||||
|
|
||||||
class BaseModel(PydanticBaseModel):
|
class BaseModel(PydanticBaseModel):
|
||||||
class Config:
|
class Config:
|
||||||
arbitrary_types_allowed = True
|
arbitrary_types_allowed = True
|
||||||
|
|
||||||
|
|
||||||
class Status(Enum):
|
class Status(Enum):
|
||||||
NOT_STARTED = "not-started"
|
NOT_STARTED = "not-started"
|
||||||
RUNNING = "running"
|
RUNNING = "running"
|
||||||
@@ -17,48 +19,60 @@ class Status(Enum):
|
|||||||
FAILED = "failed"
|
FAILED = "failed"
|
||||||
UPLOADING = "uploading"
|
UPLOADING = "uploading"
|
||||||
|
|
||||||
|
|
||||||
class StreamingPrompt(BaseModel):
|
class StreamingPrompt(BaseModel):
|
||||||
workflow_api: Any
|
workflow_api: Any
|
||||||
auth_token: str
|
auth_token: str
|
||||||
inputs: dict[str, Union[str, bytes, Image.Image]]
|
inputs: dict[str, Union[str, bytes, Image.Image]]
|
||||||
running_prompt_ids: set[str] = set()
|
running_prompt_ids: set[str] = set()
|
||||||
status_endpoint: str
|
status_endpoint: Optional[str]
|
||||||
file_upload_endpoint: str
|
file_upload_endpoint: Optional[str]
|
||||||
|
workflow: Any
|
||||||
|
gpu_event_id: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
class SimplePrompt(BaseModel):
|
class SimplePrompt(BaseModel):
|
||||||
status_endpoint: str
|
status_endpoint: Optional[str]
|
||||||
file_upload_endpoint: 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()
|
||||||
last_updated_node: Optional[str] = None,
|
last_updated_node: Optional[str] = None
|
||||||
uploading_nodes: set = set()
|
uploading_nodes: set = set()
|
||||||
done: bool = False
|
done: bool = False
|
||||||
is_realtime: bool = False,
|
is_realtime: bool = False
|
||||||
start_time: Optional[float] = None,
|
start_time: Optional[float] = None
|
||||||
|
gpu_event_id: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
sockets = dict()
|
sockets = dict()
|
||||||
prompt_metadata: dict[str, SimplePrompt] = {}
|
prompt_metadata: dict[str, SimplePrompt] = {}
|
||||||
streaming_prompt_metadata: dict[str, StreamingPrompt] = {}
|
streaming_prompt_metadata: dict[str, StreamingPrompt] = {}
|
||||||
|
|
||||||
|
|
||||||
class BinaryEventTypes:
|
class BinaryEventTypes:
|
||||||
PREVIEW_IMAGE = 1
|
PREVIEW_IMAGE = 1
|
||||||
UNENCODED_PREVIEW_IMAGE = 2
|
UNENCODED_PREVIEW_IMAGE = 2
|
||||||
|
|
||||||
|
|
||||||
max_output_id_length = 24
|
max_output_id_length = 24
|
||||||
|
|
||||||
async def send_image(image_data, sid=None, output_id:str = None):
|
|
||||||
|
async def send_image(image_data, sid=None, output_id: str = None):
|
||||||
max_length = max_output_id_length
|
max_length = max_output_id_length
|
||||||
output_id = output_id[:max_length]
|
output_id = output_id[:max_length]
|
||||||
padded_output_id = output_id.ljust(max_length, '\x00')
|
padded_output_id = output_id.ljust(max_length, "\x00")
|
||||||
encoded_output_id = padded_output_id.encode('ascii', 'replace')
|
encoded_output_id = padded_output_id.encode("ascii", "replace")
|
||||||
|
|
||||||
image_type = image_data[0]
|
image_type = image_data[0]
|
||||||
image = image_data[1]
|
image = image_data[1]
|
||||||
max_size = image_data[2]
|
max_size = image_data[2]
|
||||||
quality = image_data[3]
|
quality = image_data[3]
|
||||||
if max_size is not None:
|
if max_size is not None:
|
||||||
if hasattr(Image, 'Resampling'):
|
if hasattr(Image, "Resampling"):
|
||||||
resampling = Image.Resampling.BILINEAR
|
resampling = Image.Resampling.BILINEAR
|
||||||
else:
|
else:
|
||||||
resampling = Image.ANTIALIAS
|
resampling = Image.ANTIALIAS
|
||||||
@@ -82,17 +96,23 @@ async def send_image(image_data, sid=None, output_id:str = None):
|
|||||||
position_after = bytesIO.tell()
|
position_after = bytesIO.tell()
|
||||||
bytes_written = position_after - position_before
|
bytes_written = position_after - position_before
|
||||||
print(f"Bytes written: {bytes_written}")
|
print(f"Bytes written: {bytes_written}")
|
||||||
|
|
||||||
image.save(bytesIO, format=image_type, quality=quality, compress_level=1)
|
image.save(bytesIO, format=image_type, quality=quality, compress_level=1)
|
||||||
preview_bytes = bytesIO.getvalue()
|
preview_bytes = bytesIO.getvalue()
|
||||||
await send_bytes(BinaryEventTypes.PREVIEW_IMAGE, preview_bytes, sid=sid)
|
await send_bytes(BinaryEventTypes.PREVIEW_IMAGE, preview_bytes, sid=sid)
|
||||||
|
|
||||||
|
|
||||||
async def send_socket_catch_exception(function, message):
|
async def send_socket_catch_exception(function, message):
|
||||||
try:
|
try:
|
||||||
await function(message)
|
await function(message)
|
||||||
except (aiohttp.ClientError, aiohttp.ClientPayloadError, ConnectionResetError) as err:
|
except (
|
||||||
|
aiohttp.ClientError,
|
||||||
|
aiohttp.ClientPayloadError,
|
||||||
|
ConnectionResetError,
|
||||||
|
) as err:
|
||||||
print("send error:", err)
|
print("send error:", err)
|
||||||
|
|
||||||
|
|
||||||
def encode_bytes(event, data):
|
def encode_bytes(event, data):
|
||||||
if not isinstance(event, int):
|
if not isinstance(event, int):
|
||||||
raise RuntimeError(f"Binary event types must be integers, got {event}")
|
raise RuntimeError(f"Binary event types must be integers, got {event}")
|
||||||
@@ -102,9 +122,10 @@ def encode_bytes(event, data):
|
|||||||
message.extend(data)
|
message.extend(data)
|
||||||
return message
|
return message
|
||||||
|
|
||||||
|
|
||||||
async def send_bytes(event, data, sid=None):
|
async def send_bytes(event, data, sid=None):
|
||||||
message = encode_bytes(event, data)
|
message = encode_bytes(event, data)
|
||||||
|
|
||||||
print("sending image to ", event, sid)
|
print("sending image to ", event, sid)
|
||||||
|
|
||||||
if sid is None:
|
if sid is None:
|
||||||
@@ -112,4 +133,4 @@ async def send_bytes(event, data, sid=None):
|
|||||||
for ws in _sockets:
|
for ws in _sockets:
|
||||||
await send_socket_catch_exception(ws.send_bytes, message)
|
await send_socket_catch_exception(ws.send_bytes, message)
|
||||||
elif sid in sockets:
|
elif sid in sockets:
|
||||||
await send_socket_catch_exception(sockets[sid].send_bytes, message)
|
await send_socket_catch_exception(sockets[sid].send_bytes, message)
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "comfyui-deploy"
|
name = "comfyui-deploy"
|
||||||
description = "Open source comfyui deployment platform, a vercel for generative workflow infra."
|
description = "Open source comfyui deployment platform, a vercel for generative workflow infra."
|
||||||
version = "1.0.0"
|
version = "1.1.0"
|
||||||
license = "LICENSE"
|
license = "LICENSE"
|
||||||
dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg"]
|
dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg"]
|
||||||
|
|
||||||
|
|||||||
+4
-1
@@ -1,4 +1,7 @@
|
|||||||
aiofiles
|
aiofiles
|
||||||
pydantic
|
pydantic
|
||||||
opencv-python
|
opencv-python
|
||||||
imageio-ffmpeg
|
imageio-ffmpeg
|
||||||
|
brotli
|
||||||
|
tabulate
|
||||||
|
# logfire
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
/** @typedef {import('../../../web/scripts/api.js').api} API*/
|
|
||||||
import { api as _api } from '../../scripts/api.js';
|
|
||||||
/** @type {API} */
|
|
||||||
export const api = _api;
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
/** @typedef {import('../../../web/scripts/app.js').ComfyApp} ComfyApp*/
|
|
||||||
import { app as _app } from '../../scripts/app.js';
|
|
||||||
/** @type {ComfyApp} */
|
|
||||||
export const app = _app;
|
|
||||||
+849
-68
File diff suppressed because it is too large
Load Diff
@@ -1,18 +0,0 @@
|
|||||||
// /** @typedef {import('../../../web/scripts/api.js').api} API*/
|
|
||||||
// import { api as _api } from "../../scripts/api.js";
|
|
||||||
// /** @type {API} */
|
|
||||||
// export const api = _api;
|
|
||||||
|
|
||||||
/** @typedef {typeof import('../../../web/scripts/widgets.js').ComfyWidgets} Widgets*/
|
|
||||||
import { ComfyWidgets as _ComfyWidgets } from "../../scripts/widgets.js";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @type {Widgets}
|
|
||||||
*/
|
|
||||||
export const ComfyWidgets = _ComfyWidgets;
|
|
||||||
|
|
||||||
// import { LGraphNode as _LGraphNode } from "../../types/litegraph.js";
|
|
||||||
|
|
||||||
/** @typedef {typeof import('../../../web/types/litegraph.js').LGraphNode} LGraphNode*/
|
|
||||||
/** @type {LGraphNode}*/
|
|
||||||
export const LGraphNode = LiteGraph.LGraphNode;
|
|
||||||
+1
-1
@@ -74,7 +74,7 @@
|
|||||||
"mitata": "^0.1.6",
|
"mitata": "^0.1.6",
|
||||||
"ms": "^2.1.3",
|
"ms": "^2.1.3",
|
||||||
"nanoid": "^5.0.4",
|
"nanoid": "^5.0.4",
|
||||||
"next": "14.1",
|
"next": "14.2",
|
||||||
"next-plausible": "^3.12.0",
|
"next-plausible": "^3.12.0",
|
||||||
"next-themes": "^0.2.1",
|
"next-themes": "^0.2.1",
|
||||||
"next-usequerystate": "^1.13.2",
|
"next-usequerystate": "^1.13.2",
|
||||||
|
|||||||
@@ -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)",
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -51,7 +51,9 @@ const createRunRoute = createRoute({
|
|||||||
export const registerCreateRunRoute = (app: App) => {
|
export const registerCreateRunRoute = (app: App) => {
|
||||||
app.openapi(createRunRoute, async (c) => {
|
app.openapi(createRunRoute, async (c) => {
|
||||||
const data = c.req.valid("json");
|
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 apiKeyTokenData = c.get("apiKeyTokenData")!;
|
||||||
|
|
||||||
const { deployment_id, inputs } = data;
|
const { deployment_id, inputs } = data;
|
||||||
|
|||||||
@@ -102,7 +102,7 @@ export const createRun = withServerPromise(
|
|||||||
|
|
||||||
let prompt_id: string | undefined = undefined;
|
let prompt_id: string | undefined = undefined;
|
||||||
const shareData = {
|
const shareData = {
|
||||||
workflow_api: workflow_api,
|
workflow_api_raw: workflow_api,
|
||||||
status_endpoint: `${origin}/api/update-run`,
|
status_endpoint: `${origin}/api/update-run`,
|
||||||
file_upload_endpoint: `${origin}/api/file-upload`,
|
file_upload_endpoint: `${origin}/api/file-upload`,
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user