diff --git a/modules/impact/config.py b/modules/impact/config.py index b9b2b10..467d2e4 100644 --- a/modules/impact/config.py +++ b/modules/impact/config.py @@ -1,7 +1,7 @@ import configparser import os -version_code = [5, 16] +version_code = [5, 17] version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '') dependency_version = 21 diff --git a/modules/impact/wildcards.py b/modules/impact/wildcards.py index 9459c5d..dee8a30 100644 --- a/modules/impact/wildcards.py +++ b/modules/impact/wildcards.py @@ -41,6 +41,9 @@ def read_wildcard(k, v): new_key = f"{k}/{k2}" new_key = wildcard_normalize(new_key) read_wildcard(new_key, v2) + elif isinstance(v, str): + k = wildcard_normalize(k) + wildcard_dict[k] = [v] def read_wildcard_dict(wildcard_path): @@ -197,11 +200,11 @@ def process(text, seed=None): replacements_found = True string = string.replace(f"__{match}__", replacement, 1) elif '*' in keyword: - subpattern = keyword.replace('*', '.*').replace('+','\\+') + subpattern = keyword.replace('*', '.*').replace('+', '\\+') total_patterns = [] found = False for k, v in local_wildcard_dict.items(): - if re.match(subpattern, k) is not None: + if re.match(subpattern, k) is not None or re.match(subpattern, k+'/') is not None: total_patterns += v found = True diff --git a/pyproject.toml b/pyproject.toml index 6ac2df0..fc1a58b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "comfyui-impact-pack" description = "This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler." -version = "5.16" +version = "5.17" license = "LICENSE" dependencies = ["segment-anything", "scikit-image", "piexif", "transformers", "opencv-python-headless", "GitPython", "scipy>=1.11.4"]