Merge 743599bd18 into c945a433ae

fix(api-nodes): fixed price badge for Kling V3 model in the Motion Control node (#13790 )
Signed-off-by: bigcat88 <bigcat88@icloud.com>
2026-05-14 02:57:24 +08:00 · 2026-05-07 18:59:52 +00:00 · 2026-05-07 11:55:09 -07:00 · 2026-05-07 00:28:18 -07:00 · 2026-05-06 23:45:59 -07:00 · 2026-02-08 22:42:37 +01:00
4 changed files with 65 additions and 15 deletions
--- a/comfy_api_nodes/nodes_grok.py
+++ b/comfy_api_nodes/nodes_grok.py
@ -54,7 +54,12 @@ class GrokImageNode(IO.ComfyNode):
            inputs=[
                IO.Combo.Input(
                    "model",
-                    options=["grok-imagine-image-pro", "grok-imagine-image", "grok-imagine-image-beta"],
+                    options=[
+                        "grok-imagine-image-quality",
+                        "grok-imagine-image-pro",
+                        "grok-imagine-image",
+                        "grok-imagine-image-beta",
+                    ],
                ),
                IO.String.Input(
                    "prompt",
@ -111,10 +116,12 @@ class GrokImageNode(IO.ComfyNode):
            ],
            is_api_node=True,
            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["model", "number_of_images"]),
+                depends_on=IO.PriceBadgeDepends(widgets=["model", "number_of_images", "resolution"]),
                expr="""
                (
-                  $rate := $contains(widgets.model, "pro") ? 0.07 : 0.02;
+                  $rate := widgets.model = "grok-imagine-image-quality"
+                    ? (widgets.resolution = "1k" ? 0.05 : 0.07)
+                    : ($contains(widgets.model, "pro") ? 0.07 : 0.02);
                  {"type":"usd","usd": $rate * widgets.number_of_images}
                )
                """,
@ -167,7 +174,12 @@ class GrokImageEditNode(IO.ComfyNode):
            inputs=[
                IO.Combo.Input(
                    "model",
-                    options=["grok-imagine-image-pro", "grok-imagine-image", "grok-imagine-image-beta"],
+                    options=[
+                        "grok-imagine-image-quality",
+                        "grok-imagine-image-pro",
+                        "grok-imagine-image",
+                        "grok-imagine-image-beta",
+                    ],
                ),
                IO.Image.Input("image", display_name="images"),
                IO.String.Input(
@ -228,11 +240,19 @@ class GrokImageEditNode(IO.ComfyNode):
            ],
            is_api_node=True,
            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["model", "number_of_images"]),
+                depends_on=IO.PriceBadgeDepends(widgets=["model", "number_of_images", "resolution"]),
                expr="""
                (
-                  $rate := $contains(widgets.model, "pro") ? 0.07 : 0.02;
-                  {"type":"usd","usd": 0.002 + $rate * widgets.number_of_images}
+                  $isQualityModel := widgets.model = "grok-imagine-image-quality";
+                  $isPro := $contains(widgets.model, "pro");
+                  $rate := $isQualityModel
+                    ? (widgets.resolution = "1k" ? 0.05 : 0.07)
+                    : ($isPro ? 0.07 : 0.02);
+                  $base := $isQualityModel ? 0.01 : 0.002;
+                  $output := $rate * widgets.number_of_images;
+                  $isPro
+                    ? {"type":"usd","usd": $base + $output}
+                    : {"type":"range_usd","min_usd": $base + $output, "max_usd": 3 * $base + $output}
                )
                """,
            ),
--- a/comfy_api_nodes/nodes_kling.py
+++ b/comfy_api_nodes/nodes_kling.py
@ -2787,11 +2787,15 @@ class MotionControl(IO.ComfyNode):
            ],
            is_api_node=True,
            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["mode"]),
+                depends_on=IO.PriceBadgeDepends(widgets=["mode", "model"]),
                expr="""
                (
-                  $prices := {"std": 0.07, "pro": 0.112};
-                  {"type":"usd","usd": $lookup($prices, widgets.mode), "format":{"suffix":"/second"}}
+                  $prices := {
+                    "kling-v3": {"std": 0.126, "pro": 0.168},
+                    "kling-v2-6": {"std": 0.07, "pro": 0.112}
+                  };
+                  $modelPrices := $lookup($prices, widgets.model);
+                  {"type":"usd","usd": $lookup($modelPrices, widgets.mode), "format":{"suffix":"/second"}}
                )
                """,
            ),
--- a/nodes.py
+++ b/nodes.py
@ -1678,20 +1678,46 @@ class PreviewImage(SaveImage):
                "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
                }

+
 class LoadImage:
    @classmethod
    def INPUT_TYPES(s):
        input_dir = folder_paths.get_input_directory()
-        files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
-        files = folder_paths.filter_files_content_types(files, ["image"])
+        files = []
+        limit = 1000
+        recursive_scan_failed = False
+
+        # Attempt recursive scan first
+        try:
+            for root, _, file_list in os.walk(input_dir, followlinks=False):
+                if recursive_scan_failed:
+                    break
+                
+                image_files = folder_paths.filter_files_content_types(file_list, ["image"])
+                
+                for image_file in image_files:
+                    if len(files) >= limit:
+                        recursive_scan_failed = True
+                        break
+                        
+                    path_relative = os.path.relpath(os.path.join(root, image_file), input_dir)
+                    path_relative = path_relative.replace('\\', '/')
+                    files.append(path_relative)
+        except Exception:
+            recursive_scan_failed = True
+
+        # Fallback to original non-recursive method if limit exceeded or error
+        if recursive_scan_failed or not files:
+            files = [f for f in os.listdir(input_dir) if os.path.isfile(os.path.join(input_dir, f))]
+            files = folder_paths.filter_files_content_types(files, ["image"])
+
        return {"required":
-                    {"image": (sorted(files), {"image_upload": True})},
+                    {"image": (sorted(list(dict.fromkeys(files))), {"image_upload": True})},
                }

    CATEGORY = "image"
    ESSENTIALS_CATEGORY = "Basics"
    SEARCH_ALIASES = ["load image", "open image", "import image", "image input", "upload image", "read image", "image loader"]
-
    RETURN_TYPES = ("IMAGE", "MASK")
    FUNCTION = "load_image"

--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,5 @@
 comfyui-frontend-package==1.43.17
-comfyui-workflow-templates==0.9.69
+comfyui-workflow-templates==0.9.72
 comfyui-embedded-docs==0.4.4
 torch
 torchsde
Author	SHA1	Message	Date
molbal	bba871446e	Merge `743599bd18` into `c945a433ae`	2026-05-07 18:59:52 +00:00
Alexander Piskun	c945a433ae	fix(api-nodes): fixed price badge for Kling V3 model in the Motion Control node (#13790 ) Signed-off-by: bigcat88 <bigcat88@icloud.com>	2026-05-07 11:55:09 -07:00
Daxiong (Lin)	25757a53c9	chore: update workflow templates to v0.9.72 (#13732 ) Some checks failed Python Linting / Run Ruff (push) Waiting to run Details Python Linting / Run Pylint (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.10, [self-hosted Linux], stable) (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.11, [self-hosted Linux], stable) (push) Waiting to run Details Full Comfy CI Workflow Runs / test-stable (12.1, , linux, 3.12, [self-hosted Linux], stable) (push) Waiting to run Details Full Comfy CI Workflow Runs / test-unix-nightly (12.1, , linux, 3.11, [self-hosted Linux], nightly) (push) Waiting to run Details Execution Tests / test (ubuntu-latest) (push) Waiting to run Details Execution Tests / test (macos-latest) (push) Waiting to run Details Execution Tests / test (windows-latest) (push) Waiting to run Details Test server launches without errors / test (push) Waiting to run Details Unit Tests / test (macos-latest) (push) Waiting to run Details Unit Tests / test (ubuntu-latest) (push) Waiting to run Details Unit Tests / test (windows-2022) (push) Waiting to run Details Build package / Build Test (3.10) (push) Has been cancelled Details Build package / Build Test (3.11) (push) Has been cancelled Details Build package / Build Test (3.12) (push) Has been cancelled Details Build package / Build Test (3.13) (push) Has been cancelled Details Build package / Build Test (3.14) (push) Has been cancelled Details Co-authored-by: Jedrzej Kosinski <kosinkadink1@gmail.com>	2026-05-07 00:28:18 -07:00
Alexander Piskun	1b25f1289e	[Partner Nodes] add grok-imagine-image-quality model (#13725 ) * feat(api-nodes): add grok-imagine-image-quality model Signed-off-by: bigcat88 <bigcat88@icloud.com> * fixed price badges Signed-off-by: bigcat88 <bigcat88@icloud.com> * fix: adjust price badges Signed-off-by: bigcat88 <bigcat88@icloud.com> --------- Signed-off-by: bigcat88 <bigcat88@icloud.com> Co-authored-by: Jedrzej Kosinski <kosinkadink1@gmail.com>	2026-05-06 23:45:59 -07:00
molbal	743599bd18	Enhance LoadImage to support recursive file scanning Updated the LoadImage class to implement a recursive scan for image files with a limit and fallback to a non-recursive method if necessary.	2026-02-08 22:42:37 +01:00
molbal	382c20809b	Restore whitespace	2026-01-26 22:13:50 +01:00
molbal	27f40af5f5	Restore search aliases	2026-01-26 22:06:14 +01:00
molbal	25d4954b10	Enable recursive image loading in LoadImage node The LoadImage node now recursively scans the input directory and all its subdirectories for images, similar to the behavior of the Load Checkpoint node. Previously, the node only displayed images located in the root of the input folder. This made organizing and managing a large number of input images difficult.	2026-01-26 22:05:11 +01:00