Improve log and webui
This commit is contained in:
@@ -61,9 +61,7 @@ def transcribe_files_with_hf_whisper(
|
||||
generate_kwargs: dict[str, Any] = {
|
||||
"language": language,
|
||||
"do_sample": False,
|
||||
"num_beams": 5,
|
||||
"early_stopping": True,
|
||||
"num_return_sequences": 5,
|
||||
"num_beams": num_beams,
|
||||
}
|
||||
if initial_prompt is not None:
|
||||
prompt_ids: torch.Tensor = processor.get_prompt_ids(
|
||||
@@ -72,6 +70,7 @@ def transcribe_files_with_hf_whisper(
|
||||
prompt_ids = prompt_ids.to(device)
|
||||
generate_kwargs["prompt_ids"] = prompt_ids
|
||||
|
||||
logger.info(f"generate_kwargs: {generate_kwargs}")
|
||||
pipe = pipeline(
|
||||
model=model_id,
|
||||
max_new_tokens=128,
|
||||
@@ -162,12 +161,12 @@ if __name__ == "__main__":
|
||||
else:
|
||||
raise ValueError(f"{language} is not supported.")
|
||||
|
||||
logger.info(
|
||||
f"Loading Whisper model ({args.model}) with compute_type={compute_type}"
|
||||
)
|
||||
if not args.use_hf_whisper:
|
||||
from faster_whisper import WhisperModel
|
||||
|
||||
logger.info(
|
||||
f"Loading Whisper model ({args.model}) with compute_type={compute_type}"
|
||||
)
|
||||
try:
|
||||
model = WhisperModel(args.model, device=device, compute_type=compute_type)
|
||||
except ValueError as e:
|
||||
@@ -185,6 +184,7 @@ if __name__ == "__main__":
|
||||
f.write(f"{wav_file.name}|{model_name}|{language_id}|{text}\n")
|
||||
else:
|
||||
model_id = f"openai/whisper-{args.model}"
|
||||
logger.info(f"Loading HF Whisper model ({model_id})")
|
||||
pbar = tqdm(total=len(wav_files), file=SAFE_STDOUT)
|
||||
results = transcribe_files_with_hf_whisper(
|
||||
audio_files=wav_files,
|
||||
|
||||
@@ -249,9 +249,9 @@ def create_dataset_app() -> gr.Blocks:
|
||||
outputs=[result2],
|
||||
)
|
||||
use_hf_whisper.change(
|
||||
lambda x: gr.update(visible=x),
|
||||
lambda x: (gr.update(visible=x), gr.update(visible=not x)),
|
||||
inputs=[use_hf_whisper],
|
||||
outputs=[batch_size],
|
||||
outputs=[batch_size, compute_type],
|
||||
)
|
||||
|
||||
return app
|
||||
|
||||
@@ -286,10 +286,6 @@ def load_styles_gr(model_name_a, model_name_b):
|
||||
|
||||
|
||||
initial_md = """
|
||||
# Style-Bert-VITS2 モデルマージツール
|
||||
|
||||
2つのStyle-Bert-VITS2モデルから、声質・話し方・話す速さを取り替えたり混ぜたりできます。
|
||||
|
||||
## 使い方
|
||||
|
||||
1. マージしたい2つのモデルを選択してください(`model_assets`フォルダの中から選ばれます)。
|
||||
@@ -343,7 +339,9 @@ def create_merge_app(model_holder: TTSModelHolder) -> gr.Blocks:
|
||||
initial_model_files = model_holder.model_files_dict[model_names[initial_id]]
|
||||
|
||||
with gr.Blocks(theme=GRADIO_THEME) as app:
|
||||
gr.Markdown(initial_md)
|
||||
gr.Markdown(
|
||||
"2つのStyle-Bert-VITS2モデルから、声質・話し方・話す速さを取り替えたり混ぜたりできます。"
|
||||
)
|
||||
with gr.Accordion(label="使い方", open=False):
|
||||
gr.Markdown(initial_md)
|
||||
with gr.Row():
|
||||
|
||||
Reference in New Issue
Block a user