Upload app.py

app.py

@@ -38,12 +38,9 @@ MEMORY_FILE = "navigation_memory.json"
 GRID_0_FILE = "floor_0_grid.npy"
 GRID_1_FILE = "floor_0_grid.npy"
 
-OPENROUTER_KEY =os.getenv("OPENROUTER_KEY")
-OPENROUTER_MODEL = "arcee-ai/trinity-large-preview:free"
+OPENROUTER_KEY   = "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"
+OPENROUTER_MODEL = "tencent/hy3-preview:free"
 
-# ============================================================
-# DATA LOADING
-# ============================================================
 def load_json_file(path, default):
     try:
         with open(path, "r", encoding="utf-8") as f:
@@ -232,7 +229,7 @@ Mall stores:
 Rules:
 - If the user asks about a store, answer with store information.
 - If the user asks for navigation, help them navigate.
-- If the user says they are hungry, suggest kitchen / dining / food-related stores.
+- If the user says he is hungry, suggest kitchen / dining / food-related stores and when he tells you that he agree os suggestion then help him navigate.
 - Keep answers concise and helpful.
 """
 
@@ -474,17 +471,25 @@ def save_navigation(username, start_room, dest_room):
 # ============================================================
 # STORE RECOMMENDATION
 # ============================================================
-def nearest_store(user_pos):
+def nearest_store(user_pos, user_floor):
     best_room = None
     best_dist = float("inf")
+
     for _, room in STORE_CLUSTER_ROOM.items():
+        # ✅ فلترة على نفس الدور
+        if get_floor(room) != user_floor:
+            continue
+
         centroid = get_centroid(room)
         if centroid is None:
             continue
+
         dist = np.sqrt((user_pos[0] - centroid[0]) ** 2 + (user_pos[1] - centroid[1]) ** 2)
+
         if dist < best_dist:
             best_dist = dist
             best_room = room
+
     return best_room
 
 
@@ -1012,8 +1017,7 @@ def chatbot_respond(user_text, history, session):
             bot = f"{info}\n\nWould you like navigation to {ROOM_INFO[info_room]} (Room {info_room})?"
             session["last_referenced_room"] = info_room
             session["last_dest_room"] = info_room
-            history.append({"role": "user", "content": user_text})
-            history.append({"role": "assistant", "content": bot})
+            history.append((user_text, bot))
             try:
                 gTTS(bot).save("/content/voice.mp3")
             except Exception:
@@ -1168,12 +1172,12 @@ def recommend_store_for_session(session):
         return "<div style='color:#ff6b6b;font-family:monospace'>❌ Please enter your current location first.</div>", session
 
     if session.get("is_new", True):
-        room = nearest_store(session["start_xy"])
+        room = nearest_store(session["start_xy"], session["start_floor"])
         msg = "🆕 New user → Nearest store recommended"
     else:
         room = most_visited_store(session["username"])
         if room is None:
-            room = nearest_store(session["start_xy"])
+            room = nearest_store(session["start_xy"], session["start_floor"])
         msg = "🔁 Returning user → Most visited store recommended"
 
     store_name = ROOM_INFO.get(room, f"Room {room}")
@@ -1221,13 +1225,18 @@ def handle_agreement(choice, session):
 
 def do_navigate(choice, type_name, cat_name, sub_name, nav_mode_val, danger_room, session):
     session = set_session_defaults(session)
+
     if not session.get("username"):
         return "❌ Please login first.", None
+
     if session.get("start_xy") is None or session.get("start_floor") is None:
         return "❌ Please set your location first.", None
 
     reset_grids()
 
+    # =========================================================
+    # DESTINATION SELECTION
+    # =========================================================
     if "Yes" in (choice or ""):
         dest_room = session.get("recommended_room")
         if dest_room is None:
@@ -1235,15 +1244,29 @@ def do_navigate(choice, type_name, cat_name, sub_name, nav_mode_val, danger_room
     else:
         if not sub_name:
             return "❌ Please select a sub-category.", None
+
         parent = SUB_TO_CATEGORY.get(sub_name, cat_name)
         store = STORE_CLUSTER.get(parent, parent)
         dest_room = STORE_CLUSTER_ROOM.get(store)
+
         if dest_room is None:
             return "❌ Could not map the selected category to a store.", None
 
     session["dest_room"] = dest_room
-    session["nav_mode"] = nav_mode_val
 
+    # =========================================================
+    # NAVIGATION MODE (FIXED LOGIC)
+    # =========================================================
+    if session.get("special_needs"):
+        effective_mode = "Special Needs"
+    else:
+        effective_mode = nav_mode_val
+
+    session["nav_mode"] = effective_mode
+
+    # =========================================================
+    # DANGER / CROWD HANDLING
+    # =========================================================
     room_val = None
     try:
         if danger_room is not None and str(danger_room).strip() != "":
@@ -1261,32 +1284,55 @@ def do_navigate(choice, type_name, cat_name, sub_name, nav_mode_val, danger_room
     fire_center = None
     crowded_center = None
 
-    if nav_mode_val == "Fire" and room_val is not None and room_val in ROOM_INFO:
+    if effective_mode == "Fire" and room_val is not None and room_val in ROOM_INFO:
         fire_active = True
         fire_room = room_val
         fire_center = get_centroid(room_val)
+
         if fire_center is not None:
             fire_step += 1
             radius = 20 + fire_step * 6
+
             if get_floor(room_val) == 0:
                 mark_danger(grid_0, fire_center, radius)
             else:
                 mark_danger(grid_1, fire_center, radius)
 
-    if nav_mode_val == "Crowded" and room_val is not None and room_val in ROOM_INFO:
+    if effective_mode == "Crowded" and room_val is not None and room_val in ROOM_INFO:
         crowded_active = True
         crowded_room = room_val
         crowded_center = get_centroid(room_val)
+
         if crowded_center is not None:
             if get_floor(room_val) == 0:
                 mark_crowd(grid_0, crowded_center)
             else:
                 mark_crowd(grid_1, crowded_center)
 
-    save_navigation(session["username"], (session["start_floor"], session["start_xy"]), dest_room)
-    save_navigation_mem((session["start_floor"], session["start_xy"]), dest_room)
+    # =========================================================
+    # SAVE HISTORY
+    # =========================================================
+    save_navigation(
+        session["username"],
+        (session["start_floor"], session["start_xy"]),
+        dest_room
+    )
+
+    save_navigation_mem(
+        f"floor={session['start_floor']},x={session['start_xy'][0]},y={session['start_xy'][1]}",
+        dest_room
+    )
+
+    # =========================================================
+    # NAVIGATION CALL (IMPORTANT FIX)
+    # =========================================================
+    img_path, instructions = navigate(
+        session["start_floor"],
+        session["start_xy"],
+        dest_room,
+        effective_mode
+    )
 
-    img_path, instructions = navigate(session["start_floor"], session["start_xy"], dest_room, nav_mode_val)
     return instructions, img_path
 
 
@@ -1351,6 +1397,11 @@ with gr.Blocks(
                     auth_name = gr.Textbox(label="Full Name (signup only)", placeholder="John Doe")
                     auth_age = gr.Number(label="Age (signup only)", value=25)
                     auth_gender = gr.Dropdown(["male", "female", "other"], label="Gender (signup only)", value="male")
+                    special_needs = gr.Radio(
+                    ["No", "Yes"],
+                    label="Are you a person with special needs?",
+                    value="No"
+                )
                     auth_budget_l = gr.Number(label="Min Budget EGP (signup only)", value=500)
                     auth_budget_h = gr.Number(label="Max Budget EGP (signup only)", value=5000)
 
@@ -1359,7 +1410,7 @@ with gr.Blocks(
                         login_btn = gr.Button("LOGIN", variant="secondary")
                     auth_status = gr.HTML()
 
-            def do_signup(username, password, name, age, gender, low, high, session):
+            def do_signup(username, password, name, age, gender, low, high,special, session):
                 cursor.execute("SELECT username FROM users WHERE username=?", (username,))
                 if cursor.fetchone():
                     return "<div style='color:#ff6b6b;font-family:monospace'>❌ Username already exists.</div>", session
@@ -1370,6 +1421,8 @@ with gr.Blocks(
                 conn.commit()
                 session = set_session_defaults(session)
                 session.update({"username": username, "gender": gender, "low": low, "high": high, "is_new": True})
+                session["special_needs"] = (special == "Yes")
+                session["nav_mode"] = "Special Needs" if special == "Yes" else "Normal"
                 return f"<div style='color:#00ff88;font-family:monospace'>✅ Welcome, {name}! Account created.</div>", session
 
             def do_login(username, password, session):
@@ -1381,7 +1434,11 @@ with gr.Blocks(
                 session.update({"username": user[0], "gender": user[4], "low": user[5], "high": user[6], "is_new": False})
                 return f"<div style='color:#00ff88;font-family:monospace'>✅ Welcome back, {user[2]}!</div>", session
 
-            signup_btn.click(do_signup, [auth_username, auth_password, auth_name, auth_age, auth_gender, auth_budget_l, auth_budget_h, session_state], [auth_status, session_state])
+            signup_btn.click(
+            do_signup,
+            [auth_username, auth_password, auth_name, auth_age, auth_gender, auth_budget_l, auth_budget_h, special_needs, session_state],
+            [auth_status, session_state]
+        )
             login_btn.click(do_login, [auth_username, auth_password, session_state], [auth_status, session_state])
 
         # ----------------------------------------------------
@@ -1454,16 +1511,14 @@ with gr.Blocks(
             gr.HTML("<div style='color:#00d4ff;font-family:monospace;font-size:13px;margin-bottom:16px'>Chat with the mall AI assistant</div>")
 
             chatbot_widget = gr.Chatbot(
-            label="SmartMall Assistant",
-            height=480,
-            value=[
-                {"role": "assistant", "content": "👋 Welcome to SmartMall! I can help you navigate, find products, or answer any questions. How can I help?"}
-            ],
-        )
+                label="SmartMall Assistant",
+                height=480,
+                value=[("", "👋 Welcome to SmartMall! I can help you navigate, find products, or answer any questions. How can I help?")],
+            )
 
             with gr.Row():
                 chat_msg = gr.Textbox(placeholder="Ask me anything about the mall...", label="Message", scale=4)
-                chat_mic = gr.Audio(sources=["microphone"], type="filepath", label="🎤", scale=1)
+                chat_mic = gr.Audio(source="microphone", type="filepath", label="🎤", scale=1)
 
             chat_audio_out = gr.Audio(label="Voice Response")
             chat_img_out = gr.Image(label="Navigation Map", type="filepath")
@@ -1485,4 +1540,4 @@ with gr.Blocks(
             chat_mic.change(voice_chat, [chat_mic, chatbot_widget, session_state], [chatbot_widget, chat_img_out, chat_audio_out, session_state])
 
 if __name__ == "__main__":
-    demo.launch(share=True)
+    demo.launch()