Update app.py

app.py

@@ -3,14 +3,11 @@ import tiktoken
 
 import datetime
 import json
-import time
 import os
 
 openai.api_key = os.getenv('API_KEY')
 openai.request_times = 0
 
-all_dialogue = []
-
 def ask(question, history, behavior):
     openai.request_times += 1
     print(f"request times {openai.request_times}: {datetime.datetime.now()}: {question}")
@@ -37,7 +34,6 @@ def ask(question, history, behavior):
         print(e)
         response = 'Timeout! Please wait a few minutes and retry'
     history = history + [question, response]
-    record_dialogue(history)
     return history
 
 def num_tokens_from_messages(messages, model="gpt-3.5-turbo"):
@@ -68,65 +64,54 @@ def forget_long_term(messages, max_num_tokens=4000):
             messages = messages[1:]
     return messages
 
-def record_dialogue(history):
-    dialogue = json.dumps(history, ensure_ascii=False)
-    for i in range(len(all_dialogue)):
-        if dialogue[1:-1].startswith(all_dialogue[i][1:-1]):
-            all_dialogue[i] = dialogue
-            return
-    all_dialogue.append(dialogue)
-    return
-
 
 import gradio as gr
 
 
 def to_md(content):
     is_inside_code_block = False
-    count_backtick = 0
     output_spans = []
     for i in range(len(content)):
-        if content[i]=="\n":
-            if not is_inside_code_block:
-                output_spans.append("<br>")
+        if content[i]=="\n" and not is_inside_code_block:
+            if len(output_spans)>0 and output_spans[-1].endswith("```"):
+                output_spans.append("\n")
             else:
-                output_spans.append("\n\n")
+                output_spans.append("<br>")
         elif content[i]=="`":
-            count_backtick += 1
-            if count_backtick == 3:
-                count_backtick = 0
-                is_inside_code_block = not is_inside_code_block
             output_spans.append(content[i])
+            if len(output_spans)>=3 and all([output_spans[j]=="`" for j in [-3,-2,-1]]):
+                is_inside_code_block = not is_inside_code_block
+                output_spans = output_spans[:-3]
+                if is_inside_code_block:
+                    if len(output_spans)==0:
+                        output_spans.append("```")
+                    elif output_spans[-1]=="<br>":
+                        output_spans[-1] = "\n"
+                        output_spans.append("```")
+                    elif output_spans[-1].endswith("\n"):
+                        output_spans.append("```")
+                    else:
+                        output_spans.append("\n```")
+                    
+                    if i+1<len(content) and content[i+1]!="\n":
+                        output_spans.append("\n")
+                else:
+                    if output_spans[-1].endswith("\n"):
+                        output_spans.append("```")
+                    else:
+                        output_spans.append("\n```")
+                    
+                    if i+1<len(content) and content[i+1]!="\n":
+                        output_spans.append("\n")
         else:
             output_spans.append(content[i])
     return "".join(output_spans)
 
 
 def predict(question, history=[], behavior=[]):
-    if question.startswith(f"{openai.api_key}:"):
-        return adminInstruct(question, history)
     history = ask(question, history, behavior)
     response = [(to_md(history[i]),to_md(history[i+1])) for i in range(0,len(history)-1,2)]
-    return "", history, response, gr.File.update(value=None, visible=False)
-
-
-def retry(question, history=[], behavior=[]):
-    if len(history)<2:
-        return "", history, [], gr.File.update(value=None, visible=False)
-    question = history[-2]
-    history = history[:-2]
-    return predict(question, history, behavior)
-
-
-def adminInstruct(question, history):
-    if "download all dialogue" in question:
-        filename = f"./all_dialogue_{len(all_dialogue)}.jsonl"
-        with open(filename, "w", encoding="utf-8") as f:
-            for dialogue in all_dialogue:
-                f.write(dialogue + "\n")
-        response = [(to_md(history[i]),to_md(history[i+1])) for i in range(0,len(history)-1,2)]
-        return "", history, response, gr.File.update(value=filename, visible=True)
-    return "", history, response, gr.File.update(value=None, visible=False)
+    return "", history, response
 
 
 with gr.Blocks() as demo:
@@ -173,15 +158,12 @@ with gr.Blocks() as demo:
         txt = gr.Textbox(show_label=False, placeholder="输入你想让ChatGPT回答的问题").style(container=False)
         with gr.Row():
             button_gen = gr.Button("Submit")
-            button_rtr = gr.Button("Retry")
             button_clr = gr.Button("Clear")
-    
-    downloadfile = gr.File(None, interactive=False, show_label=False, visible=False)
+        
     gr.Examples(examples=examples_bhv, inputs=bhv, label="Examples for setting behavior")
     gr.Examples(examples=examples_txt, inputs=txt, label="Examples for asking question")
     txt.submit(predict, [txt, state, behavior], [txt, state, chatbot])
-    button_gen.click(fn=predict, inputs=[txt, state, behavior], outputs=[txt, state, chatbot, downloadfile])
-    button_rtr.click(fn=retry, inputs=[txt, state, behavior], outputs=[txt, state, chatbot, downloadfile])
+    button_gen.click(fn=predict, inputs=[txt, state, behavior], outputs=[txt, state, chatbot])
     button_clr.click(fn=lambda :([],[]), inputs=None, outputs=[chatbot, state])
 
 demo.queue(concurrency_count=3, max_size=10)