fix/session-id-and-inspect-tool-bug

src/chatbot/app_interface.py

@@ -11,9 +11,10 @@ logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)
 
 def generate_session_id():
-    return str(uuid.uuid4())
+    session_id = str(uuid.uuid4())
+    return session_id, f"Session ID: {session_id}"
 
-CURRENT_SESSION_ID = generate_session_id()
+# CURRENT_SESSION_ID = generate_session_id()
 DB_PATH = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'database', 'hello_earth_data_2.db')
 
 def connect_db():
@@ -128,14 +129,14 @@ _chat_prefill = [
     {"role": "assistant", "content": "Hello, my name is Emmie. I'm happy to help you with submitting your expense items. You can start by uploading a picture of one bill."}
 ]
 
-def chat_handler(message, history):
-    global CURRENT_SESSION_ID
+def chat_handler(message,history,session_id):
+    # global CURRENT_SESSION_ID
     logger.info(f"Received message: {message}")
     if len(message['files']) > 0:
-        response = user_input_handler(str(message['files'][0]), CURRENT_SESSION_ID)
+        response = user_input_handler(str(message['files'][0]), session_id)
     elif message['text'] != "":
         try:
-            response = user_input_handler(message['text'], CURRENT_SESSION_ID)
+            response = user_input_handler(message['text'], session_id)
         except Exception as e:
             raise e
     form_information = get_form_info()
@@ -144,7 +145,9 @@ def chat_handler(message, history):
 
 def create_expense_register_page():
     with gr.Blocks() as page:
+        session_id = gr.State("")
         form_information = gr.State(form_info)
+        session_id_display = gr.Markdown("Session ID: Loading...") 
         new_btn = gr.Button("Reset", variant="primary")
         with gr.Tabs():
             with gr.Tab("Chat"):
@@ -156,6 +159,7 @@ def create_expense_register_page():
                     submit_btn="Send Message",
                     autofocus=True,
                     examples=None,
+                    additional_inputs=[session_id],
                     additional_outputs=[form_information]
                 )
 
@@ -207,11 +211,12 @@ def create_expense_register_page():
                 submit_btn.click(fn=handle_submit, inputs=[], outputs=[feedback_message])
 
         def reset_chat():
-            global CURRENT_SESSION_ID
-            CURRENT_SESSION_ID = generate_session_id()
-            logger.info(f"Chat reset with new session ID: {CURRENT_SESSION_ID}")
+            new_session_id , new_session_id_display = generate_session_id()
+            logger.info(f"Chat reset with new session ID: {new_session_id}")
             form_info.clear()
             return (
+                new_session_id,
+                new_session_id_display,
                 _chat_prefill,      # ChatInterface.chatbot_value
                 form_info,          # State(form_info)
                 "None",             # deliverable_dropdown
@@ -230,6 +235,8 @@ def create_expense_register_page():
             fn=reset_chat,
             inputs=[],
             outputs=[
+                session_id,
+                session_id_display,
                 chat_interface.chatbot_value,
                 form_information,
                 deliverable_dropdown,
@@ -244,7 +251,8 @@ def create_expense_register_page():
                 feedback_message
             ],
         )
-        
+
+        page.load(generate_session_id, outputs=[session_id, session_id_display])
     return page
 
 if __name__ == "__main__":

src/chatbot/nodes.py

@@ -74,7 +74,7 @@ class State(TypedDict):
 
 # session_id: str might need to be added later when there are concurrent users
 @tool
-def apply_ocr(image_path: str) -> dict:
+def apply_ocr(image_path: str) -> str:
     """
     Use this tool when the user provides an image path.
     Apply optical-character-recognition (OCR) to the image and initalize the form information.
@@ -109,7 +109,7 @@ def apply_ocr(image_path: str) -> dict:
     """
 
 @tool
-def edit_form(key: str, value: str) -> dict:
+def edit_form(key: str, value: str) -> str:
     """
     This is used to edit the form data.
     The key must be one of the keys in the form_info dictionary.
@@ -152,13 +152,13 @@ def edit_form(key: str, value: str) -> dict:
         return f"Invalid key: {key}. No changes made."
     
 @tool
-def inspect_form() -> dict:
+def inspect_form() -> str:
     """
     This is used to inspect the form data.
     Use this when you need to address any inquiries the user might have about the current state of the form.
     """
     print("using inspect_form tool")
-    return """
+    return f"""
     <form_status>
     {form_info}
     </form_status>