Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Speech To Speech
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mirrored_repos
MachineLearning
huggingface
Speech To Speech
Commits
669bdbf9
Commit
669bdbf9
authored
6 months ago
by
Andres Marafioti
Browse files
Options
Downloads
Patches
Plain Diff
catch a few exceptions from melo
parent
3fff1d1d
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
STT/whisper_stt_handler.py
+1
-4
1 addition, 4 deletions
STT/whisper_stt_handler.py
TTS/melo_handler.py
+26
-9
26 additions, 9 deletions
TTS/melo_handler.py
s2s_pipeline.py
+0
-1
0 additions, 1 deletion
s2s_pipeline.py
with
27 additions
and
14 deletions
STT/whisper_stt_handler.py
+
1
−
4
View file @
669bdbf9
...
...
@@ -8,7 +8,6 @@ import torch
from
baseHandler
import
BaseHandler
from
rich.console
import
Console
import
logging
from
shared_variables
import
current_language
logger
=
logging
.
getLogger
(
__name__
)
console
=
Console
()
...
...
@@ -109,10 +108,8 @@ class WhisperSTTHandler(BaseHandler):
)[
0
]
language_id
=
self
.
processor
.
tokenizer
.
decode
(
pred_ids
[
0
,
1
])
print
(
"
WHISPER curr lang
"
,
language_id
)
logger
.
debug
(
"
finished whisper inference
"
)
console
.
print
(
f
"
[yellow]USER:
{
pred_text
}
"
)
console
.
print
(
f
"
[red]
Language ID Whisper:
{
language_id
}
"
)
logger
.
debug
(
f
"
Language ID Whisper:
{
language_id
}
"
)
yield
(
pred_text
,
language_id
)
This diff is collapsed.
Click to expand it.
TTS/melo_handler.py
+
26
−
9
View file @
669bdbf9
...
...
@@ -5,7 +5,6 @@ import librosa
import
numpy
as
np
from
rich.console
import
Console
import
torch
from
shared_variables
import
current_language
logger
=
logging
.
getLogger
(
__name__
)
...
...
@@ -42,9 +41,15 @@ class MeloTTSHandler(BaseHandler):
):
self
.
should_listen
=
should_listen
self
.
device
=
device
self
.
language
=
"
<|
"
+
language
+
"
|>
"
# 'Tokenize' the language code to do less operations
self
.
model
=
TTS
(
language
=
WHISPER_LANGUAGE_TO_MELO_LANGUAGE
[
self
.
language
],
device
=
device
)
self
.
speaker_id
=
self
.
model
.
hps
.
data
.
spk2id
[
WHISPER_LANGUAGE_TO_MELO_SPEAKER
[
"
<|
"
+
speaker_to_id
+
"
|>
"
]]
self
.
language
=
(
"
<|
"
+
language
+
"
|>
"
)
# 'Tokenize' the language code to do less operations
self
.
model
=
TTS
(
language
=
WHISPER_LANGUAGE_TO_MELO_LANGUAGE
[
self
.
language
],
device
=
device
)
self
.
speaker_id
=
self
.
model
.
hps
.
data
.
spk2id
[
WHISPER_LANGUAGE_TO_MELO_SPEAKER
[
"
<|
"
+
speaker_to_id
+
"
|>
"
]
]
self
.
blocksize
=
blocksize
self
.
warmup
()
...
...
@@ -56,18 +61,24 @@ class MeloTTSHandler(BaseHandler):
language_id
=
None
if
isinstance
(
llm_sentence
,
tuple
):
print
(
"
llm sentence is tuple!
"
)
llm_sentence
,
language_id
=
llm_sentence
console
.
print
(
f
"
[green]ASSISTANT:
{
llm_sentence
}
"
)
if
language_id
is
not
None
and
self
.
language
!=
language_id
:
try
:
self
.
model
=
TTS
(
language
=
WHISPER_LANGUAGE_TO_MELO_LANGUAGE
[
language_id
],
device
=
self
.
device
)
self
.
speaker_id
=
self
.
model
.
hps
.
data
.
spk2id
[
WHISPER_LANGUAGE_TO_MELO_SPEAKER
[
language_id
]]
self
.
model
=
TTS
(
language
=
WHISPER_LANGUAGE_TO_MELO_LANGUAGE
[
language_id
],
device
=
self
.
device
,
)
self
.
speaker_id
=
self
.
model
.
hps
.
data
.
spk2id
[
WHISPER_LANGUAGE_TO_MELO_SPEAKER
[
language_id
]
]
self
.
language
=
language_id
except
KeyError
:
console
.
print
(
f
"
[red]Language
{
language_id
}
not supported by Melo. Using
{
self
.
language
}
instead.
"
)
console
.
print
(
f
"
[red]Language
{
language_id
}
not supported by Melo. Using
{
self
.
language
}
instead.
"
)
if
self
.
device
==
"
mps
"
:
import
time
...
...
@@ -79,7 +90,13 @@ class MeloTTSHandler(BaseHandler):
time
.
time
()
-
start
)
# Removing this line makes it fail more often. I'm looking into it.
audio_chunk
=
self
.
model
.
tts_to_file
(
llm_sentence
,
self
.
speaker_id
,
quiet
=
True
)
try
:
audio_chunk
=
self
.
model
.
tts_to_file
(
llm_sentence
,
self
.
speaker_id
,
quiet
=
True
)
except
(
AssertionError
,
RuntimeError
)
as
e
:
logger
.
error
(
f
"
Error in MeloTTSHandler:
{
e
}
"
)
audio_chunk
=
np
.
array
([])
if
len
(
audio_chunk
)
==
0
:
self
.
should_listen
.
set
()
return
...
...
This diff is collapsed.
Click to expand it.
s2s_pipeline.py
+
0
−
1
View file @
669bdbf9
...
...
@@ -49,7 +49,6 @@ console = Console()
logging
.
getLogger
(
"
numba
"
).
setLevel
(
logging
.
WARNING
)
# quiet down numba logs
def
prepare_args
(
args
,
prefix
):
"""
Rename arguments by removing the prefix and prepares the gen_kwargs.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment