Add Save Image output sockets

This commit is contained in:
2026-10-22 09:58:24 +00:00
parent 711db02f17
commit 59930bcb69
2 changed files with 23 additions and 3 deletions
+13 -3
View File
@@ -155,7 +155,11 @@ class DumasSaveImageNode:
def IS_CHANGED(cls, **_kwargs): def IS_CHANGED(cls, **_kwargs):
return float("nan") return float("nan")
RETURN_TYPES = () RETURN_TYPES = ("IMAGE", "STRING", "STRING")
RETURN_NAMES = ("image", "folder", "filename")
# A batch can produce more than one filename; keep the image batch and
# folder scalar while exposing the generated names as a STRING list.
OUTPUT_IS_LIST = (False, False, True)
FUNCTION = "save_images" FUNCTION = "save_images"
CATEGORY = "Dumas/Image" CATEGORY = "Dumas/Image"
OUTPUT_NODE = True OUTPUT_NODE = True
@@ -183,7 +187,10 @@ class DumasSaveImageNode:
else: else:
pil.save(path, "PNG", pnginfo=_build_pnginfo(prompt, extra_pnginfo) if embed_workflow else None) pil.save(path, "PNG", pnginfo=_build_pnginfo(prompt, extra_pnginfo) if embed_workflow else None)
preview_images.append({"filename": path.name, "subfolder": "", "type": "temp"}) preview_images.append({"filename": path.name, "subfolder": "", "type": "temp"})
return {"ui": {"images": preview_images}} return {
"ui": {"images": preview_images},
"result": (images, str(temp_dir), [item["filename"] for item in preview_images]),
}
output_dir = Path(folder_paths.get_output_directory()).resolve() output_dir = Path(folder_paths.get_output_directory()).resolve()
base = Path(folder).expanduser().resolve() if str(folder or "").strip() else output_dir base = Path(folder).expanduser().resolve() if str(folder or "").strip() else output_dir
base.mkdir(parents=True, exist_ok=True) base.mkdir(parents=True, exist_ok=True)
@@ -216,7 +223,10 @@ class DumasSaveImageNode:
token = uuid.uuid4().hex token = uuid.uuid4().hex
_SERVE_TOKENS[token] = str(path) _SERVE_TOKENS[token] = str(path)
ui_images.append({"filename": path.name, "subfolder": str(path.parent).replace(os.sep, "/"), "type": "external", "token": token}) ui_images.append({"filename": path.name, "subfolder": str(path.parent).replace(os.sep, "/"), "type": "external", "token": token})
return {"ui": {"images": ui_images}} return {
"ui": {"images": ui_images},
"result": (images, str(base), [item["filename"] for item in ui_images]),
}
def _safe_token(value): def _safe_token(value):
+10
View File
@@ -73,6 +73,11 @@ class DumasImageNodeTests(unittest.TestCase):
{"DumasImageCompare", "DumasSaveImage", "DumasLoadImagesFolder"}, {"DumasImageCompare", "DumasSaveImage", "DumasLoadImagesFolder"},
) )
def test_save_image_exposes_image_folder_and_filename_outputs(self):
node = self.nodes.DumasSaveImageNode
self.assertEqual(node.RETURN_NAMES, ("image", "folder", "filename"))
self.assertEqual(node.OUTPUT_IS_LIST, (False, False, True))
def test_compare_without_inputs_returns_empty_result(self): def test_compare_without_inputs_returns_empty_result(self):
result = self.nodes.DumasImageCompareNode().compare_images() result = self.nodes.DumasImageCompareNode().compare_images()
self.assertEqual(result["ui"]["images"], []) self.assertEqual(result["ui"]["images"], [])
@@ -190,6 +195,11 @@ class DumasImageNodeTests(unittest.TestCase):
self.assertTrue(str(saved_path).startswith(self.temp_dir)) self.assertTrue(str(saved_path).startswith(self.temp_dir))
self.assertTrue(str(saved_path).endswith(".webp")) self.assertTrue(str(saved_path).endswith(".webp"))
self.assertFalse(os.path.exists(os.path.join(directory, "preview_001.webp"))) self.assertFalse(os.path.exists(os.path.join(directory, "preview_001.webp")))
result = self.nodes.DumasSaveImageNode().save_images(
[FakeBatch()], directory, "preview_%counter%", "webp", 90, False, False
)
self.assertEqual(result["result"][1], self.temp_dir)
self.assertEqual(len(result["result"][2]), 1)
if __name__ == "__main__": if __name__ == "__main__":