Update app.py

app.py

@@ -38,9 +38,9 @@ class BasicTutor:
         self.conversation_memory.append([user_message, None])
         self.flattened_conversation = self.flattened_conversation + '\n\n' + 'User: ' + user_message
 
-    def get_tutor_reply(self):
+    def get_tutor_reply(self, user_message):
         # get tutor message
-        tutor_message = "Yes"
+        tutor_message = "You said: " + user_message
         # add tutor message to conversation memory
         self.conversation_memory[-1][1] = tutor_message
         self.flattened_conversation = self.flattened_conversation + '\nAI: ' + tutor_message
@@ -49,30 +49,23 @@ class BasicTutor:
         self.conversation_memory = []
         self.flattened_conversation = ''
 
-### Chatbot Functions ###
+# history is a list of list  
+# [[user_input_str, bot_response_str], ...]
 
+### Chatbot Functions ###
 def add_user_message(user_message, chat_tutor):
   """Display user message and update chat history to include it."""
   chat_tutor.add_user_message(user_message)
-  return chat_tutor.conversation_memory, chat_tutor
-
-def get_tutor_reply(chat_tutor):
-  chat_tutor.get_tutor_reply()
-  return chat_tutor.conversation_memory, chat_tutor
+  return gr.update(value="", interactive=False), chat_tutor.conversation_memory, chat_tutor
 
-# history is a list of list  [[user_input_str, bot_response_str], ...]
-def user(user_message, history):
-    return "", history + [[user_message, None]]
+def get_tutor_reply(user_message, chat_tutor):
+  chat_tutor.get_tutor_reply(user_message)
+  return gr.update(value="", interactive=True), chat_tutor.conversation_memory, chat_tutor
 
-def bot(history):
-    user_message = history[-1][0]
-    bot_message = "You typed: " + user_message
-    history[-1][1] = bot_message
-    return history
 
 with gr.Blocks() as demo:
     #initialize tutor (with state)
-    #study_tutor = gr.State(BasicTutor())
+    study_tutor = gr.State(BasicTutor())
         
     # Chatbot interface
     gr.Markdown("""
@@ -89,9 +82,10 @@ with gr.Blocks() as demo:
         with gr.Column():
             clear = gr.Button("Clear")
     
-    user_chat_submit.click(user, [user_chat_input, chatbot], [user_chat_input, chatbot], queue=False).then(
-        bot, chatbot, chatbot
-    )
+    user_chat_submit.click(add_user_message,
+            [user_chat_input, study_tutor],
+            [user_chat_input, chatbot, study_tutor], queue=False) \
+      .then(get_tutor_reply, [user_chat_input, study_tutor], [user_chat_input, chatbot, study_tutor], queue=True)
     
     with gr.Blocks():
         gr.Markdown("""
@@ -101,14 +95,12 @@ with gr.Blocks() as demo:
         with gr.Row():
           export_dialogue_button_json = gr.Button("JSON")
           export_dialogue_button_txt = gr.Button("TXT")
-          export_dialogue_button_csv = gr.Button("CSV")
         
         file_download = gr.Files(label="Download here",
-                                file_types=['.txt', '.csv', '.json'], type="file", visible=False)
+                                file_types=['.txt', '.json'], type="file", visible=False)
         
         export_dialogue_button_json.click(save_json, study_tutor, file_download, show_progress=True)
         export_dialogue_button_txt.click(save_txt, study_tutor, file_download, show_progress=True)
-        export_dialogue_button_csv.click(save_csv, study_tutor, file_download, show_progress=True)
     
 demo.queue()
 demo.launch()