Update app.py

app.py

@@ -26,7 +26,7 @@ ELEVENLABS_API_KEY = os.getenv("ELEVENLABS_API_KEY")
 set_api_key(ELEVENLABS_API_KEY)
 
 # Role configurations
-ALLOWED_ROLES = ["+mechanic", "+trusted", "Administrator"]
+ALLOWED_ROLES = ["+mechanic", "+trusted"]
 CHAR_LIMITS = {
     "+mechanic": 500,
     "+trusted": 3000,
@@ -47,18 +47,6 @@ ACCENT_PROMPTS = {
                   Example: "Hello there" → "Howdy there, partner" """
 }
 
-# Discord bot setup
-intents = discord.Intents.default()
-intents.message_content = True
-client = discord.Client(intents=intents)
-tree = app_commands.CommandTree(client)
-
-# Define your server ID (replace this with your actual server ID)
-MY_GUILD_ID = discord.Object(id=int(os.getenv('DISCORD_GUILD_ID', '0')))
-
-# Get available voices - moved here to be available for both Discord and Gradio
-VOICE_LIST = get_available_voices()
-
 def get_available_voices():
     """Fetch only custom voices from ElevenLabs account"""
     all_voices = voices()
@@ -91,26 +79,41 @@ def has_permission(member: discord.Member) -> tuple[bool, int]:
 
 async def modify_accent(text: str, accent: str, enhance: bool = False) -> str:
     """Modify text based on selected accent using Gemini AI"""
-    if accent not in ACCENT_OPTIONS or accent == "American":
+    if not accent or accent == "American":
         return text
         
     prompt = ACCENT_PROMPTS[accent]
     if enhance:
-        prompt += "\nMake it sound more authentic by adding cultural references and occasional words in the native language."
+        prompt += """\nEnhance the text by:
+                    1. Adding more cultural expressions
+                    2. Including occasional words in the native language
+                    3. Making speech patterns more authentic
+                    4. Adding cultural references where appropriate"""
     
     prompt += f"\n\nText to modify: {text}"
     
     try:
         response = await model.generate_content_async(prompt)
-        return response.text
+        modified_text = response.text.strip()
+        return modified_text if modified_text else text
     except Exception as e:
         logger.error(f"Error modifying accent: {str(e)}")
         return text
 
-@tree.command(name="list", description="List all available voices", guild=MY_GUILD_ID)
+# Discord bot setup
+intents = discord.Intents.default()
+intents.message_content = True
+client = discord.Client(intents=intents)
+tree = app_commands.CommandTree(client)
+
+# Define your server ID
+MY_GUILD_ID = discord.Object(id=int(os.getenv('DISCORD_GUILD_ID', '0')))
+
+@tree.command(name="list", description="List all available voices")
 async def voice_list(interaction: discord.Interaction):
     await interaction.response.defer()
-    voice_list = "\n".join([f"• {name}" for name in VOICE_LIST.keys()])
+    available_voices = get_available_voices()
+    voice_list = "\n".join([f"• {name}" for name in available_voices.keys()])
     credits_info = get_remaining_credits()
     credits_msg = format_credits_message(credits_info)
     
@@ -120,8 +123,15 @@ async def voice_list(interaction: discord.Interaction):
         color=0x2B2D31
     )
     await interaction.followup.send(embed=embed)
-    
-@tree.command(name="create", description="Create a voice message", guild=MY_GUILD_ID)
+
+async def voice_autocomplete(interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
+    voices = list(get_available_voices().keys())
+    return [
+        app_commands.Choice(name=voice, value=voice)
+        for voice in voices if current.lower() in voice.lower()
+    ][:25]
+
+@tree.command(name="create", description="Create a voice message")
 @app_commands.describe(
     text="Text to convert to speech",
     voice_name="Select a voice to use",
@@ -152,7 +162,7 @@ async def voice_create(
     if not has_perm:
         embed = discord.Embed(
             title="Permission Denied",
-            description="You need to be an administrator or have been granted permission to use this command.",
+            description="You need to be an administrator or have the +mechanic/+trusted role to use this command.",
             color=0xFF0000
         )
         await interaction.followup.send(embed=embed)
@@ -171,6 +181,16 @@ async def voice_create(
     # Process accent if specified
     if accent:
         text = await modify_accent(text, accent, accent_enhance)
+    
+    available_voices = get_available_voices()
+    if voice_name not in available_voices:
+        embed = discord.Embed(
+            title="Voice Not Found",
+            description=f"The voice '{voice_name}' was not found. Use `/list` to see available voices.",
+            color=0x2B2D31
+        )
+        await interaction.followup.send(embed=embed)
+        return
         
     try:
         voice_settings = VoiceSettings(
@@ -180,47 +200,36 @@ async def voice_create(
             use_speaker_boost=True
         )
         
-    if voice_name not in VOICE_LIST:
-        embed = discord.Embed(
-            title="Voice Not Found",
-            description=f"The voice '{voice_name}' was not found. Use `/list` to see available voices.",
-            color=0x2B2D31
-        )
-        await interaction.followup.send(embed=embed)
-        return
-    
         audio = generate(
             text=text,
             voice=Voice(
-                voice_id=VOICE_LIST[voice_name],
+                voice_id=available_voices[voice_name],
                 settings=voice_settings
             )
         )
         
-        # Save audio to temporary WAV file with correct format
         with tempfile.NamedTemporaryFile(delete=False, suffix=".wav") as temp_file:
-            # Convert audio to proper WAV format using pydub
             audio_segment = AudioSegment.from_file(io.BytesIO(audio), format="mp3")
-            # Convert to mono, 16-bit PCM at 22.050 kHz
             audio_segment = audio_segment.set_frame_rate(22050).set_channels(1).set_sample_width(2)
             audio_segment.export(temp_file.name, format='wav')
             temp_path = temp_file.name
         
-        # Get updated credits
         credits_info = get_remaining_credits()
         credits_msg = format_credits_message(credits_info)
         
+        accent_info = f"\nAccent: {accent}" if accent else ""
+        accent_enhance_info = f"\nAccent Enhancement: {'On' if accent_enhance else 'Off'}" if accent else ""
+        
         embed = discord.Embed(
             title="Voice Generated",
-            description=f"Prompt: {text}\nVoice: {voice_name}\nStability: {stability}\nClarity: {clarity}\nStyle: {style}\n\n{credits_msg}",
-            color=0x57F287  # Discord green color
+            description=f"Prompt: {text}\nVoice: {voice_name}\nStability: {stability}\nClarity: {clarity}\nStyle: {style}{accent_info}{accent_enhance_info}\n\n{credits_msg}",
+            color=0x57F287
         )
         await interaction.followup.send(
             embed=embed,
             file=discord.File(temp_path)
         )
         
-        # Clean up
         os.unlink(temp_path)
         
     except Exception as e: