diff --git a/film_live_grade.py b/film_live_grade.py index 24ffbf1..bc027f7 100644 --- a/film_live_grade.py +++ b/film_live_grade.py @@ -259,8 +259,8 @@ class HackAfterDarkLiveGrade: "max": 1.0, "step": 0.05, }), - "enable_preview": ("BOOLEAN", {"default": True}), "clip_output": ("BOOLEAN", {"default": True}), + "output_original": ("BOOLEAN", {"default": True}), } } @@ -312,10 +312,12 @@ class HackAfterDarkLiveGrade: balance=0.0, micro_contrast=0.0, clarity=0.0, - enable_preview=True, clip_output=True, + output_original=True, **kwargs ): + if "enable_preview" in kwargs: + output_original = kwargs["enable_preview"] if "strength" in kwargs: lut_strength = kwargs["strength"] @@ -426,7 +428,7 @@ class HackAfterDarkLiveGrade: # 6. Preview Image Generation for Frontend UI ui_results = {} - if enable_preview: + if output_original: try: temp_dir = folder_paths.get_temp_directory() if hasattr(folder_paths, "get_temp_directory") else os.path.join(os.path.expanduser("~"), "ComfyUI", "temp") os.makedirs(temp_dir, exist_ok=True) diff --git a/test_film_live_grade.py b/test_film_live_grade.py index 0548ff4..10d1eab 100644 --- a/test_film_live_grade.py +++ b/test_film_live_grade.py @@ -63,7 +63,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", exposure=1.0, - enable_preview=False, + output_original=False, clip_output=True ) out_img = res["result"][0] @@ -76,7 +76,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", contrast=1.5, - enable_preview=False, + output_original=False, clip_output=True ) out_img = res["result"][0] @@ -89,7 +89,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", black_lift=0.1, - enable_preview=False, + output_original=False, clip_output=True ) out_img = res["result"][0] @@ -103,7 +103,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", hue=120.0, - enable_preview=False, + output_original=False, clip_output=True ) out_img = res["result"][0] @@ -118,7 +118,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", tint_green_magenta=0.4, - enable_preview=False, + output_original=False, clip_output=True ) out_img = res["result"][0] @@ -134,13 +134,23 @@ class TestFilmLiveGrade(unittest.TestCase): res = self.node.apply_live_grade( image=img, lut_file="None", - enable_preview=True + output_original=True ) self.assertIn("ui", res) self.assertIn("livegrade_images", res["ui"]) self.assertEqual(len(res["ui"]["livegrade_images"]), 1) self.assertEqual(res["ui"]["livegrade_images"][0]["type"], "temp") + def test_legacy_enable_preview_kwarg(self): + img = torch.rand((1, 32, 32, 3), dtype=torch.float32) + res = self.node.apply_live_grade( + image=img, + lut_file="None", + enable_preview=True + ) + self.assertIn("ui", res) + self.assertIn("livegrade_images", res["ui"]) + def test_split_toning(self): # Test applying shadow tint (Teal / Cyan) to dark pixels img = torch.full((1, 8, 8, 3), 0.1, dtype=torch.float32) @@ -149,7 +159,7 @@ class TestFilmLiveGrade(unittest.TestCase): lut_file="None", shadow_tint="Teal / Cyan", shadow_intensity=0.5, - enable_preview=False + output_original=False ) out_img = res["result"][0] self.assertLess(out_img[0, 0, 0, 0].item(), 0.1) # Red reduced @@ -164,7 +174,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file="None", micro_contrast=0.5, - enable_preview=False + output_original=False ) out_img = res["result"][0] self.assertEqual(out_img.shape, img.shape) @@ -190,7 +200,7 @@ class TestFilmLiveGrade(unittest.TestCase): image=img, lut_file=tmp_path, strength=1.0, - enable_preview=False + output_original=False ) out_img = res["result"][0] self.assertEqual(out_img.shape, img.shape) diff --git a/web/live_grade.js b/web/live_grade.js index 5081639..33c2a07 100644 --- a/web/live_grade.js +++ b/web/live_grade.js @@ -429,7 +429,7 @@ app.registerExtension({ balance: 0.0, micro_contrast: 0.0, clarity: 0.0, - enable_preview: true, + output_original: true, clip_output: true }; (node.widgets || []).forEach(w => {