Skip to content

A static method was added to validate the names of keyword parameters, to ensure that the generated kwargs are valid Python identifiers and not actual keywords. The method for generating workflows was also updated to filter out invalid kwargs. #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

A static method was added to validate the names of keyword parameters, to ensure that the generated kwargs are valid Python identifiers and not actual keywords. The method for generating workflows was also updated to filter out invalid kwargs. #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions comfyui_to_python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import random
import sys
import re
import keyword
from typing import Dict, List, Any, Callable, Tuple, TextIO
from argparse import ArgumentParser

Expand Down Expand Up @@ -183,6 +184,14 @@ def __init__(self, node_class_mappings: Dict, base_node_class_mappings: Dict):
self.node_class_mappings = node_class_mappings
self.base_node_class_mappings = base_node_class_mappings

@staticmethod
def is_valid_kwarg_name(name: str) -> bool:
"""Return True if name is a valid Python identifier and not a keyword.

This prevents emitting invalid kwargs like "Update inputs".
"""
return isinstance(name, str) and name.isidentifier() and not keyword.iskeyword(name)

def generate_workflow(
self,
load_order: List,
Expand Down Expand Up @@ -246,11 +255,12 @@ def generate_workflow(
)
no_params = class_def_params is None

# Remove any keyword arguments from **inputs if they are not in class_def_params
# Remove any invalid/unknown kwargs. If function accepts **kwargs (no_params=True)
# we still must ensure Python-valid identifiers only.
inputs = {
key: value
for key, value in inputs.items()
if no_params or key in class_def_params
if self.is_valid_kwarg_name(key) and (no_params or key in class_def_params)
}
# Deal with hidden variables
if (
Expand Down Expand Up @@ -314,6 +324,8 @@ def create_function_call_code(
Returns:
str: The generated Python code.
"""
# Safety: filter any invalid kwarg names again at the call site
kwargs = {k: v for k, v in kwargs.items() if self.is_valid_kwarg_name(k)}
args = ", ".join(self.format_arg(key, value) for key, value in kwargs.items())

# Generate the Python code
Expand Down