Remove unused configuration parameters and conversation templates.

src/VoiceDialogue/main.py

@@ -24,8 +24,7 @@ def launch_system(
         user_language: str,
         system_prompt: str,
         tts_speaker: str,
-        llm: typing.Literal['7B', '14B'] = '14B',
-        whisper_model: typing.Literal['medium', 'large'] = 'medium'
+        llm: typing.Literal['7B', '14B'] = '14B'
 ):
     audio_frames_queue = Queue()
     user_voice_queue = Queue()
@@ -123,10 +122,8 @@ def main():
     tts_speaker = '沈逸'
     # QWen2.5 7B or 14B
     llm = '14B'
-    # Whisper medium or large
-    whisper_model = 'medium'
 
-    launch_system(user_language, SYSTEM_PROMPT, tts_speaker, llm=llm, whisper_model=whisper_model)
+    launch_system(user_language, SYSTEM_PROMPT, tts_speaker, llm=llm)
 
 
 if __name__ == '__main__':

src/VoiceDialogue/models/voice_model.py

@@ -50,22 +50,6 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
     {
         'repository': 'MoYoYoTech/tone-models',
@@ -98,22 +82,6 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
     {
         'repository': 'MoYoYoTech/tone-models',
@@ -145,22 +113,6 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
     {
         'repository': 'MoYoYoTech/tone-models',
@@ -193,22 +145,6 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
     {
         'repository': 'MoYoYoTech/tone-models',
@@ -241,22 +177,6 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
     {
         'repository': 'MoYoYoTech/tone-models',
@@ -289,71 +209,7 @@ VOICE_MODEL_CONFIGS = (
             'fragment_interval': 0.07,
             'seed': 233333,
         },
-        'conversation_templates': {
-            "opening_remarks": [
-                "To start off, I just want to say that it’s nice to be talking to you here today.",
-                "Before we begin here today, I should say that it’s nice to meet you.",
-                "First off, I just wanted to thank you for coming out and contributing a question.",
-                "Great to be here with you. I’m looking forward to a fantastic discussion.",
-                "Hey, how’s it going? We’ve got some important things to cover today.",
-                "Good to be here. We’ve got a lot of important topics to discuss."
-            ],
-            "mid_responses": [
-                "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-                "More and more people are asking about this, and I’ve got somthing on my mind.",
-                "Everybody's talking about this, and frankly, they're right to talk about it.",
-                "Well, you've brought something to the table, and that's what dialogue is all about."
-            ]
-        }
     },
-    # {
-    #     'repository': 'MoYoYoTech/gpt-sovits-models',
-    #     'character_name': 'ShenTeng',
-    #     'cover_image': '',
-    #     'description': '',
-    #     'file_size': '240M',
-    #     'is_chinese_voice': True,
-    #     'model_files': {
-    #         'gpt-weights': 'GPT_weights/shenteng_best_gpt.ckpt',
-    #         'sovits-weights': 'SoVITS_weights/shenteng_best_sovits.pth',
-    #         'prompt_semantic_path': 'shenteng_prompt_semantic.pt',
-    #         'refer_spepc_path': 'shenteng_spec.pt',
-    #         'text_features_path': 'text_features.pth',
-    #         'reference_audio': '',
-    #         'bert_base_path': 'chinese-roberta-wwm-ext-large'
-    #     },
-    #     'inference_parameters': {
-    #         'text_lang': "zh",
-    #         'prompt_text': "",
-    #         'prompt_lang': "zh",
-    #         'top_k': 5,
-    #         'top_p': 1,
-    #         'temperature': 1,
-    #         'text_split_method': "cut3",
-    #         'batch_size': 100,
-    #         'speed_factor': 1.0,
-    #         'split_bucket': True,
-    #         'return_fragment': False,
-    #         'fragment_interval': 0.07,
-    #         'seed': 233333,
-    #     },
-    #     'conversation_templates': {
-    #         "opening_remarks": [
-    #             "To start off, I just want to say that it’s nice to be talking to you here today.",
-    #             "Before we begin here today, I should say that it’s nice to meet you.",
-    #             "First off, I just wanted to thank you for coming out and contributing a question.",
-    #             "Great to be here with you. I’m looking forward to a fantastic discussion.",
-    #             "Hey, how’s it going? We’ve got some important things to cover today.",
-    #             "Good to be here. We’ve got a lot of important topics to discuss."
-    #         ],
-    #         "mid_responses": [
-    #             "Okay, you've got something on your mind, and that's why we're here, isn't it?",
-    #             "More and more people are asking about this, and I’ve got somthing on my mind.",
-    #             "Everybody's talking about this, and frankly, they're right to talk about it.",
-    #             "Well, you've brought something to the table, and that's what dialogue is all about."
-    #         ]
-    #     }
-    # },
 )
 
 
@@ -381,7 +237,7 @@ class VoiceModel(BaseModel):
     is_chinese_voice: bool
     model_files: dict[str, str]
     inference_parameters: dict[str, typing.Any]
-    conversation_templates: ConversationTemplates
+    # conversation_templates: ConversationTemplates
 
     _download_status: VoiceModelStatus = VoiceModelStatus.NOT_DOWNLOADED
 

src/VoiceDialogue/services/audio/audio_answer.py

@@ -43,8 +43,8 @@ class TTSAudioGenerator(BaseThread):
                 'vits_weights_path': voice_role.sovits_weights_path,
                 'cnhuhbert_base_path': voice_role.hubert_model_path,
                 'bert_base_path': voice_role.bert_model_path,
-                'prompt_semantic_path': voice_role.prompt_semantic_path,
-                'refer_spec_path': voice_role.reference_spec_path,
+                # 'prompt_semantic_path': voice_role.prompt_semantic_path,
+                # 'refer_spec_path': voice_role.reference_spec_path,
             }
         }
         tts_config = TTS_Config(config)

third_party/moyoyo_tts/TTS_infer_pack/TTS.py

@@ -152,8 +152,8 @@ class TTS_Config:
         self.version = version
         self.t2s_weights_path = self.configs.get("t2s_weights_path", None)
         self.vits_weights_path = self.configs.get("vits_weights_path", None)
-        self.prompt_semantic_path = self.configs.get('prompt_semantic_path')
-        self.refer_spec_path = self.configs.get('refer_spec_path')
+        # self.prompt_semantic_path = self.configs.get('prompt_semantic_path')
+        # self.refer_spec_path = self.configs.get('refer_spec_path')
         self.bert_base_path = self.configs.get("bert_base_path", None)
         os.environ['bert_path'] = f'{self.bert_base_path}'
         self.cnhuhbert_base_path = self.configs.get("cnhuhbert_base_path", None)
@@ -175,13 +175,13 @@ class TTS_Config:
             self.cnhuhbert_base_path = self.default_configs[default_config_key]['cnhuhbert_base_path']
             print(f"fall back to default cnhuhbert_base_path: {self.cnhuhbert_base_path}")
 
-        if (self.prompt_semantic_path in [None, ""]) or (not os.path.exists(self.prompt_semantic_path)):
-            self.prompt_semantic_path = self.default_configs['prompt_semantic_path']
-            print(f"fall back to default prompt_semantic_path: {self.prompt_semantic_path}")
-
-        if (self.refer_spec_path in [None, ""]) or (not os.path.exists(self.refer_spec_path)):
-            self.refer_spec_path = self.default_configs['refer_spec_path']
-            print(f"fall back to default refer_spec_path: {self.refer_spec_path}")
+        # if (self.prompt_semantic_path in [None, ""]) or (not os.path.exists(self.prompt_semantic_path)):
+        #     self.prompt_semantic_path = self.default_configs['prompt_semantic_path']
+        #     print(f"fall back to default prompt_semantic_path: {self.prompt_semantic_path}")
+        #
+        # if (self.refer_spec_path in [None, ""]) or (not os.path.exists(self.refer_spec_path)):
+        #     self.refer_spec_path = self.default_configs['refer_spec_path']
+        #     print(f"fall back to default refer_spec_path: {self.refer_spec_path}")
 
         self.update_configs()