fix/concurrent-form-info

src/chatbot/app_interface.py

@@ -1,6 +1,6 @@
 import gradio as gr
 from graph_manager import user_input_handler
-from nodes import form_info, get_form_info, set_form_info
+from nodes import session_form_data, get_form_info, set_form_info
 import ast
 import uuid
 import logging
@@ -14,7 +14,6 @@ def generate_session_id():
     session_id = str(uuid.uuid4())
     return session_id, f"Session ID: {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():
@@ -81,9 +80,9 @@ def is_form_complete(form_info_dict):
     return gr.update(interactive=True)
 
 def update_field_input(key):
-    def inner(value):
-        set_form_info(key, value)
-        return get_form_info()
+    def inner(session_id, value):
+        set_form_info(session_id, key, value)
+        return get_form_info(session_id)
     return inner
 
 def update_form_information_handler(form_information):
@@ -113,8 +112,8 @@ def update_form_information_handler(form_information):
         total_payment_amount_input, expense_description_input
     )
 
-def handle_submit():
-    form_data = get_form_info()
+def handle_submit(session_id):
+    form_data = get_form_info(session_id)
     required_fields = [
         "Associated Deliverable", "Seller Name", "Seller Address", "Seller Phone Number",
         "Buyer Name", "Buyer Address", "Transaction Date", "Total Payment Amount", "Expense Description"
@@ -139,15 +138,18 @@ def chat_handler(message,history,session_id):
             response = user_input_handler(message['text'], session_id)
         except Exception as e:
             raise e
-    form_information = get_form_info()
+    form_information = get_form_info(session_id)
     update_form_information_handler(form_information)
     return response, form_information
 
 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...") 
+        form_information = gr.State({})
+
+        with gr.Row():
+            session_id_display = gr.Markdown("Session ID: Loading...")
+
         new_btn = gr.Button("Reset", variant="primary")
         with gr.Tabs():
             with gr.Tab("Chat"):
@@ -167,36 +169,36 @@ def create_expense_register_page():
                 gr.Markdown("**Deliverable**")
                 deliverable_dropdown = gr.Dropdown(choices=get_deliverable_titles(), filterable=False, container=False)
                 gr.Markdown("**Seller Name**")
-                seller_name_input = gr.Textbox(value=ast.literal_eval(form_info["Seller Name"]), label="", container=False)
+                seller_name_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Seller Name"]), label="", container=False)
                 gr.Markdown("**Seller Address**")
-                seller_address_input = gr.Textbox(value=ast.literal_eval(form_info["Seller Address"]), label="", container=False)
+                seller_address_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Seller Address"]), label="", container=False)
                 gr.Markdown("**Seller Phone Number**")
-                seller_phone_number_input = gr.Textbox(value=ast.literal_eval(form_info["Seller Phone Number"]), label="", container=False)
+                seller_phone_number_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Seller Phone Number"]), label="", container=False)
                 gr.Markdown("**Buyer Name**")
-                buyer_name_input = gr.Textbox(value=ast.literal_eval(form_info["Buyer Name"]), label="", container=False)
+                buyer_name_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Buyer Name"]), label="", container=False)
                 gr.Markdown("**Buyer Address**")
-                buyer_address_input = gr.Textbox(value=ast.literal_eval(form_info["Buyer Address"]), label="", container=False)
+                buyer_address_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Buyer Address"]), label="", container=False)
                 gr.Markdown("**Transaction Date**")
                 transaction_date_input = gr.DateTime(include_time=False, type="datetime", show_label=False)
                 gr.Markdown("**Total Payment Amount**")
                 with gr.Row():
-                    total_payment_amount_input = gr.Number(value=ast.literal_eval(form_info['Total Payment Amount']), label="", container=False)
+                    total_payment_amount_input = gr.Number(value=ast.literal_eval(session_form_data[session_id]['Total Payment Amount']), label="", container=False)
                     gr.Markdown("Baht")
                 gr.Markdown("**Expense Description**")
-                expense_description_input = gr.Textbox(value=ast.literal_eval(form_info["Expense Description"]), label="", container=False, lines=4)
+                expense_description_input = gr.Textbox(value=ast.literal_eval(session_form_data[session_id]["Expense Description"]), label="", container=False, lines=4)
                 
                 feedback_message = gr.Markdown("", visible=False)
                 submit_btn = gr.Button("Submit", variant="primary")
 
-                deliverable_dropdown.change(update_field_input("Associated Deliverable"), inputs=[deliverable_dropdown], outputs=[form_information],queue=False)
-                seller_name_input.change(update_field_input("Seller Name"), inputs=[seller_name_input], outputs=[form_information],queue=False)
-                seller_address_input.change(update_field_input("Seller Address"), inputs=[seller_address_input], outputs=[form_information],queue=False)
-                seller_phone_number_input.change(update_field_input("Seller Phone Number"), inputs=[seller_phone_number_input], outputs=[form_information],queue=False)
-                buyer_name_input.change(update_field_input("Buyer Name"), inputs=[buyer_name_input], outputs=[form_information],queue=False)
-                buyer_address_input.change(update_field_input("Buyer Address"), inputs=[buyer_address_input], outputs=[form_information],queue=False)
-                transaction_date_input.change(update_field_input("Transaction Date"), inputs=[transaction_date_input], outputs=[form_information],queue=False)
-                total_payment_amount_input.change(update_field_input("Total Payment Amount"), inputs=[total_payment_amount_input], outputs=[form_information],queue=False)
-                expense_description_input.change(update_field_input("Expense Description"), inputs=[expense_description_input], outputs=[form_information],queue=False)
+                deliverable_dropdown.change(update_field_input("Associated Deliverable"), inputs=[session_id, deliverable_dropdown], outputs=[form_information],queue=False)
+                seller_name_input.change(update_field_input("Seller Name"), inputs=[session_id, seller_name_input], outputs=[form_information],queue=False)
+                seller_address_input.change(update_field_input("Seller Address"), inputs=[session_id, seller_address_input], outputs=[form_information],queue=False)
+                seller_phone_number_input.change(update_field_input("Seller Phone Number"), inputs=[session_id, seller_phone_number_input], outputs=[form_information],queue=False)
+                buyer_name_input.change(update_field_input("Buyer Name"), inputs=[session_id, buyer_name_input], outputs=[form_information],queue=False)
+                buyer_address_input.change(update_field_input("Buyer Address"), inputs=[session_id, buyer_address_input], outputs=[form_information],queue=False)
+                transaction_date_input.change(update_field_input("Transaction Date"), inputs=[session_id, transaction_date_input], outputs=[form_information],queue=False)
+                total_payment_amount_input.change(update_field_input("Total Payment Amount"), inputs=[session_id, total_payment_amount_input], outputs=[form_information],queue=False)
+                expense_description_input.change(update_field_input("Expense Description"), inputs=[session_id, expense_description_input], outputs=[form_information],queue=False)
 
                 form_information.change(
                     update_form_information_handler,
@@ -208,27 +210,40 @@ def create_expense_register_page():
                     ],
                     queue=False,
                 )
-                submit_btn.click(fn=handle_submit, inputs=[], outputs=[feedback_message])
+                submit_btn.click(fn=handle_submit, inputs=[session_id], outputs=[feedback_message])
 
         def reset_chat():
-            new_session_id , new_session_id_display = generate_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()
+
+            # Reset the state dictionary for the new session
+            session_form_data[new_session_id] = {
+                "Associated Deliverable": "None",
+                "Seller Name": "",
+                "Seller Address": "",
+                "Seller Phone Number": "",
+                "Buyer Name": "",
+                "Buyer Address": "",
+                "Transaction Date": None,
+                "Total Payment Amount": None,
+                "Expense Description": "",
+            }
+
             return (
                 new_session_id,
                 new_session_id_display,
-                _chat_prefill,      # ChatInterface.chatbot_value
-                form_info,          # State(form_info)
+                _chat_prefill,
+                session_form_data[new_session_id],  # return the new form state
                 "None",             # deliverable_dropdown
                 "",                 # seller_name_input
                 "",                 # seller_address_input
                 "",                 # seller_phone_number_input
                 "",                 # buyer_name_input
                 "",                 # buyer_address_input
-                None,               # transaction_date_input (a DateTime)
-                None,               # total_payment_amount_input (a Number)
+                None,               # transaction_date_input
+                None,               # total_payment_amount_input
                 "",                 # expense_description_input
-                gr.update(visible=False, value="")  # hide/clear any feedback_message
+                gr.update(visible=False, value="")  # feedback_message
             )
         
         new_btn.click(

src/chatbot/nodes.py

@@ -6,6 +6,7 @@ from langgraph.graph.message import add_messages
 from langchain.tools import tool
 from langgraph.prebuilt import create_react_agent, ToolNode
 from langgraph.checkpoint.memory import MemorySaver
+from langchain_core.runnables import RunnableConfig
 
 # from chatbot.llm_engine import llm_overall_agent, generate_expense_info_feedback
 from llm_engine import (
@@ -23,6 +24,7 @@ import ast
 import json
 import sqlite3
 import os
+from collections import defaultdict
 
 # conn = sqlite3.connect(r'C:\Users\Gavin\Desktop\hello-earth\db\project_data.db')
 db_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'database', 'hello_earth_data_2.db')
@@ -30,22 +32,17 @@ conn = sqlite3.connect(db_path)
 cursor = conn.cursor()
 
 # placeholder, init empty form info
-form_info = {
-        "Seller Name": 'None',
-        "Seller Address": 'None',
-        "Seller Phone Number": 'None',
-        "Buyer Name": 'None',
-        "Buyer Address": 'None',
-        "Transaction Date": 'None',
-        "Total Payment Amount": 'None',
-        # "Payment Details Table": {
-        #     "Column Headers": [],
-        #     "Row Entries": [],
-        # },
-        # "Incompleteness Description": 'None',
-        "Associated Deliverable": 'None',
-        "Expense Description": 'None',
-    }
+session_form_data = defaultdict(lambda: {
+    "Seller Name": 'None',
+    "Seller Address": 'None',
+    "Seller Phone Number": 'None',
+    "Buyer Name": 'None',
+    "Buyer Address": 'None',
+    "Transaction Date": 'None',
+    "Total Payment Amount": 'None',
+    "Associated Deliverable": 'None',
+    "Expense Description": 'None',
+})
 
 # define the project_deliverables from the db
 # cursor.execute("SELECT title FROM deliverables")
@@ -54,11 +51,14 @@ rows = cursor.fetchall()
 deliverable_titles = [row[0] for row in rows]
 print(f"deliverable_titles: {deliverable_titles}")
 
-def get_form_info():
-    return form_info
+def get_form_info(session_id):
+    return session_form_data[session_id]
 
-def set_form_info(key, value):
-    form_info[key] = value
+def set_form_info(session_id, key, value):
+    print("set form info")
+    session_form_data[session_id][key] = value
+    print(session_id)
+    print(session_form_data[session_id])
 
 class State(TypedDict):
     messages: Annotated[list, add_messages]
@@ -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) -> str:
+def apply_ocr(image_path: str, config: RunnableConfig) -> str:
     """
     Use this tool when the user provides an image path.
     Apply optical-character-recognition (OCR) to the image and initalize the form information.
@@ -82,10 +82,11 @@ def apply_ocr(image_path: str) -> str:
     """
     print("using apply_ocr tool")
 
+    session_id = config["configurable"].get("thread_id")
+
     temp_form_info = receipt_kie(image_path)
 
-    # print(type(temp_form_info))
-    # print(temp_form_info)
+    form_info = session_form_data[session_id]
 
     for key in temp_form_info.keys():
         if key in form_info:
@@ -109,7 +110,7 @@ def apply_ocr(image_path: str) -> str:
     """
 
 @tool
-def edit_form(key: str, value: str) -> str:
+def edit_form(key: str, value: str, config: RunnableConfig) -> str:
     """
     This is used to edit the form data.
     The key must be one of the keys in the form_info dictionary.
@@ -119,16 +120,20 @@ def edit_form(key: str, value: str) -> str:
     """
     print("using edit_form tool")
 
+    session_id = config["configurable"].get("thread_id")
+
+    form_info = session_form_data[session_id]
+
     if key in form_info:
         form_info[key] = value
         print(form_info)
         print(f"Updated {key} to {value}")
         if key == "Expense Description":
-            feedback = expense_description_feedback(value)
+            feedback = expense_description_feedback(form_info, value)
         elif key == "Associated Deliverable":
-            res = map_associated_deliverable(value, deliverable_titles) # llm function that maps the user text to a project deliverable
-            if res == "No Matching Deliverable": # if no matching deliverable, 
-                form_info[key] = "None" # set the associated deliverable to None
+            res = map_associated_deliverable(value, deliverable_titles)
+            if res == "No Matching Deliverable":
+                form_info[key] = "None"
                 feedback = "A valid associated deliverable is required."
             else:
                 form_info[key] = res
@@ -152,12 +157,18 @@ def edit_form(key: str, value: str) -> str:
         return f"Invalid key: {key}. No changes made."
     
 @tool
-def inspect_form() -> str:
+def inspect_form(config: RunnableConfig) -> 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")
+
+    session_id = config["configurable"].get("thread_id")
+    form_info = session_form_data[session_id]
+    print("session_id:",session_id)
+    print("form_info:",form_info)
+
     return f"""
     <form_status>
     {form_info}
@@ -201,7 +212,7 @@ def auditor_feedback(form_info):
     response = generate_expense_info_feedback(acceptance_criteria, form_info)
     return response
 
-def expense_description_feedback(expense_description):
+def expense_description_feedback(form_info, expense_description):
     response = generate_expense_description_feedback(form_info["Associated Deliverable"], expense_description)
     return response