From ba87576f83580042e4268fed73ac4d0efd273dfb Mon Sep 17 00:00:00 2001
From: sanj <67624670+iodrift@users.noreply.github.com>
Date: Thu, 8 Aug 2024 16:30:18 -0700
Subject: [PATCH] Auto-update: Thu Aug  8 16:30:18 PDT 2024

---
 sijapi/__init__.py    | 10 +++++-----
 sijapi/routers/tts.py |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/sijapi/__init__.py b/sijapi/__init__.py
index 5278cf7..4ab340d 100644
--- a/sijapi/__init__.py
+++ b/sijapi/__init__.py
@@ -24,12 +24,12 @@ HOST = f"{API.BIND}:{API.PORT}"
 LOCAL_HOSTS = [ipaddress.ip_address(localhost.strip()) for localhost in os.getenv('LOCAL_HOSTS', '127.0.0.1').split(',')] + ['localhost']
 SUBNET_BROADCAST = os.getenv("SUBNET_BROADCAST", '10.255.255.255')
 MAX_CPU_CORES = min(int(os.getenv("MAX_CPU_CORES", int(multiprocessing.cpu_count()/2))), multiprocessing.cpu_count())
-IMG = Configuration.load('img', 'secrets')
-News = Configuration.load('news', 'secrets')
-Archivist = Configuration.load('archivist')
+IMG = Configuration.load('img', 'secrets', Dir)
+News = Configuration.load('news', 'secrets', Dir)
+Archivist = Configuration.load('archivist', 'secrets', Dir)
 Scrape = Configuration.load('scrape', 'secrets', Dir)
-Serve = Configuration.load('serve')
-Tts = Configuration.load('tts')
+Serve = Configuration.load('serve', 'secrets', Dir)
+Tts = Configuration.load('tts', 'secrets', Dir)
 
 # Directories & general paths
 ROUTER_DIR = BASE_DIR / "routers"
diff --git a/sijapi/routers/tts.py b/sijapi/routers/tts.py
index 1f25fd8..34eeb5d 100644
--- a/sijapi/routers/tts.py
+++ b/sijapi/routers/tts.py
@@ -26,7 +26,7 @@ import tempfile
 import random
 import re
 import os
-from sijapi import L, Dir, Tts, DEFAULT_VOICE, TTS_SEGMENTS_DIR, VOICE_DIR, PODCAST_DIR, TTS_OUTPUT_DIR, ELEVENLABS_API_KEY
+from sijapi import L, API, Dir, Tts, TTS_SEGMENTS_DIR, VOICE_DIR, TTS_OUTPUT_DIR, ELEVENLABS_API_KEY
 from sijapi.utilities import sanitize_filename
 
 ### INITIALIZATIONS ###
@@ -274,6 +274,7 @@ async def get_voice_file_path(voice: str = None, voice_file: UploadFile = None)
         debug(f"Looking for voice: {voice}")
         selected_voice = await select_voice(voice)
         return selected_voice
+        
     elif voice_file and isinstance(voice_file, UploadFile):
         VOICE_DIR.mkdir(exist_ok=True)
 
@@ -300,8 +301,8 @@ async def get_voice_file_path(voice: str = None, voice_file: UploadFile = None)
         return str(new_file)
     
     else:
-        debug(f"{dt_datetime.now().strftime('%Y%m%d%H%M%S')}: No voice specified or file provided, using default voice: {DEFAULT_VOICE}")
-        selected_voice = await select_voice(DEFAULT_VOICE)
+        debug(f"No voice specified or file provided, using default voice: {Tts.xtts.default}")
+        selected_voice = await select_voice(Tts.xtts.default)
         return selected_voice