Update app.py

app.py

@@ -37,77 +37,54 @@ def get_tutor_reply(user_message, chat_tutor):
 def get_conversation_history(chat_tutor):
     return chat_tutor.conversation_memory, chat_tutor
         
-def student_interface(): 
-    with gr.Blocks() as demo:
-        #initialize tutor (with state)
-        study_tutor = gr.State(EchoingTutor())
-    
-        # API Authentication
-        # Instead of ask students to provide key, the key is now directly provided by the instructor
-        embed_key(os.environ.get("OPENAI_API_KEY"), study_tutor)
-        
-        # Chatbot interface
-        gr.Markdown("""
-        ## Chat with the Model
-        Description here
-        """)
-    
-        with gr.Row(equal_height=True):
-            with gr.Column(scale=2):
-              chatbot = gr.Chatbot()
-              with gr.Row():
-                user_chat_input = gr.Textbox(label="User input", scale=9)
-                user_chat_submit = gr.Button("Ask/answer model", scale=1)
-        
-        user_chat_submit.click(add_user_message, 
-                               [user_chat_input, study_tutor], 
-                               [chatbot, study_tutor], queue=False).then(
-            get_tutor_reply, [user_chat_input, study_tutor], [user_chat_input, chatbot, study_tutor], queue=True)
-    
-        # Testing purpose
-        test_btn = gr.Button("View your chat history")
-        chat_history = gr.JSON(label = "conversation history")
-        test_btn.click(get_conversation_history, inputs=[study_tutor], outputs=[chat_history, study_tutor])
-        
-        with gr.Blocks():
-            gr.Markdown("""
-            ## Export Your Chat History
-            Export your chat history as a .json, .txt, or .csv file
-            """)
-            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=['.json', '.txt', '.csv'], 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)
 
-    return demo.queue().launch(server_name='0.0.0.0', server_port=7860)
+with gr.Blocks() as demo:
+    #initialize tutor (with state)
+    study_tutor = gr.State(EchoingTutor())
 
+    # API Authentication
+    # Instead of ask students to provide key, the key is now directly provided by the instructor
+    embed_key(os.environ.get("OPENAI_API_KEY"), study_tutor)
+    
+    # Chatbot interface
+    gr.Markdown("""
+    ## Chat with the Model
+    Description here
+    """)
 
-def instructor_interface(): 
-    with gr.Blocks() as demo:
-        gr.Markdown("Nothing yet")
+    with gr.Row(equal_height=True):
+        with gr.Column(scale=2):
+          chatbot = gr.Chatbot()
+          with gr.Row():
+            user_chat_input = gr.Textbox(label="User input", scale=9)
+            user_chat_submit = gr.Button("Ask/answer model", scale=1)
+    
+    user_chat_submit.click(add_user_message, 
+                           [user_chat_input, study_tutor], 
+                           [chatbot, study_tutor], queue=False).then(
+        get_tutor_reply, [user_chat_input, study_tutor], [user_chat_input, chatbot, study_tutor], queue=True)
 
-    return demo.queue().launch(server_name='0.0.0.0', server_port=7860)
+    # Testing purpose
+    test_btn = gr.Button("View your chat history")
+    chat_history = gr.JSON(label = "conversation history")
+    test_btn.click(get_conversation_history, inputs=[study_tutor], outputs=[chat_history, study_tutor])
+    
+    with gr.Blocks():
+        gr.Markdown("""
+        ## Export Your Chat History
+        Export your chat history as a .json, .txt, or .csv file
+        """)
+        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=['.json', '.txt', '.csv'], type="file", visible=False)
         
-def main():
-    role_selection = gr.Interface(
-        [gr.Dropdown(["Student", "Instructor"], label="Select Your Role")],
-        [gr.Textbox("text", label="Output")],
-        lambda role: role,
-    )
+        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)
 
-    role = role_selection.launch()
-    
-    if role == "Student":
-        student_interface()
-    elif role == "Instructor":
-        instructor_interface()
 
-if __name__ == "__main__":
-    main()
+demo.queue().launch(server_name='0.0.0.0', server_port=7860)