Revert

api_clients.py

@@ -1,45 +1,14 @@
 from functools import lru_cache
-from typing import List, Tuple, Optional, Dict
+from typing import List, Tuple, Optional
 import aiohttp
 import elevenlabs
 import time
 from contextlib import asynccontextmanager
 from logger import setup_logger, log_execution_time, log_async_execution_time
-from models import OpenRouterModel, OpenRouterRequest, OpenRouterResponse, Message
+from models import OpenRouterModel
 
 logger = setup_logger("api_clients")
 
-def preprocess_text(text: str) -> str:
-    """
-    Clean and format text by removing unwanted characters and formatting
-    
-    Args:
-        text: Raw input text
-        
-    Returns:
-        Cleaned text suitable for podcast generation
-    """
-    import re
-    
-    # Remove markdown-style formatting
-    text = re.sub(r'\*\*(.+?)\*\*', r'\1', text)  # Bold
-    text = re.sub(r'\*(.+?)\*', r'\1', text)      # Italic
-    text = re.sub(r'__(.+?)__', r'\1', text)      # Underline
-    text = re.sub(r'~~(.+?)~~', r'\1', text)      # Strikethrough
-    
-    # Remove action blocks and special formatting
-    text = re.sub(r'\[.*?\]', '', text)           # Remove [actions]
-    text = re.sub(r'\{.*?\}', '', text)           # Remove {actions}
-    text = re.sub(r'<.*?>', '', text)             # Remove <actions>
-
-    # Remove podcast-specific formatting
-    text = re.sub(r'\((?:pause|break|music|sfx|sound effect|jingle).*?\)', '', text, flags=re.IGNORECASE)
-    text = re.sub(r'\((host|speaker|guest)\s*\d*\s*:?\)', '', text, flags=re.IGNORECASE)
-    text = re.sub(r'#\s*\d+\s*[:.-]', '', text)   # Remove segment numbers
-    
-    # Clean up whitespace
-    return ' '.join(text.split())
-
 class OpenRouterClient:
     """Handles OpenRouter API interactions with comprehensive logging and error tracking"""
     
@@ -116,56 +85,52 @@ class OpenRouterClient:
             logger.error("Prompt too short or missing")
             raise ValueError("Please provide a more detailed prompt")
         
-        # Clean input text
-        cleaned_content = preprocess_text(content)
-        cleaned_prompt = preprocess_text(prompt)
-        
-        system_prompt = """You are an expert podcast script writer. Your task is to create engaging, 
-natural-sounding podcast scripts that flow conversationally while being informative and engaging.
-
-Follow these guidelines:
-1. Write in a conversational, natural speaking style that sounds authentic
-2. Break complex topics into digestible segments with clear transitions
-3. Avoid technical jargon unless necessary, explaining complex terms when used
-4. Use natural speech patterns:
-   - Contractions (I'm, we're, let's)
-   - Casual language
-   - Rhetorical questions to engage listeners
-5. Include brief pauses for emphasis and pacing (but don't mark them explicitly)
-6. Incorporate storytelling elements to maintain engagement
-7. End with a clear conclusion and call-to-action
-8. Keep paragraphs short and focused for easier delivery
-9. Use simple sentence structures that flow naturally when spoken
+        system_prompt = """DO NOT WRITE ASIDES OR ACTION DESCRIPTIONS, YOU WRITE DIALOG ONLY!!. You are an expert podcast script writer with these specific requirements:
+1. Start the content immediately - no introductions, timestamps, or meta-commentary
+2. Write in a natural, conversational tone suitable for speaking
+3. Structure the content with clear paragraphs and natural pauses
+4. Use informal language while maintaining professionalism
+5. Focus on narrative flow and engaging delivery
+6. Keep technical terms simple and explained
+7. Include vocal variety cues through punctuation
+8. Write as if speaking directly to the listener
+9. Use storytelling techniques to maintain interest
+10. Do not add muscial queues or sound effects
+11. Add host and show intros, outros, and transitions as needed
+"""
 
-Format the script for natural speech, avoiding any special characters or formatting."""
+        user_prompt = f"""Write a podcast script based on the following content. Make it engaging and easy to follow.
 
-        user_prompt = f"""Create a podcast script based on the following topic and content:
+Context: {prompt if prompt else 'Create an informative and engaging podcast episode'}
 
-Topic: {cleaned_prompt}
+Content:
+{content}
 
-Content to cover: {cleaned_content}
-
-Focus on making it engaging and natural to listen to."""
+Format the script in a clear, readable way with appropriate spacing. Do not add asides or action descriptions. Only add spoken dialog and host cues."""
 
         try:
-            request = OpenRouterRequest(
-                model=model_id,
-                messages=[
-                    Message(role="system", content=system_prompt),
-                    Message(role="user", content=user_prompt)
-                ]
-            )
+            request_data = {
+                "model": model_id,
+                "messages": [
+                    {"role": "system", "content": system_prompt},
+                    {"role": "user", "content": user_prompt}
+                ],
+                "temperature": 0.7,
+                "max_tokens": 2000
+            }
             
             async with self.get_session() as session:
                 async with session.post(
                     f"{self.base_url}/chat/completions",
-                    json=request.dict()
+                    json=request_data
                 ) as response:
-                    response.raise_for_status()
+                    if response.status != 200:
+                        error_text = await response.text()
+                        logger.error(f"OpenRouter API error: {error_text}")
+                        raise ValueError(f"API request failed: {error_text}")
+                    
                     data = await response.json()
-                    router_response = OpenRouterResponse(**data)
-                    logger.debug(f"Generated script length: {len(router_response.choices[0].message.content)} chars")
-                    return router_response.choices[0].message.content
+                    return data['choices'][0]['message']['content']
                     
         except Exception as e:
             logger.error(f"Script generation failed", exc_info=True)
@@ -186,14 +151,17 @@ class ElevenLabsClient:
         """
         try:
             voices = elevenlabs.voices()
-            return [(voice.voice_id, f"{voice.name} ({voice.labels.get('accent', 'No accent')})" + 
-                    (f" - {voice.description[:50]}..." if voice.description else ""))
-                    for voice in voices]
+            return [(
+                
+                f"{voice.name} ({voice.labels.get('accent', 'No accent')})" + 
+                (f" - {voice.description[:50]}..." if voice.description else ""),
+                voice.voice_id  # Value (hidden from user)
+            ) for voice in voices]
         except Exception as e:
             logger.error("Failed to fetch voices from ElevenLabs", exc_info=True)
             raise
 
-    async def generate_audio(self, text: str, voice_id: str):
+    def generate_audio(self, text: str, voice_id: str):
         """Generate audio synchronously"""
         logger.info(f"Starting audio generation with voice: {voice_id}")
         logger.debug(f"Input text length: {len(text)} chars")
@@ -203,7 +171,7 @@ class ElevenLabsClient:
         
         try:
             start_time = time.time()
-            audio = await elevenlabs.generate(
+            audio = elevenlabs.generate(
                 text=text,
                 voice=voice_id,
                 model="eleven_monolingual_v1"