sonusai 1.0.7__py3-none-any.whl → 1.0.9__py3-none-any.whl

sonusai/mixture/effects.py

@@ -1,8 +1,5 @@
-# sai_rand
-# sai_rand_choice
-# sai_rand_choice_nr
-# sai_sequence
-# sai_expand
+from numpy.ma.core import choose
+from urllib3.filepost import choose_boundary
 
 from ..datatypes import AudioT
 from ..datatypes import Effects
@@ -28,40 +25,11 @@ def get_effect_rules(location: str, config: dict, test: bool = False) -> dict[st
     return rules
 
 
-def sai_expand(text: str) -> list[str]:
-    import re
-
-    # search pattern
-    pattern = re.compile(r"sai_expand\((.+?)\)")
-
-    # initialize with input
-    expanded = [text]
-
-    # look for pattern
-    result = re.search(pattern, text)
-
-    # if found
-    if result:
-        # remove entry we are expanding
-        expanded.pop()
-
-        # convert match into list stripped of whitespace
-        values = result.group(1).replace(" ", "").split(",")
-
-        # loop over values
-        for value in values:
-            # replace pattern with value
-            replacement = re.sub(pattern, value, text, count=1)
-
-            # extend result with expand of replacement (for handling multiple expands in a single rule)
-            expanded.extend(sai_expand(replacement))
-
-    return expanded
-
-
 def _expand_effect_rules(expanded_rules: list[dict], rule: dict) -> list[dict]:
     from copy import deepcopy
 
+    from .parse import sai_expand
+
     for key in ("pre", "post"):
         if key in rule:
             value = rule[key]
@@ -274,8 +242,8 @@ def evaluate_sai_random_float(text: str) -> str:
     return resolved
 
 
-def evaluate_sai_random_ir(mixdb: MixtureDatabase, text: str) -> str:
-    """Evaluate 'sai_rand' directive for ir
+def evaluate_sai_choose_ir(mixdb: MixtureDatabase, text: str) -> str:
+    """Evaluate 'sai_choose' directive for ir
 
     :param mixdb: Mixture database
     :param text: Text to evaluate
@@ -285,11 +253,11 @@ def evaluate_sai_random_ir(mixdb: MixtureDatabase, text: str) -> str:
     from random import choice
     from random import randint
 
-    rand_pattern = re.compile(r"^ir sai_rand$")
-    rand_range_pattern = re.compile(r"^ir sai_rand\(([-+]?\d+),\s*([-+]?\d+)\)$")
-    rand_tag_pattern = re.compile(r"^ir sai_rand\((\w+)\)$")
+    choose_pattern = re.compile(r"^ir sai_choose\(\)$")
+    choose_range_pattern = re.compile(r"^ir sai_choose\(([-+]?\d+),\s*([-+]?\d+)\)$")
+    choose_tag_pattern = re.compile(r"^ir sai_choose\((\w+)\)$")
 
-    def rand_range_repl(m) -> str:
+    def choose_range_repl(m) -> str:
         lower = int(m.group(1))
         upper = int(m.group(2))
         if (
@@ -304,22 +272,22 @@ def evaluate_sai_random_ir(mixdb: MixtureDatabase, text: str) -> str:
             raise ValueError(f"Invalid rule: '{text}'. Values must be integers between 0 and {mixdb.num_ir_files - 1}.")
         return f"ir {randint(lower, upper)}"  # noqa: S311
 
-    def rand_tag_repl(m) -> str:
+    def choose_tag_repl(m) -> str:
         return m.group(1)
 
-    if re.match(rand_pattern, text):
+    if re.match(choose_pattern, text):
         return f"ir {randint(0, mixdb.num_ir_files - 1)}"  # noqa: S311
 
-    if re.match(rand_range_pattern, text):
+    if re.match(choose_range_pattern, text):
         try:
-            return f"ir {eval(re.sub(rand_range_pattern, rand_range_repl, text))}"  # noqa: S307
+            return f"ir {eval(re.sub(choose_range_pattern, choose_range_repl, text))}"  # noqa: S307
         except Exception as e:
             raise ValueError(
                 f"Invalid rule: '{text}'. Values must be integers between 0 and {mixdb.num_ir_files - 1}."
             ) from e
 
-    if re.match(rand_tag_pattern, text):
-        tag = re.sub(rand_tag_pattern, rand_tag_repl, text)
+    if re.match(choose_tag_pattern, text):
+        tag = re.sub(choose_tag_pattern, choose_tag_repl, text)
         if tag in mixdb.ir_tags:
             return f"ir {choice(mixdb.ir_file_ids_for_tag(tag))}"  # noqa: S311
 
@@ -336,10 +304,9 @@ def effects_from_rules(mixdb: MixtureDatabase, rules: Effects) -> Effects:
         entries = getattr(effects, key)
         for idx, entry in enumerate(entries):
             if entry.find("sai_rand") != -1:
-                if entry.startswith("ir"):
-                    entries[idx] = evaluate_sai_random_ir(mixdb, entry)
-                else:
-                    entries[idx] = evaluate_sai_random_float(entry)
+                entries[idx] = evaluate_sai_random_float(entry)
+            if entry.startswith("ir sai_choose"):
+                entries[idx] = evaluate_sai_choose_ir(mixdb, entry)
         setattr(effects, key, entries)
 
     return effects