update

app.py

@@ -1,3 +1,24 @@
-from en_tts_gr import run
+import sys
+from functools import partial
 
-run()
+from en_tts_app import initialize_app, run_main
+from en_tts_gr import build_interface
+
+exit_code = initialize_app()
+if exit_code > 0:
+    sys.exit(exit_code)
+
+interface = build_interface(cache_examples=False)
+interface.queue()
+
+launch_method = partial(
+    interface.launch,
+    share=False,
+    debug=True,
+    inbrowser=True,
+    quiet=False,
+    show_api=False,
+)
+
+exit_code = run_main(launch_method)
+sys.exit(exit_code)

en_tts_app/__init__.py

@@ -1,3 +1,5 @@
 from en_tts_app.app import initialize_app, run_main
-from en_tts_app.globals import get_conf_dir, get_log_path, get_work_dir, reset_log
-from en_tts_app.main import load_models_to_cache, synthesize_english
+from en_tts_app.globals import APP_NAME, APP_VERSION, get_conf_dir, get_log_path, get_work_dir
+from en_tts_app.logging_configuration import get_app_logger, get_file_logger
+from en_tts_app.main import (load_models_to_cache, reset_log, reset_work_dir, synthesize_english,
+                             synthesize_ipa)

en_tts_app/globals.py

@@ -1,8 +1,10 @@
-import shutil
+from importlib.metadata import version
 from pathlib import Path
 from tempfile import gettempdir
 
-from en_tts_cli.logging_configuration import get_cli_logger
+APP_NAME = "en-tts"
+
+APP_VERSION = version(APP_NAME)
 
 
 def get_conf_dir() -> Path:
@@ -17,18 +19,3 @@ def get_work_dir() -> Path:
 
 def get_log_path() -> Path:
   return Path(gettempdir()) / "en-tts.log"
-
-
-def reset_log() -> None:
-  get_log_path().write_text("", "utf-8")
-
-
-def reset_work_dir():
-  root_logger = get_cli_logger()
-  work_dir = get_work_dir()
-
-  if work_dir.is_dir():
-    root_logger.debug("Deleting working directory ...")
-    shutil.rmtree(work_dir)
-  root_logger.debug("Creating working directory ...")
-  work_dir.mkdir(parents=False, exist_ok=False)

en_tts_app/logging_configuration.py

@@ -2,14 +2,11 @@ import logging
 import os
 import platform
 import sys
-from importlib.metadata import version
 from logging import Formatter, Handler, Logger, StreamHandler, getLogger
 from pathlib import Path
 from pkgutil import iter_modules
 
-__APP_NAME = "en-tts"
-
-__version__ = version(__APP_NAME)
+from en_tts_app.globals import APP_VERSION
 
 
 class ConsoleFormatter(logging.Formatter):
@@ -129,7 +126,7 @@ def log_sysinfo():
   flogger = get_file_logger()
 
   sys_version = sys.version.replace('\n', '')
-  flogger.debug(f"CLI version: {__version__}")
+  flogger.debug(f"CLI version: {APP_VERSION}")
   flogger.debug(f"Python version: {sys_version}")
   flogger.debug("Modules: %s", ', '.join(sorted(p.name for p in iter_modules())))
 

en_tts_app/main.py

@@ -3,6 +3,7 @@ import shutil
 from pathlib import Path
 from typing import Dict, Optional
 
+import torch
 from ordered_set import OrderedSet
 from pronunciation_dictionary import PronunciationDict, SerializationOptions, save_dict
 
@@ -10,28 +11,61 @@ from en_tts.helper import get_default_device, normalize_audio
 from en_tts.io import save_audio
 from en_tts.synthesizer import Synthesizer
 from en_tts.transcriber import Transcriber
-from en_tts_app.globals import get_conf_dir, get_work_dir, reset_log, reset_work_dir
+from en_tts_app.globals import get_conf_dir, get_log_path, get_work_dir
 from en_tts_app.logging_configuration import get_app_logger, get_file_logger, log_sysinfo
 
 CACHE_TRANSCRIBER = "transcriber"
 CACHE_SYNTHESIZER = "synthesizer"
 
 
-def load_models_to_cache() -> Dict:
+def reset_work_dir():
+  root_logger = get_app_logger()
+  work_dir = get_work_dir()
+
+  if work_dir.is_dir():
+    root_logger.debug("Deleting working directory ...")
+    shutil.rmtree(work_dir)
+  root_logger.debug("Creating working directory ...")
+  work_dir.mkdir(parents=False, exist_ok=False)
+
+
+def reset_log() -> None:
+  get_log_path().write_text("", "utf-8")
+
+
+def load_models_to_cache(custom_device: torch.device = None) -> Dict:
   cli_logger = get_app_logger()
   cache = {}
 
   conf_dir = get_conf_dir()
-  device = get_default_device()
 
   cli_logger.info("Initializing Transcriber...")
   cache[CACHE_TRANSCRIBER] = Transcriber(conf_dir)
 
+  if custom_device is None:
+    custom_device = get_default_device()
+
   cli_logger.info("Initializing Synthesizer...")
-  cache[CACHE_SYNTHESIZER] = Synthesizer(conf_dir, device)
+  cache[CACHE_SYNTHESIZER] = Synthesizer(conf_dir, custom_device)
   return cache
 
 
+def synthesize_ipa(text_ipa: str, cache: Dict, *, max_decoder_steps: int = 5000, sigma: float = 1.0, denoiser_strength: float = 0.0005, seed: int = 0, silence_sentences: float = 0.4, silence_paragraphs: float = 1.0, loglevel: int = 2, custom_output: Optional[Path] = None):
+  if loglevel >= 1:
+    try_log_text(text_ipa, "text")
+    
+  if custom_output is None:
+    custom_output = get_work_dir() / "output.wav"
+
+
+  output_path = synthesize_ipa_core(
+    text_ipa, cache[CACHE_SYNTHESIZER], custom_output,
+    max_decoder_steps=max_decoder_steps, sigma=sigma, denoiser_strength=denoiser_strength, seed=seed, silence_sentences=silence_sentences, silence_paragraphs=silence_paragraphs, loglevel=loglevel,
+  )
+
+  return output_path
+
+
 def synthesize_english(text: str, cache: Dict, *, max_decoder_steps: int = 5000, sigma: float = 1.0, denoiser_strength: float = 0.0005, seed: int = 0, silence_sentences: float = 0.4, silence_paragraphs: float = 1.0, loglevel: int = 2, skip_normalization: bool = False, skip_sentence_separation: bool = False, custom_output: Optional[Path] = None) -> Path:
   cli_logger = get_app_logger()
   reset_log()

en_tts_gr/app.py

@@ -10,7 +10,7 @@ from typing import Dict
 import gradio as gr
 from scipy.io.wavfile import read
 
-from en_tts_app import (get_log_path, get_work_dir, initialize_app,
+from en_tts_app import (APP_VERSION, get_log_path, get_work_dir, initialize_app,
                         load_models_to_cache, run_main, synthesize_english)
 
 
@@ -19,7 +19,7 @@ def run():
   if exit_code > 0:
     sys.exit(exit_code)
 
-  interface = build_interface()
+  interface = build_interface(cache_examples=False)
   interface.queue()
 
   launch_method = partial(
@@ -35,7 +35,7 @@ def run():
   sys.exit(exit_code)
 
 
-def build_interface():
+def build_interface(cache_examples: bool = False):
   cache = load_models_to_cache()
 
   fn = partial(synt, cache=cache)
@@ -172,10 +172,10 @@ def build_interface():
               "When the sunlight strikes raindrops in the air, they act as a prism and form a rainbow.",
               5000, 1.0, 0.0005, 0, 0.4, 1.0, False, False
             ],
-            [
-              "Please call Stella. Ask her to bring these things with her from the store: six spoons of fresh snow peas, five thick slabs of blue cheese, and maybe a snack for her brother Bob.\n\nWe also need a small plastic snake and a big toy frog for the kids. She can scoop these things into three red bags, and we will go meet her Wednesday at the train station.",
-              5000, 1.0, 0.0005, 0, 0.4, 1.0, False, False
-            ],
+            # [
+            #   "Please call Stella. Ask her to bring these things with her from the store: six spoons of fresh snow peas, five thick slabs of blue cheese, and maybe a snack for her brother Bob.\n\nWe also need a small plastic snake and a big toy frog for the kids. She can scoop these things into three red bags, and we will go meet her Wednesday at the train station.",
+            #   5000, 1.0, 0.0005, 0, 0.4, 1.0, False, False
+            # ],
           ],
           fn=fn,
           inputs=[
@@ -195,13 +195,13 @@ def build_interface():
             dl_btn,
           ],
           label="Examples",
-          cache_examples=True,
+          cache_examples=cache_examples,
         )
 
     with gr.Tab("Info"):
       with gr.Column():
         gr.Markdown(
-          """
+          f"""
           ### General information
 
           - Speaker: Linda Johnson
@@ -228,7 +228,7 @@ def build_interface():
 
           ### Citation
 
-          Taubert, S. (2024). en-tts (Version 0.0.1) [Computer software]. https://doi.org/10.5281/zenodo.10479347
+          Taubert, S. (2024). en-tts (Version {APP_VERSION}) [Computer software]. https://doi.org/10.5281/zenodo.11032264
 
           ### Acknowledgments
 
@@ -240,12 +240,13 @@ def build_interface():
 
           ### App information
 
-          - Version: 0.0.1
+          - Version: {APP_VERSION}
           - License: [MIT](https://github.com/stefantaubert/en-tts?tab=MIT-1-ov-file#readme)
           - GitHub: [stefantaubert/en-tts](https://github.com/stefantaubert/en-tts)
           """
         )
 
+    # pylint: disable=E1101:no-member
     synt_btn.click(
       fn=fn,
       inputs=[