Improve wildcards and fix a bug (#319)

* Improve wildcards and fix a bug

This commit fixes two issues with wildcards:

- Using a single count value no longer worked due to .strip() being
  called on a None value from matching the upper range,
  when using a wildcard like {2$$a|b|c},
  while {2-2$$a|b|c} worked fine. Added a check to fix that.

- Choosing options was implemented in an odd way. The code would choose
  up to `count` values, then put them in a `set` to prevent duplicates.
  Then retry up to 10 times to get values in case the correct count
  wasn't reached. This had a few issues: {2$$a|a|b} would always choose
  "b a", always in this order! However, {2$$1::a|a|b}, which should be
  identical, gives either "a a" or "b a"!

- When the number of items to choose was more than the count of items to
  choose, the items would be returned in the original order, meaning for
  example {3-6$$a|b|c|d} returns "a b c d" way more often than it
  should. This is changed to shuffle the order when choosing all the
  items.

- As NumPy already had a way to choose N items without replacement and
  with weights, the code has been changed to use a NumPy Generator. This
  means previous seeds are no longer compatible, but also means we don't
  re-seed the built-in Python `random` generator.

- I have also added a "ImpactWildcardUnprocessed" node, in order to have
  a multiline text input node that doesn't do ComfyUI's built in
  wildcard replacement, so it's possible to put a prompt in a separate
  node from the WildcardProcessor (or have a few ones to connect
  manually). Due to the way things are processed both on the JS side and
  the backend side, sadly concatenating text for use in wildcards
  doesn't work yet.

* fix: random_gen.shuffle is side-effect function

* version marker

---------

Co-authored-by: Dr.Lt.Data <dr.lt.data@gmail.com>

Author: kamnxt

modules/impact/config.py

@@ -2,7 +2,7 @@
 import os
 
 
-version = "V4.54.2"
+version = "V4.55"
 
 dependency_version = 20
 

modules/impact/wildcards.py

@@ -4,6 +4,7 @@
 import nodes
 import folder_paths
 import yaml
+import numpy as np
 import threading
 from impact import utils
 
@@ -69,6 +70,7 @@ def read_wildcard_dict(wildcard_path):
 def process(text, seed=None):
     if seed is not None:
         random.seed(seed)
+    random_gen = np.random.default_rng(seed)
 
     def replace_options(string):
         replacements_found = False
@@ -92,10 +94,9 @@ def replace_option(match):
                     b = r.group(1).strip()
                 else:
                     a = r.group(1).strip()
-                    try:
-                        b = r.group(3).strip()
-                    except:
-                        b = None
+                    b = r.group(3)
+                    if b is not None:
+                        b = b.strip()
 
                 if r is not None:
                     if b is not None and is_numeric_string(a) and is_numeric_string(b):
@@ -133,20 +134,13 @@ def replace_option(match):
             if select_range is None:
                 select_count = 1
             else:
-                select_count = random.randint(select_range[0], select_range[1])
+                select_count = random_gen.integers(low=select_range[0], high=select_range[1]+1, size=1)
 
             if select_count > len(options):
+                random_gen.shuffle(options)
                 selected_items = options
             else:
-                selected_items = random.choices(options, weights=normalized_probabilities, k=select_count)
-                selected_items = set(selected_items)
-
-                try_count = 0
-                while len(selected_items) < select_count and try_count < 10:
-                    remaining_count = select_count - len(selected_items)
-                    additional_items = random.choices(options, weights=normalized_probabilities, k=remaining_count)
-                    selected_items |= set(additional_items)
-                    try_count += 1
+                selected_items = random_gen.choice(options, p=normalized_probabilities, size=select_count, replace=False)
 
             selected_items2 = [re.sub(r'^\s*[0-9.]+::', '', x, 1) for x in selected_items]
             replacement = select_sep.join(selected_items2)
@@ -172,7 +166,7 @@ def replace_wildcard(string):
             keyword = match.lower()
             keyword = wildcard_normalize(keyword)
             if keyword in local_wildcard_dict:
-                replacement = random.choice(local_wildcard_dict[keyword])
+                replacement = random_gen.choice(local_wildcard_dict[keyword])
                 replacements_found = True
                 string = string.replace(f"__{match}__", replacement, 1)
             elif '*' in keyword:
@@ -185,7 +179,7 @@ def replace_wildcard(string):
                         found = True
 
                 if found:
-                    replacement = random.choice(total_patterns)
+                    replacement = random_gen.choice(total_patterns)
                     replacements_found = True
                     string = string.replace(f"__{match}__", replacement, 1)
             elif '/' not in keyword: