From f0203c96ab854c33c197a193d3cb8d72cd48e7d4 Mon Sep 17 00:00:00 2001 From: Will Miao <13051207myq@gmail.com> Date: Fri, 18 Apr 2025 05:34:42 +0800 Subject: [PATCH] feat: Simplify format_metadata method by removing custom_prompt parameter and update related function calls --- py/nodes/save_image.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/py/nodes/save_image.py b/py/nodes/save_image.py index 110e2072..e88546d7 100644 --- a/py/nodes/save_image.py +++ b/py/nodes/save_image.py @@ -9,7 +9,6 @@ from ..metadata_collector.metadata_processor import MetadataProcessor from ..metadata_collector import get_metadata from PIL import Image, PngImagePlugin import piexif -from io import BytesIO class SaveImage: NAME = "Save Image (LoraManager)" @@ -35,7 +34,6 @@ class SaveImage: "file_format": (["png", "jpeg", "webp"],), }, "optional": { - "custom_prompt": ("STRING", {"default": "", "forceInput": True}), "lossless_webp": ("BOOLEAN", {"default": True}), "quality": ("INT", {"default": 100, "min": 1, "max": 100}), "embed_workflow": ("BOOLEAN", {"default": False}), @@ -62,7 +60,7 @@ class SaveImage: return item.get('sha256') return None - async def format_metadata(self, metadata_dict, custom_prompt=None): + async def format_metadata(self, metadata_dict): """Format metadata in the requested format similar to userComment example""" if not metadata_dict: return "" @@ -71,10 +69,6 @@ class SaveImage: prompt = metadata_dict.get('prompt', '') negative_prompt = metadata_dict.get('negative_prompt', '') - # Override prompt with custom_prompt if provided - if custom_prompt: - prompt = custom_prompt - # Extract loras from the prompt if present loras_text = metadata_dict.get('loras', '') lora_hashes = {} @@ -256,8 +250,7 @@ class SaveImage: return filename def save_images(self, images, filename_prefix, file_format, prompt=None, extra_pnginfo=None, - lossless_webp=True, quality=100, embed_workflow=False, add_counter_to_filename=True, - custom_prompt=None): + lossless_webp=True, quality=100, embed_workflow=False, add_counter_to_filename=True): """Save images with metadata""" results = [] @@ -266,7 +259,7 @@ class SaveImage: metadata_dict = MetadataProcessor.to_dict(raw_metadata) # Get or create metadata asynchronously - metadata = asyncio.run(self.format_metadata(metadata_dict, custom_prompt)) + metadata = asyncio.run(self.format_metadata(metadata_dict)) # Process filename_prefix with pattern substitution filename_prefix = self.format_filename(filename_prefix, metadata_dict) @@ -354,8 +347,7 @@ class SaveImage: return results def process_image(self, images, filename_prefix="ComfyUI", file_format="png", prompt=None, extra_pnginfo=None, - lossless_webp=True, quality=100, embed_workflow=False, add_counter_to_filename=True, - custom_prompt=""): + lossless_webp=True, quality=100, embed_workflow=False, add_counter_to_filename=True): """Process and save image with metadata""" # Make sure the output directory exists os.makedirs(self.output_dir, exist_ok=True) @@ -376,8 +368,7 @@ class SaveImage: lossless_webp, quality, embed_workflow, - add_counter_to_filename, - custom_prompt if custom_prompt.strip() else None + add_counter_to_filename ) return (images,) \ No newline at end of file