Update app.py

app.py

@@ -12,7 +12,6 @@ def format_prompt(message, history):
     prompt=""
     if history:
         prompt = "<s>"
-        
         for user_prompt, bot_response in history:
             #print (bot_response)
             prompt += f"[INST] {user_prompt} [/INST]"
@@ -34,21 +33,15 @@ def generate(prompt,history):
         do_sample=True,
         seed=seed,
     )
-
     formatted_prompt = format_prompt(f"{system_prompt}, {prompt}", history)
     stream = client.text_generation(formatted_prompt, **generate_kwargs, stream=True, details=True, return_full_text=False)
     output = ""
     buf = ""
-    #out = history.append((prompt,""))
     for response in stream:
         output += response.token.text
         yield [(prompt,output)], ""
     yield [(prompt,output)], output
-def tts(inp,voice,length,noise,width,sen_pause):
-    #print(inp)
-    #print(type(inp))
-    inp=inp.strip("</s>")
-    yield from pp.stream_tts(inp,voice,length,noise,width,sen_pause)
+
 def load_mod(model):
     yield f"Loading: {model}"
     pp.load_mod(model)
@@ -56,14 +49,12 @@ def load_mod(model):
     
 with gr.Blocks() as iface:
     aud=gr.Audio(streaming=True,autoplay=True)
-    #chatbot=gr.Chatbot(show_label=False, show_share_button=False, show_copy_button=True, likeable=True, layout="panel"),
-    chatbot=gr.Chatbot()
+    chatbot=gr.Chatbot(show_label=False, show_share_button=False, show_copy_button=True, layout="panel")
     prompt = gr.Textbox()
-    with gr.Group():
-        with gr.Row():
-            submit_b = gr.Button()
-            stop_b = gr.Button("Stop")
-            clear = gr.ClearButton([chatbot])
+    with gr.Row():
+        submit_b = gr.Button()
+        stop_b = gr.Button("Stop")
+        clear = gr.ClearButton([chatbot,prompt,aud])
     with gr.Accordion("Voice Controls",open=False):
         msg = gr.HTML("""""")
         names=gr.Dropdown(label="Voice", choices=pp.key_list,value="en_US-joe-medium")
@@ -76,9 +67,9 @@ with gr.Blocks() as iface:
         stt=gr.Textbox(visible=True)
 
     iface.load(load_mod,names,msg)
-    names.change(load_mod,names,msg)
     sub_b = submit_b.click(generate, [prompt,chatbot],[chatbot,stt])
-    #sub_e = prompt.submit(generate, [prompt, chatbot], [chatbot,stt])
-    stt.change(pp.stream_tts,[stt,names,length,noise,width,sen_pause],aud)
-    stop_b.click(None,None,None, cancels=[sub_b])
+    sub_e = prompt.submit(generate, [prompt, chatbot], [chatbot,stt])
+    aud_stream = stt.change(pp.stream_tts,[stt,names,length,noise,width,sen_pause],aud)
+    names_change=names.change(load_mod,names,msg)
+    stop_b.click(None,None,None, cancels=[sub_b,sub_e,aud_stream,names_change])
 iface.queue(default_concurrency_limit=10).launch()