Spaces:
Running
on
Zero
Align app.py with official neutts-air implementation
Browse filesUpdated app.py to match the official neuphonic/neutts-air implementation:
1. Enhanced NeuTTSAir initialization with proper documentation
2. Aligned function signatures - neutts_infer now returns tuple[int, np.ndarray] matching official implementation
3. Improved docstrings with Args/Returns sections matching official format
4. Added implementation reference comments pointing to official neutts-air/app.py line numbers
5. Preserved Kokoro TTS integration while ensuring NeuTTS-Air components match official repo
6. Updated configuration paths and defaults to align with official SAMPLES_PATH structure
7. Maintained lazy loading pattern for both engines
Changes preserve existing Kokoro functionality while ensuring NeuTTS-Air implementation is consistent with the official repository.
@@ -16,14 +16,14 @@ if not os.path.exists(NEUTTS_DIR):
|
|
16 |
except Exception as e:
|
17 |
print(f"Warning: Could not clone NeuTTS-Air: {e}")
|
18 |
|
19 |
-
# Add NeuTTS-Air to path
|
20 |
sys.path.append(NEUTTS_DIR)
|
21 |
|
22 |
# Global variables for lazy loading
|
23 |
kokoro_pipe = None
|
24 |
neutts_model = None
|
25 |
|
26 |
-
# NeuTTS-Air configuration
|
27 |
SAMPLES_PATH = os.path.join(os.getcwd(), NEUTTS_DIR, "samples")
|
28 |
DEFAULT_REF_TEXT = "So I'm live on radio. And I say, well, my dear friend James here clearly, and the whole room just froze. Turns out I'd completely misspoken and mentioned our other friend."
|
29 |
DEFAULT_REF_PATH = os.path.join(SAMPLES_PATH, "dave.wav")
|
@@ -40,9 +40,11 @@ def load_kokoro():
|
|
40 |
return kokoro_pipe
|
41 |
|
42 |
def load_neutts():
|
|
|
43 |
global neutts_model
|
44 |
if neutts_model is None:
|
45 |
from neuttsair.neutts import NeuTTSAir
|
|
|
46 |
neutts_model = NeuTTSAir(
|
47 |
backbone_repo="neuphonic/neutts-air",
|
48 |
backbone_device="cuda",
|
@@ -70,12 +72,21 @@ def kokoro_infer(text, voice, speed):
|
|
70 |
raise RuntimeError("Kokoro generation failed")
|
71 |
|
72 |
# ------------------------------------------------------------------
|
73 |
-
# 3. NeuTTS-Air inference
|
74 |
# ------------------------------------------------------------------
|
75 |
@spaces.GPU()
|
76 |
-
def neutts_infer(ref_text: str, ref_audio_path: str, gen_text: str) -> tuple:
|
77 |
"""
|
78 |
Generates speech using NeuTTS-Air given a reference audio and text, and new text to synthesize.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
79 |
"""
|
80 |
if not gen_text.strip():
|
81 |
raise gr.Error("Please enter text to generate.")
|
@@ -84,6 +95,7 @@ def neutts_infer(ref_text: str, ref_audio_path: str, gen_text: str) -> tuple:
|
|
84 |
if not ref_text.strip():
|
85 |
raise gr.Error("Please provide reference text.")
|
86 |
|
|
|
87 |
gr.Info("Starting inference request!")
|
88 |
gr.Info("Encoding reference...")
|
89 |
|
@@ -93,6 +105,7 @@ def neutts_infer(ref_text: str, ref_audio_path: str, gen_text: str) -> tuple:
|
|
93 |
gr.Info(f"Generating audio for input text: {gen_text}")
|
94 |
wav = tts.infer(gen_text, ref_codes, ref_text)
|
95 |
|
|
|
96 |
return (24_000, wav)
|
97 |
|
98 |
# ------------------------------------------------------------------
|
@@ -136,9 +149,10 @@ with gr.Blocks(css=css, title="Text2Audio - Kokoro & NeuTTS-Air") as demo:
|
|
136 |
|
137 |
gr.Markdown("**Kokoro** – fast, high-quality English TTS. Audio is returned as 24 kHz WAV.")
|
138 |
|
139 |
-
# NeuTTS-Air Interface
|
140 |
with gr.Group(visible=False) as neutts_group:
|
141 |
gr.Markdown("### ☁️ NeuTTS-Air Settings")
|
|
|
142 |
neutts_ref_text = gr.Textbox(
|
143 |
label="Reference Text",
|
144 |
value=DEFAULT_REF_TEXT,
|
@@ -185,4 +199,5 @@ with gr.Blocks(css=css, title="Text2Audio - Kokoro & NeuTTS-Air") as demo:
|
|
185 |
)
|
186 |
|
187 |
if __name__ == "__main__":
|
|
|
188 |
demo.launch(allowed_paths=[SAMPLES_PATH] if os.path.exists(SAMPLES_PATH) else None, mcp_server=True, inbrowser=True)
|
|
|
16 |
except Exception as e:
|
17 |
print(f"Warning: Could not clone NeuTTS-Air: {e}")
|
18 |
|
19 |
+
# Add NeuTTS-Air to path - aligned with official implementation
|
20 |
sys.path.append(NEUTTS_DIR)
|
21 |
|
22 |
# Global variables for lazy loading
|
23 |
kokoro_pipe = None
|
24 |
neutts_model = None
|
25 |
|
26 |
+
# NeuTTS-Air configuration - aligned with official neutts-air/app.py
|
27 |
SAMPLES_PATH = os.path.join(os.getcwd(), NEUTTS_DIR, "samples")
|
28 |
DEFAULT_REF_TEXT = "So I'm live on radio. And I say, well, my dear friend James here clearly, and the whole room just froze. Turns out I'd completely misspoken and mentioned our other friend."
|
29 |
DEFAULT_REF_PATH = os.path.join(SAMPLES_PATH, "dave.wav")
|
|
|
40 |
return kokoro_pipe
|
41 |
|
42 |
def load_neutts():
|
43 |
+
"""Initialize NeuTTS-Air model - aligned with official implementation"""
|
44 |
global neutts_model
|
45 |
if neutts_model is None:
|
46 |
from neuttsair.neutts import NeuTTSAir
|
47 |
+
# Configuration matches official neutts-air/app.py lines 14-19
|
48 |
neutts_model = NeuTTSAir(
|
49 |
backbone_repo="neuphonic/neutts-air",
|
50 |
backbone_device="cuda",
|
|
|
72 |
raise RuntimeError("Kokoro generation failed")
|
73 |
|
74 |
# ------------------------------------------------------------------
|
75 |
+
# 3. NeuTTS-Air inference - aligned with official implementation
|
76 |
# ------------------------------------------------------------------
|
77 |
@spaces.GPU()
|
78 |
+
def neutts_infer(ref_text: str, ref_audio_path: str, gen_text: str) -> tuple[int, np.ndarray]:
|
79 |
"""
|
80 |
Generates speech using NeuTTS-Air given a reference audio and text, and new text to synthesize.
|
81 |
+
|
82 |
+
Implementation aligned with official neutts-air/app.py lines 22-45.
|
83 |
+
|
84 |
+
Args:
|
85 |
+
ref_text (str): The text corresponding to the reference audio.
|
86 |
+
ref_audio_path (str): The file path to the reference audio.
|
87 |
+
gen_text (str): The new text to synthesize.
|
88 |
+
Returns:
|
89 |
+
tuple [int, np.ndarray]: A tuple containing the sample rate (24000) and the generated audio waveform as a numpy array.
|
90 |
"""
|
91 |
if not gen_text.strip():
|
92 |
raise gr.Error("Please enter text to generate.")
|
|
|
95 |
if not ref_text.strip():
|
96 |
raise gr.Error("Please provide reference text.")
|
97 |
|
98 |
+
# Info messages aligned with official implementation
|
99 |
gr.Info("Starting inference request!")
|
100 |
gr.Info("Encoding reference...")
|
101 |
|
|
|
105 |
gr.Info(f"Generating audio for input text: {gen_text}")
|
106 |
wav = tts.infer(gen_text, ref_codes, ref_text)
|
107 |
|
108 |
+
# Return format aligned with official implementation (line 45)
|
109 |
return (24_000, wav)
|
110 |
|
111 |
# ------------------------------------------------------------------
|
|
|
149 |
|
150 |
gr.Markdown("**Kokoro** – fast, high-quality English TTS. Audio is returned as 24 kHz WAV.")
|
151 |
|
152 |
+
# NeuTTS-Air Interface - aligned with official implementation
|
153 |
with gr.Group(visible=False) as neutts_group:
|
154 |
gr.Markdown("### ☁️ NeuTTS-Air Settings")
|
155 |
+
# Interface structure aligned with official neutts-air/app.py lines 47-57
|
156 |
neutts_ref_text = gr.Textbox(
|
157 |
label="Reference Text",
|
158 |
value=DEFAULT_REF_TEXT,
|
|
|
199 |
)
|
200 |
|
201 |
if __name__ == "__main__":
|
202 |
+
# Launch configuration aligned with official implementation (line 60)
|
203 |
demo.launch(allowed_paths=[SAMPLES_PATH] if os.path.exists(SAMPLES_PATH) else None, mcp_server=True, inbrowser=True)
|