Update app.py

app.py

@@ -116,7 +116,7 @@ KEYWORD_OVERRIDE = {
     "goodbye": ["مع السلامة","مع السلامه","باي","وداعا","bye","goodbye","تصبح على خير",
                 "في امان الله","الله يسلمك","سلامتك"],
     "greeting":["السلام عليكم","وعليكم السلام","اهلا","أهلا","هلا","هلو","مرحبا","مرحباً",
-                "صباح الخير","مساء الخير","هاي","hi","hello","ازيك","اخبارك","عامل ايه","صباح","مساء"],
+                "صباح الخير","مساء الخير","هاي","hi","hello","صباح","مساء"],
     "thanks":  ["شكرا","شكراً","تسلم","يسلمو","ممنون","مشكور","thanks","thank","الف شكر"],
 }
 CATEGORY_KEYWORDS = {
@@ -1942,22 +1942,43 @@ _ITEM_TRIGGERS  = {
     "فراخ","فرخه","فرخة","فرخ","دجاج","لحمه","لحمة","لحم","كباب","كفته",
     "سمك","جمبري","بلطي","مشويات","مشوي","مشويه",
     # مشروبات وحلويات
-    "عصير","قهوه","قهوة","كوفي","تشيز كيك","واكو","كيك","تورته",
+    "عصير","قهوه","قهوة","كوفي","اسموزي","إسموزي","سموزي","سموذي","smoothie","تشيز كيك","واكو","كيك","تورته",
     # طلب بالاسم
     "عايز اكلة","عايزة اكلة","فين اكل",
 }
 
+_ITEM_SEARCH_PATTERNS = [
+    "مكان عنده", "مكان عندها", "اماكن عندها", "أماكن عندها",
+    "مطعم عنده", "كافيه عنده", "عنده", "عندها",
+    "بيعمل", "بتعمل", "بيقدم", "بتقدم", "فيه", "فيها",
+    "عايز", "عايزة", "عاوزه", "عاوز", "نفسي في", "بدور على", "فين",
+    "place has", "places have", "has", "serves", "serve", "where can i find"
+]
+
+def _looks_like_item_search(text: str) -> bool:
+    """Detect item/menu-item search even if the item word is not in our keywords."""
+    t = norm(text)
+    # menu display is different from item search
+    if any(kw in t for kw in _MENU_TRIGGERS) and not any(p in t for p in ["عنده", "عندها", "بيعمل", "بتعمل", "بيقدم", "بتقدم", "فيه", "فيها"]):
+        return False
+    has_item_pattern = any(norm(p) in t for p in _ITEM_SEARCH_PATTERNS)
+    category_context = infer_category(text) in ("restaurant", "cafe")
+    has_item_keyword = any(norm(kw) in t for kw in _ITEM_TRIGGERS)
+    candidate = extract_item_query(text)
+    # لو فيه صيغة طلب + باقي نص بعد الشيل يبقى غالبًا صنف، حتى لو مش في keywords
+    return bool(has_item_keyword or (has_item_pattern and candidate) or (category_context and has_item_pattern and candidate))
+
 def _detect_new_intent(text: str) -> str | None:
     """
     Detects search_by_item or show_menu from text.
     Returns intent string or None.
     """
     t = norm(text)
+    # item-search patterns take priority over menu, e.g. "مكان عنده اسموزي خوخ"
+    if _looks_like_item_search(text):
+        return "search_by_item"
     if any(kw in t for kw in _MENU_TRIGGERS):
         return "show_menu"
-    # item search: any food keyword present
-    if any(kw in t for kw in _ITEM_TRIGGERS):
-        return "search_by_item"
     return None
 
 # ════════════════════════════════════════════════════════════════
@@ -1976,6 +1997,7 @@ _FOOD_STOP_WORDS = {
     "عايز اكل","عايزة اكل","عايز اكلة","ابي اكل",
     # categories
     "منيو","menu","قائمه","قايمة","مطعم","مطاعم","كافيه","restaurant","cafe",
+    "مكان","اماكن","أماكن","محل","عنده","عندها","بيعمل","بتعمل","بيقدم","بتقدم","فيه","فيها",
     # حروف
     "في","من","على","عن","هنا","قريب","اقرب","حلو","كويس","رخيص",
 }
@@ -1984,8 +2006,40 @@ _FOOD_STOP_WORDS = {
 _ITEM_PHRASE_STRIP = [
     "عايز اكلة","عايزة اكلة","عايز اكل","عايزة اكل",
     "فين اكل","ابحث عن","بدور على","بدور عن",
+    "عايزه مكان عنده","عايزة مكان عنده","عايز مكان عنده","عاوز مكان عنده",
+    "عايزه مكان عندها","عايزة مكان عندها","عايز مكان عندها",
+    "مكان عنده","مكان عندها","مطعم عنده","كافيه عنده",
+    "عايزه","عايزة","عايز","عاوز","نفسي في",
 ]
 
+_ITEM_SYNONYMS = {
+    "اسموزي": ["اسموزي", "إسموزي", "سموزي", "سموذي", "smoothie"],
+    "سموزي": ["اسموزي", "إسموزي", "سموزي", "سموذي", "smoothie"],
+    "سموذي": ["اسموزي", "إسموزي", "سموزي", "سموذي", "smoothie"],
+    "فراخ": ["فراخ", "فرخة", "فرخه", "دجاج", "chicken"],
+    "فرخه": ["فراخ", "فرخة", "فرخه", "دجاج", "chicken"],
+    "دجاج": ["فراخ", "فرخة", "فرخه", "دجاج", "chicken"],
+    "ساندوتش": ["ساندوتش", "سندوتش", "sandwich"],
+    "سندوتش": ["ساندوتش", "سندوتش", "sandwich"],
+}
+
+def _stem_ar_word(w: str) -> str:
+    w = clean_text(w)
+    for sfx in ("ات", "ين", "ون", "ية", "يه", "ه", "ة", "ي", "ا"):
+        if w.endswith(sfx) and len(w) - len(sfx) >= 3:
+            return w[:-len(sfx)]
+    return w
+
+def _expand_item_query_words(item_query: str) -> list[str]:
+    words = [clean_text(w) for w in str(item_query).split() if len(clean_text(w)) > 1]
+    expanded = set(words)
+    for w in words:
+        expanded.add(_stem_ar_word(w))
+        for alt in _ITEM_SYNONYMS.get(w, []):
+            expanded.add(clean_text(alt))
+            expanded.add(_stem_ar_word(alt))
+    return [w for w in expanded if w]
+
 _MENU_PHRASE_STRIP = [
     "عايز اشوف منيو","عايزة اشوف منيو","عايز اشوف المنيو","عايزة اشوف المنيو",
     "هات منيو","هاتلي منيو","هاتلنا منيو",
@@ -2141,12 +2195,40 @@ def search_places_by_item(item_query: str) -> list[dict]:
     return places
 
 
+def _is_menu_item_object(p: dict) -> bool:
+    """True when backend returned menu-item rows, not place rows."""
+    if not isinstance(p, dict):
+        return False
+    has_item_keys = any(k in p for k in ("item_name", "subcategory_name", "sub_category", "price"))
+    has_place_keys = any(k in p for k in ("place_id", "lat", "lon", "location", "address", "rating", "opening_hours"))
+    return bool(has_item_keys and not has_place_keys)
+
+def _text_matches_item_query(text_blob: str, item_query: str) -> bool:
+    """Flexible token/stem/synonym matching for menu items."""
+    blob = clean_text(text_blob)
+    q_words = _expand_item_query_words(item_query)
+    # Ignore weak generic terms when deciding if the item itself matched.
+    weak = {"اكل", "اكله", "اكلة", "وجبه", "وجبة", "مشروب", "مشروبات", "مكان"}
+    q_words = [w for w in q_words if w not in weak and len(w) > 1]
+    if not q_words:
+        return True
+    blob_tokens = blob.split()
+    blob_stems = {_stem_ar_word(t) for t in blob_tokens}
+    hits = 0
+    for w in q_words:
+        sw = _stem_ar_word(w)
+        if w in blob or sw in blob_stems or any(sw and (sw in bt or bt in sw) for bt in blob_stems):
+            hits += 1
+    # For multi-word items like "اسموزي خوخ", one strong word is enough for broad recall,
+    # but two-word match is preferred and kept by backend ordering.
+    return hits >= 1
+
 def filter_item_results_strict(places: list, item_query: str) -> list:
     """
-    فلتر قوي لنتائج search_by_item:
-    - لو السؤال عن أكل: restaurants فقط.
-    - لو السؤال عن مشروب: cafe أو restaurant فقط.
-    - لازم الصنف نفسه يكون ظاهر في matched_items / sub_category / description / name.
+    Flexible but safe filter for search_by_item:
+    - understands unseen item names by matching returned menu text, not only fixed keywords.
+    - if backend returns menu-item rows with no parent place, keep matching items instead of false no_result.
+    - if backend/local returns place rows, apply category guard only when category exists.
     """
     if not places:
         return []
@@ -2154,34 +2236,36 @@ def filter_item_results_strict(places: list, item_query: str) -> list:
     q = clean_text(item_query)
 
     food_keywords = {
-        "شاورما", "برجر", "بيتزا", "كريب", "مشويات", "فراخ",
-        "دجاج", "كباب", "كفته", "كفتة", "سمك", "ساندوتش",
-        "سندوتش", "حواوشي", "كشري", "مكرونه", "مكرونة",
-        "وجبه", "وجبة", "اكل", "أكل", "burger", "pizza",
-        "shawarma", "crepe", "chicken", "grill", "grills"
+        "شاورما", "برجر", "بيتزا", "كريب", "مشويات", "فراخ", "دجاج",
+        "كباب", "كفته", "كفتة", "سمك", "ساندوتش", "سندوتش", "حواوشي",
+        "كشري", "مكرونه", "مكرونة", "وجبه", "وجبة", "اكل", "أكل",
+        "burger", "pizza", "shawarma", "crepe", "chicken", "grill", "grills"
     }
 
     drink_keywords = {
-        "قهوة", "قهوه", "كوفي", "عصير", "مشروب", "مشروبات",
-        "لاتيه", "اسبريسو", "نسكافيه", "سموذي",
+        "قهوة", "قهوه", "كوفي", "عصير", "مشروب", "مشروبات", "لاتيه",
+        "اسبريسو", "نسكافيه", "سموذي", "سموزي", "اسموزي", "إسموزي",
         "coffee", "juice", "latte", "espresso", "smoothie"
     }
 
     is_food = any(clean_text(w) in q for w in food_keywords)
     is_drink = any(clean_text(w) in q for w in drink_keywords)
 
-    query_words = [w for w in q.split() if len(w) > 2]
     filtered = []
-
     for p in places:
+        if not isinstance(p, dict):
+            continue
+
         raw_category = str(p.get("category", ""))
         category = normalize_category(raw_category)
 
         text_blob = clean_text(
+            f"{p.get('item_name','')} "
             f"{p.get('name','')} "
             f"{p.get('name_ar','')} "
             f"{p.get('name_en','')} "
             f"{p.get('category','')} "
+            f"{p.get('subcategory_name','')} "
             f"{p.get('sub_category','')} "
             f"{p.get('description','')} "
             f"{p.get('matched_item','')} "
@@ -2190,26 +2274,34 @@ def filter_item_results_strict(places: list, item_query: str) -> list:
             f"{p.get('tags','')}"
         )
 
-        if is_food and category != "restaurant" and not _category_match_value(raw_category, "restaurant"):
+        if not _text_matches_item_query(text_blob, item_query):
             continue
 
-        if is_drink and not (
+        # If this is a pure menu item row, don't reject it because it has no place category.
+        if _is_menu_item_object(p):
+            filtered.append(p)
+            continue
+
+        # Place rows: keep category safe when the item type is clear.
+        if is_food and raw_category and category != "restaurant" and not _category_match_value(raw_category, "restaurant"):
+            continue
+
+        if is_drink and raw_category and not (
             category in ("cafe", "restaurant") or
             _category_match_value(raw_category, "cafe") or
             _category_match_value(raw_category, "restaurant")
         ):
             continue
 
-        if query_words and not any(w in text_blob for w in query_words):
-            continue
-
         filtered.append(p)
 
-    # dedup
+    # dedup; for menu items use id+name+price, for places use place_id.
     seen, unique = set(), []
     for p in filtered:
-        pid = str(p.get("place_id") or p.get("id") or p.get("name") or "")
-        if pid and pid not in seen:
+        pid = str(p.get("place_id") or p.get("placeId") or p.get("place_id_id") or "")
+        if not pid:
+            pid = f"item:{p.get('id','')}:{p.get('item_name') or p.get('name','')}:{p.get('price','')}"
+        if pid not in seen:
             seen.add(pid)
             unique.append(p)
     return unique
@@ -2307,7 +2399,8 @@ def _sort_places_by_distance(places: list[dict], user_lat=None, user_lon=None) -
 def format_item_search_response(places: list[dict], item_query: str, user_lat=None, user_lon=None) -> dict:
     """
     Builds the structured response for search_by_item intent.
-    Flutter reads: ui_type='places_cards', place_cards=[...]
+    Preferred output is places_cards when parent places are available.
+    If backend returns menu-item rows only, return menu_list so the matched item is not lost.
     """
     if not places:
         return {
@@ -2315,23 +2408,39 @@ def format_item_search_response(places: list[dict], item_query: str, user_lat=No
             "intent":      "search_by_item",
             "ui_type":     CFG.UI_TEXT_ONLY,
             "place_cards": [],
+            "menu_items":  [],
             "best_place":  None,
         }
+
+    # Backend sometimes returns menu-item rows without parent place data.
+    # In this case, showing the matched menu items is better than saying no_result.
+    if all(_is_menu_item_object(p) for p in places):
+        items = [_fmt_menu_item(i) for i in places[:20]]
+        return {
+            "reply":       f"لقيت أصناف مطابقة لـ *{item_query}* 👇",
+            "intent":      "search_by_item",
+            "ui_type":     CFG.UI_MENU_LIST,
+            "place_cards": [],
+            "menu_items":  items,
+            "best_place":  None,
+        }
+
     places = _sort_places_by_distance(places, user_lat, user_lon)
     cards = [clean_place(p) for p in places[:CFG.MAX_CARDS]]
     # dedup
     seen, unique = set(), []
     for c in cards:
-        pid = c.get("place_id") or c.get("id")
+        pid = c.get("place_id") or c.get("id") or c.get("name")
         if pid not in seen:
             seen.add(pid)
             unique.append(c)
-    reply = f"🍽️ لاقيتلك {len(unique)} مطعم فيه *{item_query}* — اختار:"
+    reply = f"🍽️ لاقيتلك {len(unique)} مكان فيه *{item_query}* — اختار:"
     return {
         "reply":       reply,
         "intent":      "search_by_item",
         "ui_type":     CFG.UI_PLACES_CARDS,
         "place_cards": unique,
+        "menu_items":  [],
         "best_place":  unique[0] if unique else None,
     }
 
@@ -2647,7 +2756,7 @@ def chat_endpoint(req: ChatRequest):
             ui_type=res.get("ui_type", CFG.UI_TEXT_ONLY),
             best_place=res.get("best_place"),
             place_cards=res.get("place_cards", []),
-            menu_items=[],
+            menu_items=res.get("menu_items", []),
         )
 
     if new_intent == "show_menu":