Update app.py

app.py

@@ -222,52 +222,50 @@ db_agent = create_sql_agent(
 # ================================================================
 def _query_id_match(cust_id: str, query: str) -> bool:
     """Verify that cust_id exists in at least one expected table."""
+    import sqlite3, re
+    import pandas as pd
+
     # STEP 1: Resolve file path and connect to SQLite
     conn = sqlite3.connect("customer_orders.db")
     cur = conn.cursor()
 
-    # Step 2: Run SQL directly using the connection
+    # STEP 2: Fetch order IDs linked to the customer
     qc = f"SELECT order_id FROM orders WHERE cust_id='{cust_id}';"
-    db_order_id = pd.read_sql_query(qc, conn)
+    db_order_id_df = pd.read_sql_query(qc, conn)
+
+    # Convert the DataFrame to a list of order IDs (strings)
+    db_order_ids = db_order_id_df["order_id"].astype(str).tolist()
 
-    # STEP 3:
-    # Extract customer ID if present in the query
+    # STEP 3: Initialize tracking variables
     return_value = True
     qc_cid = []
     cidcnt = 0
+    qc_oid = []
+    oidcnt = 0
+
+    # STEP 3A: Extract customer ID from user query
     for match in re.findall(r"\bC\d{4}\b", query, flags=re.IGNORECASE):
         if match:
             cidcnt += 1
             qc_cid = match.upper()
-            print('qc_cid = ', qc_cid)
+            print("qc_cid =", qc_cid)
             if qc_cid != cust_id:
                 return_value = False
 
-    # Extract order ID if present in the query
-    qc_oid = []
-    oidcnt = 0
+    # STEP 3B: Extract order ID from user query
     for match in re.findall(r"\bO\d{5}\b", query, flags=re.IGNORECASE):
         if match:
             oidcnt += 1
             qc_oid = match.upper()
-            if qc_oid != db_order_id:
+            # ✅ Compare safely: check if the order exists in DB list
+            if qc_oid not in db_order_ids:
                 return_value = False
 
-    if qc_oid == [] and qc_cid == [] and return_value == True:
-        return_value = True
-
+    # STEP 3C: Reject multiple conflicting IDs in same query
     if oidcnt > 1 or cidcnt > 1:
         return_value = False
 
-    #print('hello = ', hello)
-    #print('return_value = ', return_value)
-    #print('qc_cid = ', qc_cid)
-    #print('qc_oid = ', qc_oid)
-    #print('db_order_id = ', db_order_id)
-    #print('cust_id = ', cust_id)
-    #print('query = ', query)
-
-    # STEP 4: Close connection if not found
+    # STEP 4: Clean up and return result
     conn.close()
     return return_value