Update app.py

app.py

@@ -35,7 +35,7 @@ class VitsGradio:
                                 self.text = gr.TextArea(label="Text", value="你好")
                                 with gr.Accordion(label="测试api", open=False):
                                     self.local_chat1 = gr.Checkbox(value=False, label="使用网址+文本进行模拟")
-                                    self.url_input = gr.TextArea(label="键入测试", value="http://127.0.0.1:8080/chat?Text=")
+                                    self.url_input = gr.TextArea(label="键入测试", value="http://YourHost:8080/chat?Text=")
                                     butto = gr.Button("模拟前端抓取语音文件")
                                 btnVC = gr.Button("测试tts+对话程序")
                             with gr.Column():
@@ -49,11 +49,11 @@ class VitsGradio:
                     with gr.Column():
                         with gr.Row():
                             with gr.Column():
-                                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.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=False, label="是否量化")
+                                                self.local_chat2 = gr.Checkbox(value=True, 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])
@@ -61,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(1001)), value=21, interactive=True)
+                                self.input3 = gr.Dropdown(label="Speaker", choices=list(range(114514)), value=21, 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.667)
+                                self.input5 = gr.Slider(minimum=0, maximum=1.0, label="更改噪声偏差(noise scale w)，以控制音素长短", value=0.668)
                                 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])
@@ -78,34 +78,6 @@ 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)
@@ -144,7 +116,6 @@ 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)
@@ -154,11 +125,8 @@ class VitsGradio:
                 self.model = AutoModel.from_pretrained(api_input1, trust_remote_code=True)
             self.history = []
         else:
-            try:
-                self.messages = []
-                openai.api_key = api_input1
-            except:
-                pass
+            self.messages = []
+            openai.api_key = api_input1
         return "Finished"
     
     def is_japanese(self,string):
@@ -229,11 +197,11 @@ class VitsGradio:
 
     def tts_fn(self,text):
         if self.local_chat1:
-            text = self.mori(text)
+            text = self.chatgpt(text)
         elif self.api_input2:
             text = self.ChATGLM(text)
         else:
-            text = text = self.chatgpt(text)
+            text = self.gpt3_chat(text)
         print(text)
         text =self.sle(self.language,text)
         with torch.no_grad():
@@ -250,24 +218,6 @@ class VitsGradio:
 app = Flask(__name__)
 print("开始部署")
 grVits = VitsGradio()
-
-@app.route('/chat')
-def text_api():
-    message = request.args.get('Text','')
-    audio,text = grVits.tts_fn(message)
-    text = text.replace('[JA]','').replace('[ZH]','')
-    with open('temp.wav','rb') as bit:
-        wav_bytes = bit.read()
-    headers = {
-            'Content-Type': 'audio/wav',
-            'Text': text.encode('utf-8')}
-    return wav_bytes, 200, headers
-
-def gradio_interface():
-    return grVits.Vits.launch()
-
 if __name__ == '__main__':
-    api_thread = Thread(target=app.run, args=("0.0.0.0", 8080))
-    gradio_thread = Thread(target=gradio_interface)
-    api_thread.start()
-    gradio_thread.start()
+    grVits.Vits.launch()
+