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

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/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/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/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/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/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/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/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/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/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

{sonusai-1.0.7.dist-info → sonusai-1.0.8.dist-info}/METADATA

@@ -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.dist-info → sonusai-1.0.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
-sonusai/__init__.py,sha256=XSjulPEFTHCTNAte0z0Ie0e-3w9uVX5j5mR9QfE_r40,3710
+sonusai/__init__.py,sha256=uIuqSf_XWSVHTj4Q7bfJaO7uK1C25XpSK90DWMRKyx4,3773
 sonusai/aawscd_probwrite.py,sha256=QZLMQrmPr3OjZ06buyYDwlnk9YPCpyr4KHkBjPsiqjU,3700
-sonusai/audiofe.py,sha256=0DNpntK0WpzNZeyHX8_wC-pDtrgvLkJZFPXz-PspdrY,19448
-sonusai/calc_metric_spenh.py,sha256=0Md6hRFUH9lGnsvoydqne99O7Gi0ieG9vMU_1PnASBg,50019
+sonusai/audiofe.py,sha256=un6fbS1fHWo9rpgRYG6SdBjaCWuxLkDKtg6N_ZkC1dk,19457
+sonusai/calc_metric_spenh.py,sha256=UW4ItryjYgb4NHkwki9LHvyDBwdIHIARc1yT6yCPJno,50084
 sonusai/config/__init__.py,sha256=NeXdBQiuRKIm77pK9WHaxkdst9-jwhX1IDrHvpZecpI,52
 sonusai/config/config.py,sha256=nM1W7dQXBWMdMLrgh3o7_cEItztFf1UTW-4faM0hIqY,1692
 sonusai/config/config.yml,sha256=9y8wWXemU8tnvm_O21treyCpZF85QzokHsHQ8yl6IfE,283
@@ -20,10 +20,10 @@ sonusai/deprecated/tplot.py,sha256=0p238DvTaP4oU9y-dp0JdLaTV4TKrooAwbx7zdz_QAc,1
 sonusai/doc/__init__.py,sha256=KyQ26Um0RM8A3GYsb_tbFH64RwpoAw6lja2f_moUWas,33
 sonusai/doc/doc.py,sha256=vyEfiUNd--F14Eel-u1EY4mfvHUXJrGrV3xKKExUiC4,19272
 sonusai/doc.py,sha256=ZgFSSI56oNDb-yC3xi-RHMClMjryR2VrgGyi3ggX8gM,1098
-sonusai/genft.py,sha256=jGjtjQQEuPunROkoDOYZ7gdyZEa09EMCVhpHrkBZ7A0,5571
-sonusai/genmetrics.py,sha256=sbcqbjI4YOJd5_Lzor4Re_TK6GUQ5zJuYbhDux8odI0,6184
-sonusai/genmix.py,sha256=U62GPgejGfnDfRgXUosmnVVWvTV07sg46JQEIew0nPg,5744
-sonusai/genmixdb.py,sha256=9T-qn8_Bekc-P7kOY4pV8w-CHixDvSbZPds7wt_mDYU,11272
+sonusai/genft.py,sha256=yiADvi0J-Fy4kNpNOEB3wVvU9RZowGvOsCTJndQYXFw,5580
+sonusai/genmetrics.py,sha256=9l7g_DAKa126RGq23-Wilzdh1M3QHCCeNfUVYaQS1mU,6193
+sonusai/genmix.py,sha256=gcmqcPqZ1Vz_TtZMp29L8cGnqTK5jcw0cAOc16NOR9A,5753
+sonusai/genmixdb.py,sha256=VDQMF6JHcHc-yJAZ1Se3CM3ac8fFKIgnaxv4e5jdE1I,11281
 sonusai/ir_metric.py,sha256=nxS_mARPSZG5Y0G3L8HysOnkPj4v-RGxAxAVBYe-gJI,19600
 sonusai/lsdb.py,sha256=86t6PpsyardRa6VcSJ-KyU1NiTmlg59VUlcSTptJbn0,5078
 sonusai/main.py,sha256=72feJv5XEVJE_CQatmNIL1VD9ca-Mo0QNDbXxLrHrbQ,2619
@@ -44,7 +44,7 @@ sonusai/metrics/class_summary.py,sha256=mQbMxQ8EtFIN7S2h7A4Dk0X4XF_CIxKk3W8zZMmp
 sonusai/metrics/confusion_matrix_summary.py,sha256=lhd8TyHVMC03khX85h_D75XElmawx56KkqpX3X2O2gQ,3133
 sonusai/metrics/one_hot.py,sha256=aKc-xYd4zWIjbmoQikIcQ6BJB1k-68XKTg8eJCacHTU,13906
 sonusai/metrics/snr_summary.py,sha256=qKHctpmvGeu2cmjTG7iQPX1lvVUEtEnCIKwUGu6VrEQ,5773
-sonusai/metrics_summary.py,sha256=pQ5kNwweQM6LdP6TpJE7kV3Z9BYUd96IfEjnZLfSpQI,12211
+sonusai/metrics_summary.py,sha256=jtSwHomw23qwTYfzjFo_JmqzrkZcts1CMFFzTmJCmWk,12189
 sonusai/mixture/__init__.py,sha256=_vepE2uhAGKHIujPWxfGDeaWHP5yKLf5BjXkU9ZereA,1258
 sonusai/mixture/audio.py,sha256=JyrVtVPLH3aTXFgyl446f5uVHxlFRa4aBaSPYaMdg80,5814
 sonusai/mixture/class_balancing.py,sha256=lubicVCzxs4TMh2dZSsuIffkLkk1gmwjmwtrtQ27BVQ,3638
@@ -75,8 +75,8 @@ sonusai/mixture/truth_functions/metrics.py,sha256=Mu6o4Hf-I0-f-dVA_egFBUvf1OBj5v
 sonusai/mixture/truth_functions/phoneme.py,sha256=PhSev7PNDOECcdjnCwiISDZlXQwAiOdk_hD0p3eoXN4,763
 sonusai/mixture/truth_functions/sed.py,sha256=bMYHLBNPfzo4K-22_iGNi2NwDAG82vNtlDioA8VqcOo,3750
 sonusai/mixture/truth_functions/target.py,sha256=06zNRu4aD7TReZiaq0HQgukqOrYr1sDgYhHCTIPV1Es,4913
-sonusai/mkwav.py,sha256=Za0Xdn7ixth3RaYDS7ODOpNJmxjfr9ZMZh0anJO6r4o,4191
-sonusai/onnx_predict.py,sha256=8ViupBIvbWExOHMxNsrpyElzAD0WQovGZoOXy7tnESk,15772
+sonusai/mkwav.py,sha256=CExhCtnCvWm2pOS0JW_1FL0Te63JC_WbgA78tS4GB1Q,4200
+sonusai/onnx_predict.py,sha256=w_gyvxWlDIxj0ySG3c1y8bMV7xlPb-ecVUtun_LInms,15781
 sonusai/queries/__init__.py,sha256=gB7mgKVg8nIIgH-M1Oivoxkc3TGieOlIFzRHMwBQmrY,277
 sonusai/queries/queries.py,sha256=HLbwbd7OSXKO-IH6LxKzpr98_vfNlNQXIKZSUvQ98lw,7702
 sonusai/speech/__init__.py,sha256=vqAymCBPjMUSM4OZKHTai6BYwXsOBlf_G_vOhELVf8I,133
@@ -131,7 +131,7 @@ sonusai/utils/tokenized_shell_vars.py,sha256=EDrrAgz5lJ0RBAjLcTJt1MeyjhbNZiqXkym
 sonusai/utils/write_audio.py,sha256=IHzrJoFtFcea_J6wo6QSiojRkgnNOzAEcg-z0rFV7nU,810
 sonusai/utils/yes_or_no.py,sha256=0h1okjXmDNbJp7rZJFR2V-HFU1GJDm3YFTUVmYExkOU,263
 sonusai/vars.py,sha256=m8pdgfR4A6A9TCGf_rok6jPAT5BgrEsYXTSISIh1nrI,1163
-sonusai-1.0.7.dist-info/METADATA,sha256=eyPTvxuqs2NwuNq2Rp5JsQOeCCZxol44M6EIWlxW3Ng,2652
-sonusai-1.0.7.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-sonusai-1.0.7.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
-sonusai-1.0.7.dist-info/RECORD,,
+sonusai-1.0.8.dist-info/METADATA,sha256=UABc8ZNaqTCnFNoOgmRokBRF9G7RI58MDP1B081075c,2652
+sonusai-1.0.8.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+sonusai-1.0.8.dist-info/entry_points.txt,sha256=zMNjEphEPO6B3cD1GNpit7z-yA9tUU5-j3W2v-UWstU,92
+sonusai-1.0.8.dist-info/RECORD,,