sonusai 0.15.2__py3-none-any.whl → 0.15.4__py3-none-any.whl

sonusai/mixture/augmentation.py

@@ -58,11 +58,14 @@ def _expand_rules(expanded_rules: list[dict], rule: dict) -> list[dict]:
             if not eq_rule_is_valid(rule[key]):
                 raise SonusAIError(f'Invalid augmentation value for {key}: {rule[key]}')
 
-            if all(isinstance(el, list) for el in rule[key]):
+            if all(isinstance(el, list) or (isinstance(el, str) and el == 'none') for el in rule[key]):
                 # Expand multiple rules
                 for value in rule[key]:
                     expanded_rule = deepcopy(rule)
-                    expanded_rule[key] = deepcopy(value)
+                    if isinstance(value, str) and value == 'none':
+                        expanded_rule[key] = None
+                    else:
+                        expanded_rule[key] = deepcopy(value)
                     _expand_rules(expanded_rules, expanded_rule)
                 return expanded_rules
 
@@ -80,13 +83,31 @@ def _expand_rules(expanded_rules: list[dict], rule: dict) -> list[dict]:
                 return expanded_rules
             else:
                 rule[key] = convert_string_to_number(rule[key])
-                if not (isinstance(rule[key], float | int) or rule[key].startswith('rand')):
+                if not (isinstance(rule[key], float | int) or
+                        rule[key].startswith('rand') or
+                        rule[key] == 'none'):
                     raise SonusAIError(f'Invalid augmentation value for {key}: {rule[key]}')
 
     expanded_rules.append(rule)
     return expanded_rules
 
 
+def _generate_none_rule(rule: dict) -> dict:
+    """Generate a new rule from a rule that contains 'none' directives
+
+    :param rule: Rule
+    :return: New rule
+    """
+    from copy import deepcopy
+
+    out_rule = deepcopy(rule)
+    for key in out_rule:
+        if out_rule[key] == 'none':
+            out_rule[key] = None
+
+    return out_rule
+
+
 def _generate_random_rule(rule: dict, num_ir: int = 0) -> dict:
     """Generate a new rule from a rule that contains 'rand' directives
 
@@ -237,6 +258,15 @@ def _parse_ir(rule: dict, num_ir: int) -> dict:
     from sonusai import SonusAIError
     from .helpers import generic_ids_to_list
 
+    def _resolve_str(rule_in: str) -> str | list[int]:
+        if rule_in in ['rand', 'none']:
+            return rule_in
+
+        rule_out = generic_ids_to_list(num_ir, rule_in)
+        if not all(ro in range(num_ir) for ro in rule_out):
+            raise SonusAIError(f'Invalid ir entry of {rule_in}')
+        return rule_out
+
     if 'ir' not in rule:
         return rule
 
@@ -246,15 +276,18 @@ def _parse_ir(rule: dict, num_ir: int) -> dict:
         return rule
 
     if isinstance(ir, str):
-        if ir == 'rand':
-            return rule
-
-        rule['ir'] = generic_ids_to_list(num_ir, ir)
+        rule['ir'] = _resolve_str(ir)
         return rule
 
     if isinstance(ir, list):
-        if not all(item in range(num_ir) for item in ir):
-            raise SonusAIError(f'Invalid ir of {ir}')
+        rule['ir'] = []
+        for item in ir:
+            result = _resolve_str(item)
+            if isinstance(result, str):
+                rule['ir'].append(_resolve_str(item))
+            else:
+                rule['ir'] += _resolve_str(item)
+
         return rule
 
     if isinstance(ir, int):
@@ -296,6 +329,7 @@ def augmentation_from_rule(rule: AugmentationRule, num_ir: int) -> Augmentation:
 
     processed_rule = rule.to_dict()
     del processed_rule['mixup']
+    processed_rule = _generate_none_rule(processed_rule)
     if _rule_has_rand(processed_rule):
         processed_rule = _generate_random_rule(processed_rule, num_ir)
 

sonusai/mixture/eq_rule_is_valid.py

@@ -7,13 +7,16 @@ def eq_rule_is_valid(rule: Any) -> bool:
     An EQ rule must be a tuple of length 3 or a list of length 3 tuples.
     """
 
-    # Must be a list
+    # Must be a list or string equal to 'none'
+    if isinstance(rule, str) and rule == 'none':
+        return True
+
     if not isinstance(rule, list):
         return False
 
     if len(rule) != 3:
         # If the length is not 3, then all elements must also be lists
-        if not all(isinstance(el, list) and len(el) == 3 for el in rule):
+        if not all(_check_for_none(el) for el in rule):
             return False
         rules = rule
     else:
@@ -24,9 +27,22 @@ def eq_rule_is_valid(rule: Any) -> bool:
         if not all(isinstance(el, float | int | str) for el in r):
             return False
 
+        if isinstance(r, str) and r == 'none':
+            continue
+
         for el in r:
             # If a string, item must start with 'rand'
             if isinstance(el, str) and not el.startswith('rand'):
                 return False
 
     return True
+
+
+def _check_for_none(rule: Any) -> bool:
+    """Check if EQ rule is 'none'
+    """
+    if isinstance(rule, str) and rule == 'none':
+        return True
+    if isinstance(rule, list) and len(rule) == 3:
+        return True
+    return False

{sonusai-0.15.2.dist-info → sonusai-0.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sonusai
-Version: 0.15.2
+Version: 0.15.4
 Summary: Framework for building deep neural network models for sound, speech, and voice AI
 Home-page: https://aaware.com
 License: GPL-3.0-only

{sonusai-0.15.2.dist-info → sonusai-0.15.4.dist-info}/RECORD

@@ -37,12 +37,12 @@ sonusai/metrics/one_hot.py,sha256=QSeH_GdqBpOAKLrNnQ8gjcPC-vSdUqC0yPEQueTA6VI,13
 sonusai/metrics/snr_summary.py,sha256=P4U5_Xr7v9F8kF-rZBnpsVNt3p42rIVS6zmch8yfVfg,5575
 sonusai/mixture/__init__.py,sha256=WzPHGSWz6v64HCSFTGboG5o-xBy_0II4i4tkf1UL1Vw,5251
 sonusai/mixture/audio.py,sha256=6W2ihjJGBy7Xggx1imF7bzkymDuipPOgC63j2J7Wf-E,3456
-sonusai/mixture/augmentation.py,sha256=ccQJofCg4K6Hb_YGPLNMBb2dTW1FWGTV5SgHXMaZLoU,9402
+sonusai/mixture/augmentation.py,sha256=Blb90tdTwBOj5w9tRcYyS5H67YJuFiXsGqwZWd7ON4g,10468
 sonusai/mixture/class_count.py,sha256=_wFnVl2yEOnbor7pLg7cYOUeX6nioov-03Cv3SEbh2k,996
 sonusai/mixture/config.py,sha256=CXIkVRJmaW2QW_sGl0aIqPf7I_TesyGhUYzxouw5UX4,22266
 sonusai/mixture/constants.py,sha256=xjCskcQi6khqYZDf7j6z1OkeN1C6wE06kBBapcJiNI4,1428
 sonusai/mixture/datatypes.py,sha256=xN-GdPCEHGE2Ak_TdFbjuSyMs4x7TLRp59trbMTiYLg,8164
-sonusai/mixture/eq_rule_is_valid.py,sha256=35cAOZLRee3HDJJJ-TvNt-QevPYj27WorW1sTjrAMpw,856
+sonusai/mixture/eq_rule_is_valid.py,sha256=MpQwRA5M76wSiQWEI1lW2cLFdPaMttBLcQp3tWD8efM,1243
 sonusai/mixture/feature.py,sha256=io6OiJAJ3GYvPChiUmPQuP3h0OB2onjYF8o9-AWkmqM,1996
 sonusai/mixture/generation.py,sha256=EUzG7zrezcCm-DuhyY27SJKQ0g7RV7w_uu19Iu5v70c,38879
 sonusai/mixture/helpers.py,sha256=XqpcB15MezEMVJwf3jxzATDJSpj_27b8Cru1TDIFD7w,21326
@@ -122,7 +122,7 @@ sonusai/utils/trim_docstring.py,sha256=dSrtiRsEN4wkkvKBp6WDr13RUypfqZzgH_jOBLs1o
 sonusai/utils/wave.py,sha256=TKE-CNPGFXNXUW626CBPzCTNgWJut8I0ZEUsgG9q4Po,586
 sonusai/utils/yes_or_no.py,sha256=eMLXBVH0cEahiXY4W2KNORmwNQ-ba10eRtldh0y4NYg,263
 sonusai/vars.py,sha256=m2AefF0m5bXWGXpJj8Pi42zWL2ydeEj7bkak3GrtMyM,940
-sonusai-0.15.2.dist-info/METADATA,sha256=6_cFNdWWq1leuzL5Wpqsuc-wKq6Bm9yKgg6x4ElAANg,3097
-sonusai-0.15.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-sonusai-0.15.2.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
-sonusai-0.15.2.dist-info/RECORD,,
+sonusai-0.15.4.dist-info/METADATA,sha256=ozwRzn2oun0k1CULOzzLQo46oGCqqr_4Za8ig5jqw1Y,3097
+sonusai-0.15.4.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+sonusai-0.15.4.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
+sonusai-0.15.4.dist-info/RECORD,,