Compare commits

..
Author SHA1 Message Date
bennykok 2cfdd0b3f5 chore: add log 2024-08-28 19:29:22 -07:00
bennykok 9c06cc666c fix node meta 2024-08-25 09:32:11 -07:00
bennykok 710917d507 fix: remove content length 2024-08-24 23:59:40 -07:00
bennykok 16f4312c9e fix: upload file acl 2024-08-24 23:13:33 -07:00
bennykok 20801f4d3f fix: include upload time 2024-08-24 20:25:55 -07:00
bennykok ba2f942b29 fix: log file error log 2024-08-24 17:52:24 -07:00
bennykok 0dfa83f486 Merge branch 'public-main' into benny/upload-test 2024-08-24 17:38:50 -07:00
bennykok 5954092f25 fix: size 2024-08-22 11:48:47 -07:00
bennykok a2990ca833 chore: log more test for upload file debug 2024-08-21 22:29:55 -07:00
bennykok d673c4a00b fix 2024-08-21 21:43:29 -07:00
3 changed files with 8 additions and 36 deletions
+1 -21
View File
@@ -39,38 +39,18 @@ class ComfyUIDeployExternalImageBatch:
CATEGORY = "image" CATEGORY = "image"
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): 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'):
import requests
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)
image = Image.open(BytesIO(response.content)) image = Image.open(BytesIO(response.content))
elif 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('data:image/png;base64,') or img_input.startswith('data:image/jpeg;base64,') or img_input.startswith('data:image/jpg;base64,'): elif img_input.startswith('data:image/png;base64,') or img_input.startswith('data:image/jpeg;base64,') or img_input.startswith('data:image/jpg;base64,'):
import base64 import base64
from io import BytesIO from io import BytesIO
+3 -11
View File
@@ -51,15 +51,7 @@ class ComfyUIDeployExternalLora:
CATEGORY = "deploy" CATEGORY = "deploy"
def run( def run(self, input_id, default_lora_name=None, lora_save_name=None, display_name=None, description=None, lora_url=None):
self,
input_id,
default_lora_name=None,
lora_save_name=None,
display_name=None,
description=None,
lora_url=None,
):
import requests import requests
import os import os
import uuid import uuid
@@ -79,9 +71,9 @@ class ComfyUIDeployExternalLora:
folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name folder_paths.folder_names_and_paths["loras"][0][0], lora_save_name
) )
print(destination_path) print(destination_path)
print("Downloading external lora - " + lora_url + " to " + destination_path) print("Downloading external lora - " + input_id + " to " + destination_path)
response = requests.get( response = requests.get(
lora_url, input_id,
headers={"User-Agent": "Mozilla/5.0"}, headers={"User-Agent": "Mozilla/5.0"},
allow_redirects=True, allow_redirects=True,
) )
+2 -2
View File
@@ -764,7 +764,7 @@ class ComfyUIDeployExternalVideo:
"optional": { "optional": {
"meta_batch": ("VHS_BatchManager",), "meta_batch": ("VHS_BatchManager",),
"vae": ("VAE",), "vae": ("VAE",),
"default_video": (sorted(files),), "default_value": (sorted(files),),
"display_name": ( "display_name": (
"STRING", "STRING",
{"multiline": False, "default": ""}, {"multiline": False, "default": ""},
@@ -834,7 +834,7 @@ class ComfyUIDeployExternalVideo:
): ):
out_file.write(chunk) out_file.write(chunk)
else: else:
video = kwargs.get("default_video", None) video = kwargs.get("default_value", "")
if video is None: if video is None:
raise "No default video given and no external video provided" raise "No default video given and no external video provided"
video_path = folder_paths.get_annotated_filepath(video.strip('"')) video_path = folder_paths.get_annotated_filepath(video.strip('"'))