From 74547d9121ac199a9d9998ae89f58347594e1ead Mon Sep 17 00:00:00 2001
From: sanj <67624670+iodrift@users.noreply.github.com>
Date: Thu, 8 Aug 2024 19:37:46 -0700
Subject: [PATCH] Auto-update: Thu Aug  8 19:37:46 PDT 2024

---
 sijapi/classes.py     | 11 ++++++++---
 sijapi/routers/tts.py | 32 ++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/sijapi/classes.py b/sijapi/classes.py
index dbade18..09bc54a 100644
--- a/sijapi/classes.py
+++ b/sijapi/classes.py
@@ -157,7 +157,7 @@ class Configuration(BaseModel):
     def resolve_string_placeholders(self, value: str) -> Any:
         pattern = r'\{\{\s*([^}]+)\s*\}\}'
         matches = re.findall(pattern, value)
-
+        
         for match in matches:
             parts = match.split('.')
             if len(parts) == 1:  # Internal reference
@@ -166,16 +166,21 @@ class Configuration(BaseModel):
                 replacement = getattr(self, parts[1], str(Path.home() / parts[1].lower()))
             elif len(parts) == 2 and parts[0] == 'ENV':
                 replacement = os.getenv(parts[1], '')
+            elif len(parts) == 2 and parts[0] == 'SECRET':
+                replacement = getattr(self, parts[1].strip(), '')
+                if not replacement:
+                    warn(f"Secret '{parts[1].strip()}' not found in secrets file")
             else:
                 replacement = value
-
+        
             value = value.replace('{{' + match + '}}', str(replacement))
-
+        
         # Convert to Path if it looks like a file path
         if isinstance(value, str) and (value.startswith(('/', '~')) or (':' in value and value[1] == ':')):
             return Path(value).expanduser()
         return value
 
+
     @classmethod
     def create_dynamic_model(cls, **data):
         for key, value in data.items():
diff --git a/sijapi/routers/tts.py b/sijapi/routers/tts.py
index 0815f9a..848bf08 100644
--- a/sijapi/routers/tts.py
+++ b/sijapi/routers/tts.py
@@ -214,15 +214,19 @@ async def determine_voice_id(voice_name: str) -> str:
     debug(f"Searching for voice id for {voice_name}")
     debug(f"Tts.elevenlabs.voices: {Tts.elevenlabs.voices}")
     
-    # Check if the voice is in the configured voices
-    if voice_name in Tts.elevenlabs.voices:
-        voice_id = Tts.elevenlabs.voices[voice_name]
-        debug(f"Found voice ID in config - {voice_id}")
-        return voice_id
+    voices = Tts.elevenlabs.voices
+    if isinstance(voices, dict):
+        if voice_name in voices:
+            return voices[voice_name]
+    elif hasattr(voices, '__dict__'):
+        voices_dict = voices.__dict__
+        if voice_name in voices_dict:
+            return voices_dict[voice_name]
     
-    debug(f"Requested voice not among the voices specified in config/tts.yaml. Checking with ElevenLabs API using api_key: {Tts.elevenlabs.key}.")
+    debug(f"Requested voice not among the voices specified in config/tts.yaml. Checking with ElevenLabs API.")
     url = "https://api.elevenlabs.io/v1/voices"
-    headers = {"xi-api-key": Tts.elevenlabs.key}
+    headers = {"xi-api-key": Tts.elevenlabs.api_key}
+    debug(f"Using api_key: {Tts.elevenlabs.api_key}")
     async with httpx.AsyncClient() as client:
         try:
             response = await client.get(url, headers=headers)
@@ -230,7 +234,7 @@ async def determine_voice_id(voice_name: str) -> str:
             if response.status_code == 200:
                 voices_data = response.json().get("voices", [])
                 for voice in voices_data:
-                    if voice_name == voice["voice_id"] or voice_name.lower() == voice["name"].lower():
+                    if voice_name == voice["voice_id"] or (voice_name and voice_name.lower() == voice["name"].lower()):
                         debug(f"Found voice ID from API - {voice['voice_id']}")
                         return voice["voice_id"]
             else:
@@ -240,11 +244,15 @@ async def determine_voice_id(voice_name: str) -> str:
             err(f"Error determining voice ID: {str(e)}")
     
     warn(f"Voice '{voice_name}' not found; using the default specified in config/tts.yaml: {Tts.elevenlabs.default}")
-    if Tts.elevenlabs.default in Tts.elevenlabs.voices:
-        return Tts.elevenlabs.voices[Tts.elevenlabs.default]
+    if isinstance(voices, dict):
+        return voices.get(Tts.elevenlabs.default, next(iter(voices.values())))
+    elif hasattr(voices, '__dict__'):
+        voices_dict = voices.__dict__
+        return voices_dict.get(Tts.elevenlabs.default, next(iter(voices_dict.values())))
     else:
-        err(f"Default voice '{Tts.elevenlabs.default}' not found in configuration. Using first available voice.")
-        return next(iter(Tts.elevenlabs.voices.values()))
+        err(f"Unexpected type for Tts.elevenlabs.voices: {type(voices)}")
+        return ""
+