Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4e3bc2571 | ||
|
|
bf8e2a17b9 | ||
|
|
60c93b65f4 | ||
|
|
5d2ade4fd4 |
@@ -4,6 +4,7 @@ import numpy as np
|
|||||||
from PIL import Image
|
from PIL import Image
|
||||||
from PIL.PngImagePlugin import PngInfo
|
from PIL.PngImagePlugin import PngInfo
|
||||||
import folder_paths
|
import folder_paths
|
||||||
|
from comfy.cli_args import args
|
||||||
|
|
||||||
|
|
||||||
class ComfyDeployOutputImage:
|
class ComfyDeployOutputImage:
|
||||||
@@ -64,12 +65,14 @@ class ComfyDeployOutputImage:
|
|||||||
for batch_number, image in enumerate(images):
|
for batch_number, image in enumerate(images):
|
||||||
i = 255.0 * image.cpu().numpy()
|
i = 255.0 * image.cpu().numpy()
|
||||||
img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
|
img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
|
||||||
metadata = PngInfo()
|
metadata = None
|
||||||
if prompt is not None:
|
if not args.disable_metadata:
|
||||||
metadata.add_text("prompt", json.dumps(prompt))
|
metadata = PngInfo()
|
||||||
if extra_pnginfo is not None:
|
if prompt is not None:
|
||||||
for x in extra_pnginfo:
|
metadata.add_text("prompt", json.dumps(prompt))
|
||||||
metadata.add_text(x, json.dumps(extra_pnginfo[x]))
|
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))
|
filename_with_batch_num = filename.replace("%batch_num%", str(batch_number))
|
||||||
file = f"{filename_with_batch_num}_{counter:05}_.{file_type}"
|
file = f"{filename_with_batch_num}_{counter:05}_.{file_type}"
|
||||||
|
|||||||
+17
-8
@@ -1554,18 +1554,26 @@ async def send_json_override(self, event, data, sid=None):
|
|||||||
)
|
)
|
||||||
|
|
||||||
if event == "executing" and data.get("node") is not None:
|
if event == "executing" and data.get("node") is not None:
|
||||||
node = data.get("node")
|
raw_node = data.get("node")
|
||||||
|
node = str(raw_node)
|
||||||
|
|
||||||
if prompt_id in prompt_metadata:
|
if prompt_id in prompt_metadata:
|
||||||
# if 'progress' not in prompt_metadata[prompt_id]:
|
wf_api = prompt_metadata[prompt_id].workflow_api
|
||||||
# prompt_metadata[prompt_id]["progress"] = set()
|
|
||||||
|
# Normalize dotted display ids like "23.0.0.1" to base "23"
|
||||||
|
if node not in wf_api and "." in node:
|
||||||
|
base = node.split(".")[0]
|
||||||
|
if base in wf_api:
|
||||||
|
node = base
|
||||||
|
|
||||||
|
# If still unknown, skip safely
|
||||||
|
if node not in wf_api:
|
||||||
|
logger.info(f"Skipping unknown node id in 'executing': {raw_node}")
|
||||||
|
return
|
||||||
|
|
||||||
prompt_metadata[prompt_id].progress.add(node)
|
prompt_metadata[prompt_id].progress.add(node)
|
||||||
calculated_progress = len(prompt_metadata[prompt_id].progress) / len(
|
calculated_progress = len(prompt_metadata[prompt_id].progress) / len(wf_api)
|
||||||
prompt_metadata[prompt_id].workflow_api
|
|
||||||
)
|
|
||||||
calculated_progress = round(calculated_progress, 2)
|
calculated_progress = round(calculated_progress, 2)
|
||||||
# logger.info("calculated_progress", calculated_progress)
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
prompt_metadata[prompt_id].last_updated_node is not None
|
prompt_metadata[prompt_id].last_updated_node is not None
|
||||||
@@ -1573,7 +1581,8 @@ async def send_json_override(self, event, data, sid=None):
|
|||||||
):
|
):
|
||||||
return
|
return
|
||||||
prompt_metadata[prompt_id].last_updated_node = node
|
prompt_metadata[prompt_id].last_updated_node = node
|
||||||
class_type = prompt_metadata[prompt_id].workflow_api[node]["class_type"]
|
|
||||||
|
class_type = wf_api[node]["class_type"]
|
||||||
logger.info(f"At: {round(calculated_progress * 100)}% - {class_type}")
|
logger.info(f"At: {round(calculated_progress * 100)}% - {class_type}")
|
||||||
asyncio.create_task(
|
asyncio.create_task(
|
||||||
send(
|
send(
|
||||||
|
|||||||
+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 = "2.3.7"
|
version = "2.3.9"
|
||||||
license = { file = "LICENSE" }
|
license = { file = "LICENSE" }
|
||||||
dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg", "tabulate", "brotli"]
|
dependencies = ["aiofiles", "pydantic", "opencv-python", "imageio-ffmpeg", "tabulate", "brotli"]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user