fix bugs with voice id not correctly setted

parmenashp · Mar 7, 2024 · dd66b09 · dd66b09
1 parent c6049b1
commit dd66b09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/backend/src/tts.py b/backend/src/tts.py
@@ -133,11 +133,20 @@ def play_next_str(self, text: str, loop: asyncio.AbstractEventLoop) -> None:
             return
 
         logger.info(f"Using {global_config.elevenlabs_buffer_size} elevenlabs buffer size")
+        voice = Voice(
+            voice_id=global_config.elevenlabs_voice_id,
+            settings=VoiceSettings(
+                stability=global_config.voice_stability,  # type: ignore
+                similarity_boost=global_config.voice_similarity_boost,  # type: ignore
+                style=global_config.voice_style,
+            ),
+        )
         gen = generate(
             text=text,
-            voice=global_config.elevenlabs_voice_id,
+            voice=voice,
+            api_key=global_config.elevenlabs_api_key,
             stream=global_config.elevenlabs_streaming,
-            model="eleven_multilingual_v2",
+            model=global_config.elevenlabs_model,  # type: ignore
             stream_chunk_size=global_config.elevenlabs_buffer_size,
         )
         stream_thread = threading.Thread(

diff --git a/forge/src/main/java/com/mitsuaky/stanleyparable/EventSubscriber.java b/forge/src/main/java/com/mitsuaky/stanleyparable/EventSubscriber.java
@@ -1,6 +1,7 @@
 package com.mitsuaky.stanleyparable;
 
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.mojang.brigadier.CommandDispatcher;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.DisplayInfo;
@@ -458,7 +459,8 @@ public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
             if (ClientConfig.SEND_TO_CHAT.get()) {
                 player.sendSystemMessage(Component.nullToEmpty("Personalidade alterada!"));
             }
-            JsonObject personality = jsonObject.getAsJsonObject("data");
+            String data = jsonObject.get("data").getAsString();
+            JsonObject personality = JsonParser.parseString(data).getAsJsonObject();
             String voiceID = personality.get("voice_id").getAsString();
             ClientConfig.ELEVENLABS_VOICE_ID.set(voiceID);
             player.level().playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.PLAYER_LEVELUP, SoundSource.MASTER, 1.5F, 1.0F);