Update main.py

main.py

@@ -293,23 +293,25 @@ async def process_query(query: str,
         if match:
             waybill_number = match.group(0)
             print(waybill_number)
+            # Fetch order ID and order details
+            try:
+                order_id = get_order_id(waybill_number)
+                full_data = await get_all_order_data(order_id)
+                # Generate final response based on collected data
+                response_message = [
+                    {"role": "system", "content": "You are a helpful assistant for Curfox delivery system."},
+                    {"role": "user", "content": f"Answer based on the provided data only. Data: {full_data}. User query: {query}"}
+                ]
+                result = ask_openai(response_message)
+            except Exception as e:
+                result = str(e)
         else:
             print("Waybill number not correct.")
-            return "Waybill number not correct."
+            result = "Waybill number not correct."
+
+
+
 
-        # Fetch order ID and order details
-        try:
-            order_id = get_order_id(waybill_number)
-            full_data = await get_all_order_data(order_id)
-        except Exception as e:
-            return {"error": str(e)}
-
-        # Generate final response based on collected data
-        response_message = [
-            {"role": "system", "content": "You are a helpful assistant for Curfox delivery system."},
-            {"role": "user", "content": f"Answer based on the provided data only. Data: {full_data}. User query: {query}"}
-        ]
-        result = ask_openai(response_message)
         
     if thread_id==None:
         return {"meta_data":insert_newchat(user_name,query,result),"answer": result}