Update app.py

app.py

@@ -31,16 +31,37 @@ class Conversation:
             del self.messages[1:3] 
         return message
 
-def add_text(history, text):  
-    history = history + [(text, None)]
-    return history, gr.update(value="", interactive=False)
+# def add_text(history, text):  
+#     history = history + [(text, None)]
+#     return history, gr.update(value="", interactive=False)
 
-def add_file(history, file):  
-    history = history + [((file.name,), None)]  
-    return history  
+# def add_file(history, file):  
+#     history = history + [((file.name,), None)]  
+#     return history  
     
-def bot(history, chatbot): 
-    prompt = ". ".join([m["content"] for m in history if m["role"] == "user"])
+# def bot(history, chatbot): 
+#     prompt = ". ".join([m["content"] for m in history if m["role"] == "user"])
+#     response = openai.Completion.create(
+#         engine="davinci",
+#         prompt=prompt,
+#         temperature=0.5,
+#         max_tokens=100,
+#         top_p=1.0
+#     )
+#     message = response["choices"][0]["text"]
+#     chatbot.add_message(content=message, role="assistant")
+
+# def answer(question, history=None):
+#     if history is None:
+#         history = []
+#     history.append(question)
+#     response = conv.ask(question)
+#     history.append(response)
+#     responses = [(u,b) for u,b in zip(history[::2], history[1::2])]
+#     return responses, history
+
+def on_text_submit(chatbot, txt):
+    prompt = ". ".join([m[0] for m in history if m[1] == "user"])
     response = openai.Completion.create(
         engine="davinci",
         prompt=prompt,
@@ -49,16 +70,13 @@ def bot(history, chatbot):
         top_p=1.0
     )
     message = response["choices"][0]["text"]
-    chatbot.add_message(content=message, role="assistant")
+    chatbot.add(message, "assistant")
+
+def on_file_upload(chatbot, btn):
+    chatbot.add((btn.uploaded_file.name,), "user")  
 
-def answer(question, history=None):
-    if history is None:
-        history = []
-    history.append(question)
-    response = conv.ask(question)
-    history.append(response)
-    responses = [(u,b) for u,b in zip(history[::2], history[1::2])]
-    return responses, history
+with gr.Blocks(css="#chatbot{height:300px} .overflow-y-auto{height:500px}") as demo:
+    chatbot = gr.Chatbot([], elem_id="chatbot").style(height=750)
 
 
 prompt = """假如你是GPT-4,你可以回答用户提问的任何问题"""
@@ -100,12 +118,21 @@ with gr.Blocks(css="#chatbot{height:300px} .overflow-y-auto{height:500px}") as d
         with gr.Column(scale=0.15, min_width=0):
             btn = gr.UploadButton("📁", file_types=["image", "video", "audio"])
 
-    txt_msg = txt.submit(add_text, [chatbot, txt], [chatbot, txt], queue=False).then(
-        bot, chatbot, chatbot
+    # txt_msg = txt.submit(add_text, [chatbot, txt], [chatbot, txt], queue=False).then(
+    #     bot, chatbot, chatbot
+    # )
+    # txt_msg.then(lambda: gr.update(interactive=True), None, [txt], queue=False)
+    # file_msg = btn.upload(add_file, [chatbot, btn], [chatbot], queue=False).then(
+    #     bot, chatbot, chatbot
+    # )
+    txt_msg = txt.submit(on_text_submit, [chatbot, txt], [chatbot, txt]).then(
+        None, 
+        None,  
+        [chatbot]
     )
-    txt_msg.then(lambda: gr.update(interactive=True), None, [txt], queue=False)
-    file_msg = btn.upload(add_file, [chatbot, btn], [chatbot], queue=False).then(
-        bot, chatbot, chatbot
+    file_msg = btn.upload(on_file_upload, [chatbot, btn], [chatbot]).then(
+        None,
+        None,
+        [chatbot]
     )
-
 demo.launch()