Update app.py

app.py

@@ -27,11 +27,6 @@ class VitsGradio:
             for dir in dirs:
                 self.modelPaths.append(dir)
         with gr.Blocks() as self.Vits:
-            gr.Markdown(
-            "## <center> Vits chatbot后端演示，直接在本机上克隆并部署该space即可。搭配前端使用: https://github.com/Arkueid/Live2DMascot\n"
-            "## <center> 使用方法:在控制面板选择tts模型与说话人，并且设置gpt的api key,之后会生成语音合成的api。"
-            "### <center> 我移除了pyopenjtalk，如果合成不了日语就直接摆烂，所以不存在安装困难的情况.运行main.py后直接打开ui界面配置：http://127.0.0.1:7860/\n"
-            "### <center> 如果有能力，可自行替换text文件夹\n")
             with gr.Tab("调试用"):
                 with gr.Row():
                     with gr.Column():
@@ -54,11 +49,11 @@ class VitsGradio:
                     with gr.Column():
                         with gr.Row():
                             with gr.Column():
-                                self.api_input1 = gr.TextArea(label="输入api-key或本地存储说话模型的路径", value="https://platform.openai.com/account/api-keys")
-                                with gr.Accordion(label="chatbot选择", open=False):
-                                                self.api_input2 = gr.Checkbox(value=True, label="采用gpt3.5")
-                                                self.local_chat1 = gr.Checkbox(value=False, label="启动本地chatbot，这里用不了，别点")
-                                                self.local_chat2 = gr.Checkbox(value=True, label="是否量化")
+                                self.api_input1 = gr.TextArea(label="输入gpt/茉莉云的api-key或本地存储说话模型的路径.如果要用茉莉云则用'|'隔开key和密码", value="49eig5nu3rllvg6e|itcn9760")
+                                with gr.Accordion(label="chatbot选择(默认gpt3.5)", open=False):
+                                                self.api_input2 = gr.Checkbox(value=False, label="茉莉云")
+                                                self.local_chat1 = gr.Checkbox(value=False, label="启动本地chatbot")
+                                                self.local_chat2 = gr.Checkbox(value=False, label="是否量化")
                                                 res = gr.TextArea()
                                 Botselection = gr.Button("完成chatbot设定")
                                 Botselection.click(self.check_bot, inputs=[self.api_input1,self.api_input2,self.local_chat1,self.local_chat2], outputs = [res])
@@ -66,9 +61,9 @@ class VitsGradio:
                                 self.input2 = gr.Dropdown(label="Language", choices=self.lan, value="自动", interactive=True)
                             with gr.Column():
                                 btnVC = gr.Button("完成vits TTS端设定")
-                                self.input3 = gr.Dropdown(label="Speaker", choices=list(range(114514)), value=21, interactive=True)
+                                self.input3 = gr.Dropdown(label="Speaker", choices=list(range(1001)), value=0, interactive=True)
                                 self.input4 = gr.Slider(minimum=0, maximum=1.0, label="更改噪声比例(noise scale)，以控制情感", value=0.6)
-                                self.input5 = gr.Slider(minimum=0, maximum=1.0, label="更改噪声偏差(noise scale w)，以控制音素长短", value=0.668)
+                                self.input5 = gr.Slider(minimum=0, maximum=1.0, label="更改噪声偏差(noise scale w)，以控制音素长短", value=0.667)
                                 self.input6 = gr.Slider(minimum=0.1, maximum=10, label="duration", value=1)
                                 statusa = gr.TextArea()
                 btnVC.click(self.create_tts_fn, inputs=[self.input1, self.input2, self.input3, self.input4, self.input5, self.input6], outputs = [statusa])
@@ -83,6 +78,34 @@ class VitsGradio:
         return web,file_path
 
 
+    def mori(self,text):
+        import http.client
+        conn = http.client.HTTPSConnection("api.mlyai.com")
+        payload = json.dumps({
+            "content": text,
+            "type": 1,
+            "from": "123456",
+            "fromName": "侑"
+        })
+        headers = {
+            'Api-Key': self.api_key,
+            'Api-Secret': self.api_secret,
+            'Content-Type': 'application/json'
+        }
+        conn.request("POST", "/reply", payload, headers)
+        res = conn.getresponse()
+        data = res.read()
+        decoded_data = json.loads(data.decode("utf-8")) 
+
+        if decoded_data["code"] == "00000":
+            answer = decoded_data["data"][0]["content"]
+            if text == 'exit':
+                conn.close()
+            return answer
+        else:
+            conn.close()
+            return '对不起，做不到'
+
     def chatgpt(self,text):
         self.messages.append({"role": "user", "content": text},)
         chat = openai.ChatCompletion.create(model="gpt-3.5-turbo", messages= self.messages)
@@ -121,6 +144,7 @@ class VitsGradio:
         return response['choices'][0]['text'].strip()
     
     def check_bot(self,api_input1,api_input2,local_chat1,local_chat2):
+        self.api_key, self.api_secret = api_input1.split("|")
         if local_chat1:
             from transformers import AutoTokenizer, AutoModel
             self.tokenizer = AutoTokenizer.from_pretrained(api_input1, trust_remote_code=True)
@@ -130,8 +154,11 @@ class VitsGradio:
                 self.model = AutoModel.from_pretrained(api_input1, trust_remote_code=True)
             self.history = []
         else:
-            self.messages = []
-            openai.api_key = api_input1
+            try:
+                self.messages = []
+                openai.api_key = api_input1
+            except:
+                pass
         return "Finished"
     
     def is_japanese(self,string):
@@ -202,11 +229,11 @@ class VitsGradio:
 
     def tts_fn(self,text):
         if self.local_chat1:
-            text = self.chatgpt(text)
+            text = self.mori(text)
         elif self.api_input2:
             text = self.ChATGLM(text)
         else:
-            text = self.gpt3_chat(text)
+            text = text = self.chatgpt(text)
         print(text)
         text =self.sle(self.language,text)
         with torch.no_grad():
@@ -235,7 +262,7 @@ def text_api():
             'Content-Type': 'audio/wav',
             'Text': text.encode('utf-8')}
     return wav_bytes, 200, headers
-'''
+
 def gradio_interface():
     return grVits.Vits.launch()
 
@@ -244,5 +271,3 @@ if __name__ == '__main__':
     gradio_thread = Thread(target=gradio_interface)
     api_thread.start()
     gradio_thread.start()
-'''
-grVits.Vits.launch()