sonusai 1.0.7__tar.gz → 1.0.8__tar.gz

{sonusai-1.0.7 → sonusai-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sonusai
-Version: 1.0.7
+Version: 1.0.8
 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-1.0.7 → sonusai-1.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sonusai"
-version = "1.0.7"
+version = "1.0.8"
 description = "Framework for building deep neural network models for sound, speech, and voice AI"
 authors = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]
 maintainers = ["Chris Eddington <chris@aaware.com>", "Jason Calderwood <jason@aaware.com>"]

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/__init__.py

@@ -36,7 +36,7 @@ logger_db = logging.getLogger("sonusai_db")
 logger_db.setLevel(logging.DEBUG)
 
 # create file handler
-def create_file_handler(filename: str) -> None:
+def create_file_handler(filename: str, verbose: bool = False) -> None:
     from pathlib import Path
 
     fh = logging.FileHandler(filename=filename, mode="w")
@@ -44,12 +44,13 @@ def create_file_handler(filename: str) -> None:
     fh.setFormatter(formatter)
     logger.addHandler(fh)
 
-    filename_db = Path(filename)
-    filename_db = filename_db.parent / (filename_db.stem + "_dbtrace" + filename_db.suffix)
-    fh = logging.FileHandler(filename=filename_db, mode="w")
-    fh.setLevel(logging.DEBUG)
-    fh.setFormatter(formatter_db)
-    logger_db.addHandler(fh)
+    if verbose:
+        filename_db = Path(filename)
+        filename_db = filename_db.parent / (filename_db.stem + "_dbtrace" + filename_db.suffix)
+        fh = logging.FileHandler(filename=filename_db, mode="w")
+        fh.setLevel(logging.DEBUG)
+        fh.setFormatter(formatter_db)
+        logger_db.addHandler(fh)
 
 
 # update console handler

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/audiofe.py

@@ -77,7 +77,7 @@ def main() -> None:
     from sonusai.utils import load_ort_session
 
     # Setup logging file
-    create_file_handler("audiofe.log")
+    create_file_handler("audiofe.log", verbose)
     update_console_handler(verbose)
     initial_log_messages("audiofe")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/calc_metric_spenh.py

@@ -531,10 +531,10 @@ def _process_mixture(
         pesq_speech = calc_pesq(target_est_wav, target_fi)
         csig_tg, cbak_tg, covl_tg = calc_speech(target_est_wav, target_fi, pesq=pesq_speech)
         metrics = mixdb.mixture_metrics(m_id, ["mxpesq", "mxcsig", "mxcbak", "mxcovl"])
-        pesq_mx = metrics["mxpesq"][0] if isinstance(metrics["mxpesq"], list) else metrics["mxpesq"]
-        csig_mx = metrics["mxcsig"][0] if isinstance(metrics["mxcsig"], list) else metrics["mxcsig"]
-        cbak_mx = metrics["mxcbak"][0] if isinstance(metrics["mxcbak"], list) else metrics["mxcbak"]
-        covl_mx = metrics["mxcovl"][0] if isinstance(metrics["mxcovl"], list) else metrics["mxcovl"]
+        pesq_mx = metrics["mxpesq"]["primary"] if isinstance(metrics["mxpesq"], dict) else metrics["mxpesq"]
+        csig_mx = metrics["mxcsig"]["primary"] if isinstance(metrics["mxcsig"], dict) else metrics["mxcsig"]
+        cbak_mx = metrics["mxcbak"]["primary"] if isinstance(metrics["mxcbak"], dict) else metrics["mxcbak"]
+        covl_mx = metrics["mxcovl"]["primary"] if isinstance(metrics["mxcovl"], dict) else metrics["mxcovl"]
         # pesq_speech_tst = calc_pesq(hypothesis=target_est_wav, reference=target)
         # pesq_mixture_tst = calc_pesq(hypothesis=mixture, reference=target)
         # pesq improvement
@@ -560,11 +560,11 @@ def _process_mixture(
     if asr_method is not None and mixdb.mixture(m_id).noise.snr >= -96:  # noise only, ignore/reset target ASR
         asr_mx_name = f"mxasr.{asr_method}"
         wer_mx_name = f"mxwer.{asr_method}"
-        asr_tt_name = f"tasr.{asr_method}"
+        asr_tt_name = f"sasr.{asr_method}"
         metrics = mixdb.mixture_metrics(m_id, [asr_mx_name, wer_mx_name, asr_tt_name])
-        asr_mx = metrics[asr_mx_name][0] if isinstance(metrics[asr_mx_name], list) else metrics[asr_mx_name]
-        wer_mx = metrics[wer_mx_name][0] if isinstance(metrics[wer_mx_name], list) else metrics[wer_mx_name]
-        asr_tt = metrics[asr_tt_name][0] if isinstance(metrics[asr_tt_name], list) else metrics[asr_tt_name]
+        asr_mx = metrics[asr_mx_name]["primary"] if isinstance(metrics[asr_mx_name], dict) else metrics[asr_mx_name]
+        wer_mx = metrics[wer_mx_name]["primary"] if isinstance(metrics[wer_mx_name], dict) else metrics[wer_mx_name]
+        asr_tt = metrics[asr_tt_name]["primary"] if isinstance(metrics[asr_tt_name], dict) else metrics[asr_tt_name]
 
         if asr_tt:
             noiseadd = None  # TBD add as switch, default -30
@@ -849,7 +849,7 @@ def main():
         logger.info(f"Found predict log {basename(predict_logfile[0])} in predict location.")
 
     # Setup logging file
-    create_file_handler(join(predict_location, "calc_metric_spenh.log"))
+    create_file_handler(join(predict_location, "calc_metric_spenh.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("calc_metric_spenh")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/genft.py

@@ -138,7 +138,7 @@ def main() -> None:
 
     start_time = time.monotonic()
 
-    create_file_handler(join(location, "genft.log"))
+    create_file_handler(join(location, "genft.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("genft")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/genmetrics.py

@@ -1,14 +1,14 @@
 """sonusai genmetrics
 
-usage: genmetrics [-hvusd] [-i MIXID] [-n INCLUDE] [-p NUMPROC] [-x EXCLUDE] LOC
+usage: genmetrics [-hvusd] [-i MIXID] [-n INCLUDE] [-x EXCLUDE] [-p NUMPROC] LOC
 
 options:
     -h, --help
     -v, --verbose                   Be verbose.
     -i MIXID, --mixid MIXID         Mixture ID(s) to generate. [default: *].
     -n INCLUDE, --include INCLUDE   Metrics to include. [default: all]
-    -p NUMPROC, --nproc NUMPROC     Number of parallel processes to use. Default single thread.
     -x EXCLUDE, --exclude EXCLUDE   Metrics to exclude. [default: none]
+    -p NUMPROC, --nproc NUMPROC     Number of parallel processes to use. Default single thread.
     -u, --update                    Update metrics (do not regenerate existing metrics).
     -s, --supported                 Show list of supported metrics.
     -d, --dryrun                    Show list of metrics that will be generated and exit.
@@ -97,7 +97,7 @@ def main() -> None:
     start_time = time.monotonic()
 
     # Setup logging file
-    create_file_handler(join(location, "genmetrics.log"))
+    create_file_handler(join(location, "genmetrics.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("genmetrics")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/genmix.py

@@ -144,7 +144,7 @@ def main() -> None:
 
     start_time = time.monotonic()
 
-    create_file_handler(join(location, "genmix.log"))
+    create_file_handler(join(location, "genmix.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("genmix")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/genmixdb.py

@@ -314,7 +314,7 @@ def main() -> None:
 
     makedirs(location, exist_ok=True)
 
-    create_file_handler(join(location, "genmixdb.log"))
+    create_file_handler(join(location, "genmixdb.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("genmixdb")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/metrics_summary.py

@@ -55,13 +55,13 @@ def _process_mixture(
 
     all_metrics = mixdb.mixture_metrics(m_id, all_metric_names)
 
-    # replace lists with first value (ignore mixup)
+    # replace dict with 'primary' value (ignore mixup)
     scalar_metrics = {
-        key: all_metrics[key][0] if isinstance(all_metrics[key], list) else all_metrics[key]
+        key: all_metrics[key]["primary"] if isinstance(all_metrics[key], dict) else all_metrics[key]
         for key in scalar_metric_names
     }
     string_metrics = {
-        key: all_metrics[key][0] if isinstance(all_metrics[key], list) else all_metrics[key]
+        key: all_metrics[key]["primary"] if isinstance(all_metrics[key], dict) else all_metrics[key]
         for key in string_metric_names
     }
 
@@ -133,7 +133,7 @@ def main() -> None:
     timestamp = create_timestamp()  # string good for embedding into filenames
     mixdb_fname = basename(location)
     if verbose:
-        create_file_handler(join(location, "metrics_summary.log"))
+        create_file_handler(join(location, "metrics_summary.log"), verbose)
         update_console_handler(verbose)
         initial_log_messages("metrics_summary")
         logger.info(f"Logging summary of SonusAI mixture database at {location}")
@@ -168,10 +168,9 @@ def main() -> None:
     for metric in metrics_present:
         metval = all_metrics[metric]  # get metric value
         logger.debug(f"First mixid {mixids[0]} metric {metric} = {metval}")
-        if isinstance(metval, list):
-            if len(metval) > 1:
-                logger.warning(f"Mixid {mixids[0]} metric {metric} has a list with more than 1 element, using first.")
-            metval = metval[0]  # remove any list
+        if isinstance(metval, dict):
+            logger.warning(f"Mixid {mixids[0]} metric {metric} is a dict, using 'primary'.")
+            metval = metval["primary"]  # remove any dict
         if isinstance(metval, float | int):
             logger.debug(f"Metric is scalar {type(metval)}, entering in summary table.")
             scalar_metric_names.append(metric)

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/mkwav.py

@@ -86,7 +86,7 @@ def main() -> None:
 
     start_time = time.monotonic()
 
-    create_file_handler(join(location, "mkwav.log"))
+    create_file_handler(join(location, "mkwav.log"), verbose)
     update_console_handler(verbose)
     initial_log_messages("mkwav")
 

{sonusai-1.0.7 → sonusai-1.0.8}/sonusai/onnx_predict.py

@@ -210,7 +210,7 @@ def main() -> None:
     if mixdb_path is not None or len(pfiles) > 1:  # log file only if mixdb or more than one file
         makedirs(output_dir, exist_ok=True)
         # Setup logging file
-        create_file_handler(join(output_dir, "onnx-predict.log"))
+        create_file_handler(join(output_dir, "onnx-predict.log"), verbose)
         update_console_handler(verbose)
         initial_log_messages("onnx_predict")
         # print some previous messages