sonusai 0.17.0__tar.gz → 0.17.2__tar.gz

{sonusai-0.17.0 → sonusai-0.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sonusai
-Version: 0.17.0
+Version: 0.17.2
 Summary: Framework for building deep neural network models for sound, speech, and voice AI
 Home-page: https://aaware.com
 License: GPL-3.0-only
@@ -26,6 +26,7 @@ Requires-Dist: onnxruntime (>=1.16.1,<2.0.0)
 Requires-Dist: paho-mqtt (>=2.0.0,<3.0.0)
 Requires-Dist: pandas (>=2.1.1,<3.0.0)
 Requires-Dist: pesq (>=0.0.4,<0.0.5)
+Requires-Dist: praatio (>=6.2.0,<7.0.0)
 Requires-Dist: pyaaware (>=1.5.7,<2.0.0)
 Requires-Dist: pyaudio (>=0.2.14,<0.3.0)
 Requires-Dist: pydub (>=0.25.1,<0.26.0)

{sonusai-0.17.0 → sonusai-0.17.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sonusai"
-version = "0.17.0"
+version = "0.17.2"
 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>"]
@@ -26,6 +26,7 @@ onnxruntime = "^1.16.1"
 paho-mqtt = "^2.0.0"
 pandas = "^2.1.1"
 pesq = "^0.0.4"
+praatio = "^6.2.0"
 pyaaware = "^1.5.7"
 pyaudio = "^0.2.14"
 pydub = "^0.25.1"

{sonusai-0.17.0 → sonusai-0.17.2}/sonusai/audiofe.py

@@ -1,16 +1,15 @@
 """sonusai audiofe
 
-usage: audiofe [-hvds] [--version] [-i INPUT] [-l LENGTH] [-m MODEL] [-k CKPT] [-a ASR] [-w WMODEL]
+usage: audiofe [-hvds] [--version] [-i INPUT] [-l LENGTH] [-m MODEL] [-a ASR] [-w WMODEL]
 
 options:
     -h, --help
     -v, --verbose                   Be verbose.
     -d, --debug                     Write debug data to H5 file.
-    -s, --show                      Show a list of available audio inputs.
+    -s, --show                      Display a list of available audio inputs.
     -i INPUT, --input INPUT         Input audio.
     -l LENGTH, --length LENGTH      Length of audio in seconds. [default: -1].
-    -m MODEL, --model MODEL         PL model .py file path.
-    -k CKPT, --checkpoint CKPT      PL checkpoint file with weights.
+    -m MODEL, --model MODEL         ONNX model.
     -a ASR, --asr ASR               ASR method to use.
     -w WMODEL, --whisper WMODEL     Model used in whisper, aixplain_whisper and faster_whisper methods. [default: tiny].
 
@@ -66,7 +65,6 @@ def main() -> None:
     length = float(args['--length'])
     input_name = args['--input']
     model_name = args['--model']
-    ckpt_name = args['--checkpoint']
     asr_name = args['--asr']
     whisper_name = args['--whisper']
     debug = args['--debug']
@@ -76,10 +74,6 @@ def main() -> None:
 
     import h5py
     import pyaudio
-    import torch
-    from docopt import printable_usage
-    from sonusai_torchl.utils import load_torchl_ckpt_model
-    from sonusai.utils.onnx_utils import load_ort_session
 
     from sonusai import create_file_handler
     from sonusai import initial_log_messages
@@ -91,7 +85,7 @@ def main() -> None:
     from sonusai.utils import calc_asr
     from sonusai.utils import create_timestamp
     from sonusai.utils import get_input_devices
-    from sonusai.utils import trim_docstring
+    from sonusai.utils import load_ort_session
     from sonusai.utils import write_wav
 
     ts = create_timestamp()
@@ -103,33 +97,6 @@ def main() -> None:
     predict_png = predict_name + '.png'
     h5_name = f'audiofe_{ts}.h5'
 
-    if model_name is not None:
-        from os.path import splitext
-        if splitext(model_name)[1] == '.onnx':
-            session, options, model_root, hparams, sess_inputs, sess_outputs = load_ort_session(model_name)
-            if hparams is None:
-                logger.error(f'Error: onnx model does not have required SonusAI hyper-parameters, can not proceed.')
-                raise SystemExit(1)
-            feature_mode = hparams["feature"]
-            model_is_onnx = True
-            in0name = sess_inputs[0].name
-            in0type = sess_inputs[0].type
-            out0name = sess_outputs[0].name
-            out_names = [n.name for n in session.get_outputs()]
-            if in0type.find('float16') != -1:
-                model_is_fp16 = True
-                logger.info(f'Detected input of float16, converting all feature inputs to that type.')
-            else:
-                model_is_fp16 = False
-        else:
-            model_is_onnx = False
-            if ckpt_name is None:
-                print(printable_usage(trim_docstring(__doc__)))
-                exit(1)
-            model = load_torchl_ckpt_model(model_name=model_name, ckpt_name=ckpt_name)
-            feature_mode = model.hparams.feature
-            model.eval()
-
     # Setup logging file
     create_file_handler('audiofe.log')
     update_console_handler(verbose)
@@ -153,7 +120,7 @@ def main() -> None:
         except ValueError as e:
             logger.exception(e)
             return
-        # Only write if capture, not for file input
+        # Only write if capture from device, not for file input
         write_wav(capture_wav, capture_audio, SAMPLE_RATE)
         logger.info('')
         logger.info(f'Wrote capture audio with shape {capture_audio.shape} to {capture_wav}')
@@ -171,7 +138,17 @@ def main() -> None:
         logger.info(f'Capture audio ASR: {capture_asr}')
 
     if model_name is not None:
-        feature = get_feature_from_audio(audio=capture_audio, feature_mode=feature_mode)  #frames x stride x feat_params
+        session, options, model_root, hparams, sess_inputs, sess_outputs = load_ort_session(model_name)
+        if hparams is None:
+            logger.error(f'Error: ONNX model does not have required SonusAI hyperparameters, cannot proceed.')
+            raise SystemExit(1)
+        feature_mode = hparams.feature
+        in0name = sess_inputs[0].name
+        in0type = sess_inputs[0].type
+        out_names = [n.name for n in session.get_outputs()]
+
+        # frames x stride x feat_params
+        feature = get_feature_from_audio(audio=capture_audio, feature_mode=feature_mode)
         save_figure(capture_png, capture_audio, feature)
         logger.info(f'Wrote capture plots to {capture_png}')
 
@@ -182,19 +159,13 @@ def main() -> None:
                 f.create_dataset('feature', data=feature)
             logger.info(f'Wrote feature with shape {feature.shape} to {h5_name}')
 
-        if model_is_onnx:
-            # run ort session, wants i.e. batch x tsteps x feat_params, outputs numpy BxTxFP or BxFP
-            # Note full reshape not needed here since we assume speech enhanement type model, so a transpose suffices
-            if model_is_fp16:
-                feature = np.float16(feature)
-            # run inference, ort session wants i.e. batch x tsteps x feat_params, outputs numpy BxTxFP or BxFP
-            predict = np.transpose(session.run(out_names, {in0name: np.transpose(feature,(1,0,2))})[0],(1,0,2))
-        else:
-            with torch.no_grad():
-                # model wants batch x timesteps x feature_parameters
-                predict = model(torch.tensor(feature).permute((1, 0, 2))).permute(1, 0, 2).numpy()
-
+        if in0type.find('float16') != -1:
+            logger.info(f'Detected input of float16, converting all feature inputs to that type.')
+            feature = np.float16(feature)  # type: ignore
 
+        # Run inference, ort session wants batch x timesteps x feat_params, outputs numpy BxTxFP or BxFP
+        # Note full reshape not needed here since we assume speech enhancement type model, so a transpose suffices
+        predict = np.transpose(session.run(out_names, {in0name: np.transpose(feature, (1, 0, 2))})[0], (1, 0, 2))
 
         if debug:
             with h5py.File(h5_name, 'a') as f: