sonusai 1.0.16__cp311-abi3-macosx_10_12_x86_64.whl → 1.0.18__cp311-abi3-macosx_10_12_x86_64.whl

sonusai/datatypes.py

@@ -88,16 +88,33 @@ class Effects(DataClassSonusAIMixin):
 
 class UniversalSNRGenerator:
     def __init__(self, raw_value: float | str) -> None:
-        self._raw_value = str(raw_value)
-        self.is_random = isinstance(raw_value, str) and raw_value.startswith("rand")
+        from sonusai.parse.choose import parse_choose_expression
+        from sonusai.parse.sequence import parse_sequence_expression
+
+        self.is_random = False
+        self._rand_obj = None
+
+        if isinstance(raw_value, str) and raw_value.startswith("rand"):
+            self.is_random = True
+            self._rand_directive = str(raw_value)
+        elif isinstance(raw_value, str) and raw_value.startswith("choose"):
+            self._rand_obj = parse_choose_expression(raw_value)
+        elif isinstance(raw_value, str) and raw_value.startswith("sequence"):
+            self._rand_obj = parse_sequence_expression(raw_value)
+        else:
+            self._raw_value = float(raw_value)
 
     @property
     def value(self) -> float:
         from sonusai.parse.rand import rand
 
         if self.is_random:
-            return float(rand(self._raw_value))
-        return float(self._raw_value)
+            return float(rand(self._rand_directive))
+
+        if self._rand_obj:
+            return float(self._rand_obj.next())
+
+        return self._raw_value
 
 
 class UniversalSNR(float):

sonusai/mixture/generation.py

@@ -590,7 +590,7 @@ class DatabaseManager:
                         mix_rule=mix_rule,
                     )
                 )
-            mixtures.extend(new_mixtures)
+            mixtures = new_mixtures
 
         # Update the mixid width
         with self.db(readonly=False) as c:
@@ -781,7 +781,7 @@ class DatabaseManager:
         mix_rule: str,
     ) -> list[Mixture]:
         if mix_rule == "none":
-            return []
+            return mixtures
         if mix_rule.startswith("choose"):
             return self._additional_choose(
                 effected_sources=effected_sources,

sonusai/parse/choose.py

@@ -0,0 +1,68 @@
+import pyparsing as pp
+
+from ..utils.choice import RandomChoice
+
+
+def parse_choose_expression(expression: str) -> RandomChoice:
+    """
+    Parse a string of the form "choose([1, 2, 3])" or "choose([1, 2, 3], repetition=True)"
+    and return a RandomChoice object with the parsed list and optional repetition parameter.
+
+    Args:
+        expression: String to parse, e.g., "choose([1, 2, 3])" or "choose([1, 2, 3], repetition=False)"
+
+    Returns:
+        RandomChoice object with parsed data and repetition settings
+
+    Raises:
+        pp.ParseException: If the string doesn't match the expected format
+    """
+    # Define grammar for parsing numbers, strings, and booleans
+    number = pp.pyparsing_common.number
+    quoted_string = pp.QuotedString('"') | pp.QuotedString("'")
+    boolean = pp.Keyword("True").setParseAction(lambda: True) | pp.Keyword("False").setParseAction(lambda: False)
+
+    # List element can be a number, quoted string, or boolean
+    list_element = number | quoted_string | boolean
+
+    # List definition: [item1, item2, ...]
+    list_def = pp.Suppress("[") + pp.Optional(pp.delimitedList(list_element)) + pp.Suppress("]")
+
+    # Repetition parameter: repetition=True, or repetition=False
+    repetition_param = pp.Keyword("repetition") + pp.Suppress("=") + boolean
+
+    # Function call: choose([...]) or choose([...], repetition=...)
+    function_call = (
+        pp.Keyword("choose")
+        + pp.Suppress("(")
+        + list_def
+        + pp.Optional(pp.Suppress(",") + repetition_param)
+        + pp.Suppress(")")
+    )
+
+    # Parse the expression
+    try:
+        result = function_call.parseString(expression, parseAll=True)
+
+        # Extract the list (everything between 'choose' and potential 'repetition')
+        data_list = []
+        repetition: bool = False
+
+        for item in result:
+            if item == "choose":
+                continue
+            elif item == "repetition":
+                break
+            else:
+                data_list.append(item)
+
+        # If repetition was specified, find its value
+        if "repetition" in result.as_list():
+            repetition_index = result.asList().index("repetition")
+            if repetition_index + 1 < len(result):
+                repetition = bool(result[repetition_index + 1])
+
+        return RandomChoice(data_list, repetition=repetition)
+
+    except pp.ParseException as e:
+        raise pp.ParseException(f"Invalid choose expression format: {e}") from e

sonusai/parse/sequence.py

@@ -0,0 +1,50 @@
+import pyparsing as pp
+
+from ..utils.choice import SequentialChoice
+
+
+def parse_sequence_expression(expression: str) -> SequentialChoice:
+    """
+    Parse a string of the form "sequence([1, 2, 3])"
+    and return a SequentialChoice object with the parsed list.
+
+    Args:
+        expression: String to parse, e.g., "sequence([1, 2, 3])"
+
+    Returns:
+        SequentialChoice object with parsed data
+
+    Raises:
+        pp.ParseException: If the string doesn't match the expected format
+    """
+    # Define grammar for parsing numbers, strings, and booleans
+    number = pp.pyparsing_common.number
+    quoted_string = pp.QuotedString('"') | pp.QuotedString("'")
+    boolean = pp.Keyword("True").setParseAction(lambda: True) | pp.Keyword("False").setParseAction(lambda: False)
+
+    # List element can be a number, quoted string, or boolean
+    list_element = number | quoted_string | boolean
+
+    # List definition: [item1, item2, ...]
+    list_def = pp.Suppress("[") + pp.Optional(pp.delimitedList(list_element)) + pp.Suppress("]")
+
+    # Function call: sequence([...])
+    function_call = pp.Keyword("sequence") + pp.Suppress("(") + list_def + pp.Suppress(")")
+
+    # Parse the expression
+    try:
+        result = function_call.parseString(expression, parseAll=True)
+
+        # Extract the list (everything after 'sequence')
+        data_list = []
+
+        for item in result:
+            if item == "sequence":
+                continue
+            else:
+                data_list.append(item)
+
+        return SequentialChoice(data_list)
+
+    except pp.ParseException as e:
+        raise pp.ParseException(f"Invalid sequence expression format: {e}") from e

{sonusai-1.0.16.dist-info → sonusai-1.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sonusai
-Version: 1.0.16
+Version: 1.0.18
 Requires-Dist: dataclasses-json >=0.6.7, <1.0.0
 Requires-Dist: docopt >=0.6.2, <1.0.0
 Requires-Dist: h5py >=3.12.1, <4.0.0

{sonusai-1.0.16.dist-info → sonusai-1.0.18.dist-info}/RECORD

@@ -1,6 +1,6 @@
-sonusai-1.0.16.dist-info/METADATA,sha256=4rPDjq5Qs79248l_yin12alUioOX4j2zn_YzV_aNrF4,2601
-sonusai-1.0.16.dist-info/WHEEL,sha256=4-MxxhqCDAoFQQ2gzyecUreXPLf07ql-PG7vniU0rIA,105
-sonusai-1.0.16.dist-info/entry_points.txt,sha256=gw3C7Ih4fM4oJThb-dkERhdDtDzEHr6kZZVRVX0rkMk,91
+sonusai-1.0.18.dist-info/METADATA,sha256=WuFcKlPEE4bBZHdWqvgRbX4vUS-H9N6Aeu4WfjEdIng,2601
+sonusai-1.0.18.dist-info/WHEEL,sha256=4-MxxhqCDAoFQQ2gzyecUreXPLf07ql-PG7vniU0rIA,105
+sonusai-1.0.18.dist-info/entry_points.txt,sha256=gw3C7Ih4fM4oJThb-dkERhdDtDzEHr6kZZVRVX0rkMk,91
 sonusai/mkwav.py,sha256=9fBlm14GlBCkz-hXvaM3rva2iVVSzQ45G7G0vmfP-wc,4309
 sonusai/metrics/calculate_metrics.py,sha256=jcAyEV6loenu4fU_EvwEkpKxOrP8-K9O3rwQGlE48IU,12475
 sonusai/metrics/calc_phase_distance.py,sha256=MFuBtGXb5qfQvRVciJ0Soz1w0GMSeJLBJud-aK4Loow,1870
@@ -36,7 +36,9 @@ sonusai/config/config.yml,sha256=Z7D4adzaK1TAUJyEJdjE-xdg67kHis4WXZ5UjAmyW2Q,804
 sonusai/config/source.py,sha256=hID2BbuaaqKjuJBcRSNTpiA6xtGd-TeSxSjzRDhD0Gc,10761
 sonusai/genmix.py,sha256=AaROzReE5vSRKZ3zqVOSdCpwANJHRHxQ8fWk6EcEVrE,5851
 sonusai/rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sonusai/parse/choose.py,sha256=zkeTXNSl6h2xV6X01jep2dLvtJv1AjVOHvfma7Nh4aQ,2468
 sonusai/parse/parse_source_directive.py,sha256=HhQlqKXg6BoHaEGdVK7abRXLz1agi4M4RV-Z9ckuEpQ,4520
+sonusai/parse/sequence.py,sha256=5j4glQlHPSH3SeyiHtAfxXjwNWm6c32ZkgdNTb9vvAI,1662
 sonusai/parse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sonusai/parse/rand.py,sha256=nKPqbN_w9xnm2_LBlTl1e6AZn4b89McR-CErxt6YBHM,8579
 sonusai/parse/expand.py,sha256=DAX1crIRKbcM61A7EpQRgvMj_d1ckRRjyl34tYYAQgg,4441
@@ -99,13 +101,13 @@ sonusai/speech/vctk.py,sha256=WInvRRRkZCW6t_NcZAJffJzgCbyetal-j2w0kKX5SDw,1527
 sonusai/speech/textgrid.py,sha256=WvsUeamKoYyXBNnNnZgug-xfTiq2Z6RnFc1u0swmqNw,2813
 sonusai/genmetrics.py,sha256=ekN7gocVNUfopOgxNbU7mTKahL3wSQSUM5wHOgbNtqU,6194
 sonusai/aawscd_probwrite.py,sha256=2ZhKoe1iFZ3nzbddEkdM93-CsbuJHE_VsuYyXInwaXE,3709
-sonusai/datatypes.py,sha256=XJ9jnWaEnrtwIEPCR_wCSyHetzbN3qWSUfI0W1_47Tg,9808
+sonusai/datatypes.py,sha256=I9W7TFT2Lw1yugDW9dXwjw8bwqPEZ5tAztHfe0UGX0g,10455
 sonusai/genmixdb.py,sha256=ptwvhIhyMRhAIpZxNc3wZUosiyI9ZMcm5C4Wf9iL4mo,7043
 sonusai/lsdb.py,sha256=ochrLiWSdz1GjqX5Xw7JcH93fkt3nNurLY93tlAvJvA,5095
 sonusai/doc.py,sha256=mq52mun-QORFSZBO4KexLHkL7wjRsQTCiUbr5ZPN1Ts,1151
 sonusai/mixture/effects.py,sha256=o0KIOZ0va-LzrYpPt_ZzOwETieoMuEzJ0YlmJIOgnhA,10807
 sonusai/mixture/db.py,sha256=jbt499Dk-h9c8B7aIsBg-LCnVBJOY2VPkul-n9uJjgc,5683
-sonusai/mixture/generation.py,sha256=5l0050pzDvv8Kv7lw_AeXks94EjGmDQdAemueTfUJ5A,44402
+sonusai/mixture/generation.py,sha256=EV1ofmubBiu7Er6igV7iaefoMoICzMcBzcBEGNcxoZA,44402
 sonusai/mixture/resample.py,sha256=jXqH6FrZ0mlhQ07XqPx88TT9elu3HHVLw7Q0a7Lh5M4,221
 sonusai/mixture/sox_effects.py,sha256=tndS9qrh3eJOTUPrufyWHCt3UqjbPuh81I4Lo4MNmDg,5328
 sonusai/mixture/pad_audio.py,sha256=KNxVQAejA0hblLOnMJgLS6lFaeE0n3tWQ5rclaHBnIY,1015
@@ -146,5 +148,5 @@ sonusai/rs.pyi,sha256=Y25n44pyE3vp92MiABKrcK3IWRyQ1JG1rZ4Ufqy2nC0,17
 sonusai/deprecated/plot.py,sha256=m9epn_RQn-EaarABKjjs2m2bGawxIP8o_KBXvx2s89A,17490
 sonusai/deprecated/tplot.py,sha256=jnOxiGwCQBy7ChkrNfbpwcgh5_L7Hjnkiyq7HL1HXFo,14651
 sonusai/deprecated/gentcst.py,sha256=QqyloM_JRck5NfIhGfttwkQeFJ9pmfXD0e0riCJCXu8,19964
-sonusai/rs.abi3.so,sha256=KJyZE1ySsUtb65V3_zEyIQwp3QU3ryyQOx-sawa29IY,432796
-sonusai-1.0.16.dist-info/RECORD,,
+sonusai/rs.abi3.so,sha256=YskCuLNgLPv_8Wqil3aDv996C38spiP5Utkp7bEryxI,432796
+sonusai-1.0.18.dist-info/RECORD,,