sonusai 0.16.0__tar.gz → 0.16.1__tar.gz

{sonusai-0.16.0 → sonusai-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sonusai
-Version: 0.16.0
+Version: 0.16.1
 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.16.0 → sonusai-0.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sonusai"
-version = "0.16.0"
+version = "0.16.1"
 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>"]
@@ -40,10 +40,13 @@ torchaudio = "~2.2"
 tqdm = "^4.66.1"
 
 [tool.poetry.group.dev.dependencies]
+einops = "^0.8.0"
 icecream = "^2.1.3"
 mypy = "^1.6.0"
 mypy-extensions = "^1.0.0"
 pytest = "^8.1.1"
+sonusai-asr-cloud = "^0.1.0"
+sonusai-torchl = "^0.1.0"
 types-pyyaml = "^6.0.12.12"
 types-requests = "^2.31.0.8"
 

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/__init__.py

@@ -19,6 +19,7 @@ commands_doc = """
    onnx_predict                 Run ONNX predict on a trained model
    plot                         Plot mixture data
    post_spenh_targetf           Run post-processing for speech enhancement targetf data
+   summarize_metric_spenh       Summarize speech enhancement and analysis results
    tplot                        Plot truth data
    vars                         List custom SonusAI variables
 """

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/audiofe.py

@@ -24,6 +24,10 @@ audiofe_capture_<TIMESTAMP>.wav.
 If a model is specified, run prediction on audio data from this model. Then compute the inverse transform of the
 prediction result and save to audiofe_predict_<TIMESTAMP>.wav.
 
+Also, if a model is specified, save plots of the capture data (time-domain signal and feature) to
+audiofe_capture_<TIMESTAMP>.png and predict data (time-domain signal and feature) to
+audiofe_predict_<TIMESTAMP>.png.
+
 If an ASR is specified, run ASR on the captured audio and print the results. In addition, if a model was also specified,
 run ASR on the predict audio and print the results.
 
@@ -31,40 +35,32 @@ If the debug option is enabled, write capture audio, feature, reconstruct audio,
 audiofe_<TIMESTAMP>.h5.
 
 """
-from os.path import exists
-from select import select
-from sys import stdin
+import signal
 
-import h5py
 import numpy as np
-import pyaudio
-import torch
-from docopt import docopt
-from docopt import printable_usage
-
-import sonusai
-from sonusai import create_file_handler
-from sonusai import initial_log_messages
-from sonusai import logger
-from sonusai import update_console_handler
+
 from sonusai.mixture import AudioT
-from sonusai.mixture import CHANNEL_COUNT
-from sonusai.mixture import SAMPLE_RATE
-from sonusai.mixture import get_audio_from_feature
-from sonusai.mixture import get_feature_from_audio
-from sonusai.mixture import read_audio
-from sonusai.utils import calc_asr
-from sonusai.utils import create_timestamp
-from sonusai.utils import get_input_device_index_by_name
-from sonusai.utils import get_input_devices
-from sonusai.utils import load_torchl_ckpt_model
-from sonusai.utils import trim_docstring
-from sonusai.utils import write_wav
+
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
 
 
 def main() -> None:
+    from docopt import docopt
+
+    import sonusai
+    from sonusai.utils import trim_docstring
+
     args = docopt(trim_docstring(__doc__), version=sonusai.__version__, options_first=True)
-    ts = create_timestamp()
 
     verbose = args['--verbose']
     length = float(args['--length'])
@@ -76,8 +72,34 @@ def main() -> None:
     debug = args['--debug']
     show = args['--show']
 
-    capture_name = f'audiofe_capture_{ts}.wav'
-    predict_name = f'audiofe_predict_{ts}.wav'
+    from os.path import exists
+
+    import h5py
+    import pyaudio
+    import torch
+    from docopt import printable_usage
+    from sonusai_torchl.utils import load_torchl_ckpt_model
+
+    from sonusai import create_file_handler
+    from sonusai import initial_log_messages
+    from sonusai import logger
+    from sonusai import update_console_handler
+    from sonusai.mixture import SAMPLE_RATE
+    from sonusai.mixture import get_audio_from_feature
+    from sonusai.mixture import get_feature_from_audio
+    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 write_wav
+
+    ts = create_timestamp()
+    capture_name = f'audiofe_capture_{ts}'
+    capture_wav = capture_name + '.wav'
+    capture_png = capture_name + '.png'
+    predict_name = f'audiofe_predict_{ts}'
+    predict_wav = predict_name + '.wav'
+    predict_png = predict_name + '.png'
     h5_name = f'audiofe_{ts}.h5'
 
     if model_name is not None and ckpt_name is None:
@@ -108,9 +130,9 @@ def main() -> None:
             logger.exception(e)
             return
 
-    write_wav(capture_name, capture_audio, SAMPLE_RATE)
+    write_wav(capture_wav, capture_audio, SAMPLE_RATE)
     logger.info('')
-    logger.info(f'Wrote capture audio with shape {capture_audio.shape} to {capture_name}')
+    logger.info(f'Wrote capture audio with shape {capture_audio.shape} to {capture_wav}')
     if debug:
         with h5py.File(h5_name, 'a') as f:
             if 'capture_audio' in f:
@@ -127,6 +149,9 @@ def main() -> None:
         model.eval()
 
         feature = get_feature_from_audio(audio=capture_audio, feature_mode=model.hparams.feature)
+        save_figure(capture_png, capture_audio, feature)
+        logger.info(f'Wrote capture plots to {capture_png}')
+
         if debug:
             with h5py.File(h5_name, 'a') as f:
                 if 'feature' in f:
@@ -134,20 +159,6 @@ def main() -> None:
                 f.create_dataset('feature', data=feature)
             logger.info(f'Wrote feature with shape {feature.shape} to {h5_name}')
 
-        # if debug:
-        #     reconstruct_name = f'audiofe_reconstruct_{ts}.wav'
-        #     reconstruct_audio = get_audio_from_feature(feature=feature, feature_mode=model.hparams.feature)
-        #     samples = min(len(capture_audio), len(reconstruct_audio))
-        #     max_err = np.max(np.abs(capture_audio[:samples] - reconstruct_audio[:samples]))
-        #     logger.info(f'Maximum error between capture and reconstruct: {max_err}')
-        #     write_wav(reconstruct_name, reconstruct_audio, SAMPLE_RATE)
-        #     logger.info(f'Wrote reconstruct audio with shape {reconstruct_audio.shape} to {reconstruct_name}')
-        #     with h5py.File(h5_name, 'a') as f:
-        #         if 'reconstruct_audio' in f:
-        #             del f['reconstruct_audio']
-        #         f.create_dataset('reconstruct_audio', data=reconstruct_audio)
-        #     logger.info(f'Wrote reconstruct audio with shape {reconstruct_audio.shape} to {h5_name}')
-
         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()
@@ -159,8 +170,8 @@ def main() -> None:
             logger.info(f'Wrote predict with shape {predict.shape} to {h5_name}')
 
         predict_audio = get_audio_from_feature(feature=predict, feature_mode=model.hparams.feature)
-        write_wav(predict_name, predict_audio, SAMPLE_RATE)
-        logger.info(f'Wrote predict audio with shape {predict_audio.shape} to {predict_name}')
+        write_wav(predict_wav, predict_audio, SAMPLE_RATE)
+        logger.info(f'Wrote predict audio with shape {predict_audio.shape} to {predict_wav}')
         if debug:
             with h5py.File(h5_name, 'a') as f:
                 if 'predict_audio' in f:
@@ -168,12 +179,26 @@ def main() -> None:
                 f.create_dataset('predict_audio', data=predict_audio)
             logger.info(f'Wrote predict audio with shape {predict_audio.shape} to {h5_name}')
 
+        save_figure(predict_png, predict_audio, predict)
+        logger.info(f'Wrote predict plots to {predict_png}')
+
         if asr_name is not None:
             predict_asr = calc_asr(predict_audio, engine=asr_name, whisper_model_name=whisper_name).text
             logger.info(f'Predict audio ASR: {predict_asr}')
 
 
 def get_frames_from_device(input_name: str | None, length: float, chunk: int = 1024) -> AudioT:
+    from select import select
+    from sys import stdin
+
+    import pyaudio
+
+    from sonusai import logger
+    from sonusai.mixture import CHANNEL_COUNT
+    from sonusai.mixture import SAMPLE_RATE
+    from sonusai.utils import get_input_device_index_by_name
+    from sonusai.utils import get_input_devices
+
     p = pyaudio.PyAudio()
 
     input_devices = get_input_devices(p)
@@ -224,6 +249,10 @@ def get_frames_from_device(input_name: str | None, length: float, chunk: int = 1
 
 
 def get_frames_from_file(input_name: str, length: float) -> AudioT:
+    from sonusai import logger
+    from sonusai.mixture import SAMPLE_RATE
+    from sonusai.mixture import read_audio
+
     logger.info(f'Capturing from {input_name}')
     frames = read_audio(input_name)
     if length != -1:
@@ -233,5 +262,37 @@ def get_frames_from_file(input_name: str, length: float) -> AudioT:
     return frames
 
 
+def save_figure(name: str, audio: np.ndarray, feature: np.ndarray) -> None:
+    import matplotlib.pyplot as plt
+    from scipy.interpolate import CubicSpline
+
+    from sonusai.mixture import SAMPLE_RATE
+    from sonusai.utils import unstack_complex
+
+    spectrum = 20 * np.log(np.abs(np.squeeze(unstack_complex(feature)).transpose()))
+    frames = spectrum.shape[1]
+    samples = (len(audio) // frames) * frames
+    length_in_s = samples / SAMPLE_RATE
+    interp = samples // frames
+
+    ts = np.arange(0.0, length_in_s, interp / SAMPLE_RATE)
+    t = np.arange(0.0, length_in_s, 1 / SAMPLE_RATE)
+
+    spectrum = CubicSpline(ts, spectrum, axis=-1)(t)
+
+    fig, (ax1, ax2) = plt.subplots(nrows=2)
+    ax1.set_title(name)
+    ax1.plot(t, audio[:samples])
+    ax1.set_ylabel('Signal')
+    ax1.set_xlim(0, length_in_s)
+    ax1.set_ylim(-1, 1)
+
+    ax2.imshow(spectrum, origin='lower', aspect='auto')
+    ax2.set_xticks([])
+    ax2.set_ylabel('Feature')
+
+    plt.savefig(name, dpi=300)
+
+
 if __name__ == '__main__':
     main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/calc_metric_spenh.py

@@ -60,6 +60,7 @@ Metric and extraction data are written into prediction location PLOC as separate
 Inputs:
 
 """
+import signal
 from dataclasses import dataclass
 from typing import Optional
 
@@ -67,14 +68,24 @@ import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
-
-from sonusai import logger
 from sonusai.mixture import AudioF
 from sonusai.mixture import AudioT
 from sonusai.mixture import Feature
 from sonusai.mixture import MixtureDatabase
 from sonusai.mixture import Predict
 
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
 matplotlib.use('SVG')
 
 
@@ -1326,8 +1337,4 @@ def main():
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        exit()
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/genft.py

@@ -23,14 +23,26 @@ Outputs the following to the mixture database directory:
     genft.log
 
 """
+import signal
 from dataclasses import dataclass
 
-from sonusai import logger
 from sonusai.mixture import GenFTData
 from sonusai.mixture import GeneralizedIDs
 from sonusai.mixture import MixtureDatabase
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 @dataclass
 class MPGlobal:
     mixdb: MixtureDatabase = None
@@ -123,6 +135,7 @@ def main() -> None:
 
     from sonusai import create_file_handler
     from sonusai import initial_log_messages
+    from sonusai import logger
     from sonusai import update_console_handler
     from sonusai.mixture import check_audio_files_exist
     from sonusai.utils import human_readable_size
@@ -177,8 +190,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/genmix.py

@@ -27,14 +27,26 @@ Outputs the following to the mixture database directory:
     <id>.txt
     genmix.log
 """
+import signal
 from dataclasses import dataclass
 
-from sonusai import logger
 from sonusai.mixture import GenMixData
 from sonusai.mixture import GeneralizedIDs
 from sonusai.mixture import MixtureDatabase
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 @dataclass
 class MPGlobal:
     mixdb: MixtureDatabase = None
@@ -210,8 +222,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/genmixdb.py

@@ -112,13 +112,25 @@ targets:
 will find all .wav files in the specified directories and process them as targets.
 
 """
+import signal
 from dataclasses import dataclass
 
-from sonusai import logger
 from sonusai.mixture import Mixture
 from sonusai.mixture import MixtureDatabase
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 @dataclass
 class MPGlobal:
     mixdb: MixtureDatabase = None
@@ -509,8 +521,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/gentcst.py

@@ -44,10 +44,21 @@ Outputs:
     gentcst.log
 
 """
+import signal
 from dataclasses import dataclass
 from typing import Optional
 
-from sonusai import logger
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
 
 CONFIG_FILE = 'config.yml'
 
@@ -621,8 +632,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/lsdb.py

@@ -15,11 +15,25 @@ Inputs:
     LOC     A SonusAI mixture database directory.
 
 """
+import signal
+
 from sonusai import logger
 from sonusai.mixture import GeneralizedIDs
 from sonusai.mixture import MixtureDatabase
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 def lsdb(mixdb: MixtureDatabase,
          mixids: GeneralizedIDs = None,
          truth_index: int = None,
@@ -142,8 +156,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/mkmanifest.py

@@ -46,7 +46,19 @@ Example usage for LibriSpeech:
   sonusai mkmanifest -mlibrispeech -eADAT -oasr_manifest.json --include='*.flac' train-clean-100
   sonusai mkmanifest -m mcgill-speech -e ADAT -o asr_manifest_16k.json 16k-LP7/
 """
-from sonusai import logger
+import signal
+
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
 
 VALID_METHOD = ['librispeech', 'vctk_noisy_speech', 'mcgill-speech']
 
@@ -194,8 +206,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/mkwav.py

@@ -23,13 +23,25 @@ Outputs the following to the mixture database directory:
     mkwav.log
 
 """
+import signal
 from dataclasses import dataclass
 
-from sonusai import logger
 from sonusai.mixture import AudioT
 from sonusai.mixture import MixtureDatabase
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 @dataclass
 class MPGlobal:
     mixdb: MixtureDatabase = None
@@ -120,6 +132,7 @@ def main() -> None:
     import sonusai
     from sonusai import create_file_handler
     from sonusai import initial_log_messages
+    from sonusai import logger
     from sonusai import update_console_handler
     from sonusai.mixture import check_audio_files_exist
     from sonusai.utils import pp_tqdm_imap
@@ -164,8 +177,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/onnx_predict.py

@@ -29,12 +29,25 @@ Outputs the following to opredict-<TIMESTAMP> directory:
 
 """
 
-from sonusai import logger
+import signal
+
 from sonusai.mixture import Feature
 from sonusai.mixture import Predict
 from sonusai.utils import SonusAIMetaData
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 def main() -> None:
     from docopt import docopt
 
@@ -60,6 +73,7 @@ def main() -> None:
 
     from sonusai import create_file_handler
     from sonusai import initial_log_messages
+    from sonusai import logger
     from sonusai import update_console_handler
     from sonusai.mixture import MixtureDatabase
     from sonusai.mixture import get_feature_from_audio
@@ -233,8 +247,4 @@ def pad_and_predict(feature: Feature,
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/plot.py

@@ -41,16 +41,29 @@ Outputs:
 
 """
 
+import signal
+
 import numpy as np
 from matplotlib import pyplot as plt
 
-from sonusai import logger
 from sonusai.mixture import AudioT
 from sonusai.mixture import Feature
 from sonusai.mixture import Predict
 from sonusai.mixture import Truth
 
 
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
 def spec_plot(mixture: AudioT,
               feature: Feature,
               predict: Predict = None,
@@ -264,6 +277,7 @@ def main() -> None:
     from sonusai import SonusAIError
     from sonusai import create_file_handler
     from sonusai import initial_log_messages
+    from sonusai import logger
     from sonusai import update_console_handler
     from sonusai.mixture import MixtureDatabase
     from sonusai.mixture import FeatureGeneratorConfig
@@ -457,8 +471,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/post_spenh_targetf.py

@@ -20,9 +20,20 @@ Outputs the following to post_spenh_targetf-<TIMESTAMP> directory:
     post_spenh_targetf.log
 
 """
+import signal
 from dataclasses import dataclass
 
-from sonusai import logger
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
 
 
 @dataclass
@@ -146,8 +157,4 @@ def _process(file: str) -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        exit()
+    main()

sonusai-0.16.1/sonusai/summarize_metric_spenh.py

@@ -0,0 +1,71 @@
+"""sonusai summarize_metric_spenh
+
+usage: summarize_metric_spenh [-hr] [-s SORT] LOC
+
+options:
+    -h, --help
+    -s SORT, --sort SORT            Sort by SORT column. [default: MIXID]
+    -r, --reverse                   Reverse sort order.
+
+Summarize speech enhancement metrics results using data generated by SonusAI calc_metric_spenh.
+
+Inputs:
+    LOC         A SonusAI calc_metric_spenh results directory.
+
+"""
+import signal
+
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
+
+
+def summarize_metric_spenh(location: str, by: str = 'MIXID', reverse: bool = False) -> str:
+    import glob
+
+    import pandas as pd
+
+    files = sorted(glob.glob(location + '/*_metric_spenh.txt'))
+    need_header = True
+    header = ['MIXID']
+    data = []
+    for file in files:
+        with open(file, 'r') as f:
+            for i, line in enumerate(f):
+                if i == 1 and need_header:
+                    need_header = False
+                    header.extend(line.strip().split())
+                elif i == 2:
+                    data.append(line.strip().split())
+                    break
+
+    df = pd.DataFrame(data, columns=header)
+    df[header[0:-2]] = df[header[0:-2]].apply(pd.to_numeric, errors='coerce')
+    return df.sort_values(by=by, ascending=not reverse).to_string(index=False)
+
+
+def main():
+    from docopt import docopt
+
+    import sonusai
+    from sonusai.utils import trim_docstring
+
+    args = docopt(trim_docstring(__doc__), version=sonusai.__version__, options_first=True)
+
+    by = args['--sort']
+    reverse = args['--reverse']
+    location = args['LOC']
+
+    print(summarize_metric_spenh(location, by, reverse))
+
+
+if __name__ == '__main__':
+    main()

{sonusai-0.16.0 → sonusai-0.16.1}/sonusai/tplot.py

@@ -41,7 +41,19 @@ options:
    A multi-page plot TARGET-tplot.pdf or CONFIG-tplot.pdf is generated.
 
 """
-from sonusai import logger
+import signal
+
+
+def signal_handler(_sig, _frame):
+    import sys
+
+    from sonusai import logger
+
+    logger.info('Canceled due to keyboard interrupt')
+    sys.exit(1)
+
+
+signal.signal(signal.SIGINT, signal_handler)
 
 
 # TODO: re-work for modern mixdb API
@@ -328,8 +340,4 @@ def main() -> None:
 
 
 if __name__ == '__main__':
-    try:
-        main()
-    except KeyboardInterrupt:
-        logger.info('Canceled due to keyboard interrupt')
-        raise SystemExit(0)
+    main()