-
Notifications
You must be signed in to change notification settings - Fork 913
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
mlx_whisper: add support for audio input from stdin #1012
Changes from 3 commits
bb5d7db
b6435dc
7b818c0
266f99a
bd6b08e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,6 +5,7 @@ | |
import traceback | ||
import warnings | ||
|
||
from . import audio | ||
from .tokenizer import LANGUAGES, TO_LANGUAGE_CODE | ||
from .transcribe import transcribe | ||
from .writers import get_writer | ||
|
@@ -27,15 +28,21 @@ def str2bool(string): | |
parser = argparse.ArgumentParser( | ||
formatter_class=argparse.ArgumentDefaultsHelpFormatter | ||
) | ||
parser.add_argument( | ||
"audio", nargs="+", type=str, help="Audio file(s) to transcribe" | ||
) | ||
|
||
parser.add_argument("audio", nargs="+", help="Audio file(s) to transcribe") | ||
|
||
parser.add_argument( | ||
"--model", | ||
default="mlx-community/whisper-tiny", | ||
type=str, | ||
help="The model directory or hugging face repo", | ||
) | ||
parser.add_argument( | ||
"--output-name", | ||
type=str, | ||
default="{basename}", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this defaults to pre-existing behavior, I would consider the |
||
help="logical name of transcription/translation output files, before --output-format extensions", | ||
) | ||
parser.add_argument( | ||
"--output-dir", | ||
"-o", | ||
|
@@ -200,9 +207,10 @@ def main(): | |
path_or_hf_repo: str = args.pop("model") | ||
output_dir: str = args.pop("output_dir") | ||
output_format: str = args.pop("output_format") | ||
output_name_template: str = args.pop("output_name") | ||
os.makedirs(output_dir, exist_ok=True) | ||
|
||
writer = get_writer(output_format, output_dir) | ||
writer = get_writer(output_format, output_dir, output_name_template) | ||
word_options = [ | ||
"highlight_words", | ||
"max_line_count", | ||
|
@@ -219,17 +227,22 @@ def main(): | |
warnings.warn("--max-line-count has no effect without --max-line-width") | ||
if writer_args["max_words_per_line"] and writer_args["max_line_width"]: | ||
warnings.warn("--max-words-per-line has no effect with --max-line-width") | ||
for audio_path in args.pop("audio"): | ||
|
||
for audio_obj in args.pop("audio"): | ||
if audio_obj == "-": | ||
# receive the contents from stdin rather than read a file | ||
audio_obj = audio.load_audio(from_stdin=True) | ||
|
||
try: | ||
result = transcribe( | ||
audio_path, | ||
audio_obj, | ||
path_or_hf_repo=path_or_hf_repo, | ||
**args, | ||
) | ||
writer(result, audio_path, **writer_args) | ||
writer(result, audio_obj, **writer_args) | ||
except Exception as e: | ||
traceback.print_exc() | ||
print(f"Skipping {audio_path} due to {type(e).__name__}: {str(e)}") | ||
print(f"Skipping {audio_obj} due to {type(e).__name__}: {str(e)}") | ||
|
||
|
||
if __name__ == "__main__": | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,8 @@ | ||
# Copyright © 2024 Apple Inc. | ||
|
||
import json | ||
import os | ||
import pathlib | ||
import re | ||
import sys | ||
import zlib | ||
from typing import Callable, List, Optional, TextIO | ||
|
||
|
||
|
@@ -39,19 +37,26 @@ def get_start(segments: List[dict]) -> Optional[float]: | |
class ResultWriter: | ||
extension: str | ||
|
||
def __init__(self, output_dir: str): | ||
def __init__(self, output_dir: str, output_name_template: str): | ||
self.output_dir = output_dir | ||
self.output_name_template = output_name_template | ||
|
||
def __call__( | ||
self, result: dict, audio_path: str, options: Optional[dict] = None, **kwargs | ||
self, result: dict, audio_obj: str, options: Optional[dict] = None, **kwargs | ||
): | ||
audio_basename = os.path.basename(audio_path) | ||
audio_basename = os.path.splitext(audio_basename)[0] | ||
output_path = os.path.join( | ||
self.output_dir, audio_basename + "." + self.extension | ||
if isinstance(audio_obj, (str, pathlib.Path)): | ||
basename = pathlib.Path(audio_obj).stem | ||
else: | ||
# mx.array, np.ndarray, etc | ||
basename = "content" | ||
|
||
output_basename = self.output_name_template.format(basename=basename) | ||
|
||
output_path = (pathlib.Path(self.output_dir) / output_basename).with_suffix( | ||
f".{self.extension}" | ||
) | ||
|
||
with open(output_path, "w", encoding="utf-8") as f: | ||
with output_path.open("wt", encoding="utf-8") as f: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. refactored using more "modern" Pathlib, see https://docs.astral.sh/ruff/rules/builtin-open/ |
||
self.write_result(result, file=f, options=options, **kwargs) | ||
|
||
def write_result( | ||
|
@@ -248,7 +253,7 @@ def write_result( | |
|
||
|
||
def get_writer( | ||
output_format: str, output_dir: str | ||
output_format: str, output_dir: str, output_name_template: str | ||
) -> Callable[[dict, TextIO, dict], None]: | ||
writers = { | ||
"txt": WriteTXT, | ||
|
@@ -259,7 +264,9 @@ def get_writer( | |
} | ||
|
||
if output_format == "all": | ||
all_writers = [writer(output_dir) for writer in writers.values()] | ||
all_writers = [ | ||
writer(output_dir, output_name_template) for writer in writers.values() | ||
] | ||
|
||
def write_all( | ||
result: dict, file: TextIO, options: Optional[dict] = None, **kwargs | ||
|
@@ -269,4 +276,4 @@ def write_all( | |
|
||
return write_all | ||
|
||
return writers[output_format](output_dir) | ||
return writers[output_format](output_dir, output_name_template) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
#!/bin/zsh -e | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is a bare bones shell test harness to add coverage for now, without involving this PR in choosing a higher level shell test runner. |
||
|
||
set -o err_exit | ||
|
||
TEST_AUDIO="mlx_whisper/assets/ls_test.flac" | ||
TEST_OUTPUT_DIR=$(mktemp -d -t mlx_whisper_cli_test) | ||
|
||
# the control output - cli called with audio position arg | ||
# expected output file name is ls_test.json | ||
TEST_OUTPUT_NAME_FOR_ALL="--output-name arg is used for all output formats" | ||
mlx_whisper "$TEST_AUDIO" \ | ||
--output-dir "$TEST_OUTPUT_DIR" \ | ||
--output-format all \ | ||
--output-name '{basename}_transcribed' \ | ||
--temperature 0 \ | ||
--verbose=False | ||
if /bin/ls ${TEST_OUTPUT_DIR}/ls_test_transcribed.{json,srt,tsv,txt,vtt} > /dev/null; then | ||
echo "[PASS] $TEST_OUTPUT_NAME_FOR_ALL" | ||
else | ||
echo "[FAIL] $TEST_OUTPUT_NAME_FOR_ALL" | ||
fi | ||
|
||
|
||
TEST_OUTPUT_NAME_TEMPLATE="testing the output name template usage scenario" | ||
for test_val in $(seq 10 10 60); do | ||
mlx_whisper "$TEST_AUDIO" \ | ||
--output-name "{basename}_mwpl_${test_val}" \ | ||
--output-dir "$TEST_OUTPUT_DIR" \ | ||
--output-format srt \ | ||
--max-words-per-line $test_val \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this I think can be useful for research, run a variation of transcriptions by adjusting knobs, then name those outputs appropriately |
||
--word-timestamps True \ | ||
--verbose=False | ||
TEST_DESC="testing output name template while varying --max-words-per-line=${test_val}" | ||
if /bin/ls $TEST_OUTPUT_DIR/ls_test_mwpl_${test_val}.srt > /dev/null; then | ||
echo "[PASS] $TEST_DESC" | ||
else | ||
echo "[FAIL] $TEST_DESC" | ||
fi | ||
done | ||
|
||
|
||
TEST_STDIN_1="mlx_whisper produces identical output whether provided audio arg or stdin of same content" | ||
/bin/cat "$TEST_AUDIO" | mlx_whisper - \ | ||
--output-dir "$TEST_OUTPUT_DIR" \ | ||
--output-format json \ | ||
--temperature 0 \ | ||
--verbose=False | ||
if diff "${TEST_OUTPUT_DIR}/content.json" "${TEST_OUTPUT_DIR}/ls_test_transcribed.json"; then | ||
echo "[PASS] $TEST_STDIN_1" | ||
else | ||
echo "[FAIL] $TEST_STDIN_1" | ||
echo "Check unexpected output in ${TEST_OUTPUT_DIR}" | ||
fi | ||
|
||
TEST_STDIN_2="mlx_whisper produces identical output when stdin comes via: cmd < file"、 | ||
mlx_whisper - \ | ||
--output-name '{basename}_transcribed' \ | ||
--output-dir "$TEST_OUTPUT_DIR" \ | ||
--output-format tsv \ | ||
--temperature 0 \ | ||
--verbose=False < "$TEST_AUDIO" | ||
if diff "${TEST_OUTPUT_DIR}/content_transcribed.tsv" "${TEST_OUTPUT_DIR}/ls_test_transcribed.tsv"; then | ||
echo "[PASS] $TEST_STDIN_2" | ||
else | ||
echo "[FAIL] $TEST_STDIN_2" | ||
echo "Check unexpected output in ${TEST_OUTPUT_DIR}" | ||
fi | ||
|
||
echo "Outputs can be verified in ${TEST_OUTPUT_DIR}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my
black==24.4.2
insists on re-formatting this line which didn't change