Update app.py

app.py

@@ -7,6 +7,7 @@ import asyncio
 from datetime import datetime, timedelta
 from bs4 import BeautifulSoup
 from sqlalchemy import select
+from fuzzywuzzy import fuzz
 from pydantic import BaseModel
 
 from fastapi import FastAPI, Request, HTTPException, BackgroundTasks, UploadFile, File, Form
@@ -252,23 +253,6 @@ async def log_order_tracking(order_id: str, status: str, message: str = None):
         session.add(tracking_entry)
         await session.commit()
 
-from fuzzywuzzy import fuzz
-
-
-def match_dish(user_input: str, threshold: int = 70) -> str:
-    best_match = None
-    best_score = 0
-    for item in menu_items:
-        dish_name = item["name"]
-        score = fuzz.token_sort_ratio(user_input.lower(), dish_name.lower())
-        if score > best_score:
-            best_score = score
-            best_match = dish_name
-    if best_score >= threshold:
-        return best_match
-    return None
-
-
 def calculate_shipping_cost(address: str) -> int:
     address_lower = address.lower()
     for area, cost in TOWN_SHIPPING_COSTS.items():
@@ -372,6 +356,19 @@ async def update_user_profile_with_order(user_id: str, order_id: str):
                 profile.order_ids = order_id
             await session.commit()
 
+def match_dish(user_input: str, threshold: int = 70) -> str:
+    best_match = None
+    best_score = 0
+    for item in menu_items:
+        dish_name = item["name"]
+        score = fuzz.token_sort_ratio(user_input.lower(), dish_name.lower())
+        if score > best_score:
+            best_score = score
+            best_match = dish_name
+    if best_score >= threshold:
+        return best_match
+    return None
+
 async def process_order_flow(user_id: str, message: str) -> str:
     state = user_state.get(user_id)
     if state and state.is_expired():
@@ -441,22 +438,22 @@ async def process_order_flow(user_id: str, message: str) -> str:
             else:
                 state.step = 2
                 return f"You selected {found_dish}. How many servings would you like?"
-    
+                
     # If state exists and we're already in order flow:
-        if state and state.flow == "order":
-            state.update_last_active()
-            if state.step == 1:
-                # Use fuzzy matching on the message in case of typos.
-                found_dish = match_dish(message)
-                numbers = re.findall(r'\d+', message)
-                if found_dish:
-                    state.data["dish"] = found_dish
-                    if numbers:
-                        quantity = int(numbers[0])
-                        if quantity <= 0:
-                            return "Please enter a valid quantity (e.g., 1, 2, 3)."
-                        state.data["quantity"] = quantity
-                        state.step = 3
+    if state and state.flow == "order":
+        state.update_last_active()
+        if state.step == 1:
+            # Use fuzzy matching on the message in case of typos.
+            found_dish = match_dish(message)
+            numbers = re.findall(r'\d+', message)
+            if found_dish:
+                state.data["dish"] = found_dish
+                if numbers:
+                    quantity = int(numbers[0])
+                    if quantity <= 0:
+                        return "Please enter a valid quantity (e.g., 1, 2, 3)."
+                    state.data["quantity"] = quantity
+                    state.step = 3
                     return (f"You selected {found_dish} with {quantity} serving(s). "
                             "Please provide your phone number and delivery address.")
                 else: