Update app.py

app.py

@@ -1,9 +1,9 @@
 import os
 import re
-import gradio as gr
-from typing import List, Tuple
+from typing import List, Tuple, Dict
 from dataclasses import dataclass
 
+import gradio as gr
 import torch
 from transformers import AutoTokenizer, AutoModelForCausalLM
 
@@ -57,8 +57,7 @@ except Exception as e:
 
 def llm_reply(prompt: str, max_new_tokens: int = 100, temperature: float = 0.3) -> str:
     if not (tok and model):
-        # fallback جواب
-        return "safePak: میں آپ کی مدد کے لیے حاضر ہوں۔ براہ کرم مزید وضاحت دیں۔"
+        return ""
     ids = tok.encode(prompt, return_tensors="pt")
     out = model.generate(
         ids,
@@ -67,7 +66,8 @@ def llm_reply(prompt: str, max_new_tokens: int = 100, temperature: float = 0.3)
         do_sample=True,
         pad_token_id=tok.eos_token_id,
     )
-    return tok.decode(out[0], skip_special_tokens=True)
+    gen_ids = out[0][ids.shape[1]:]
+    return tok.decode(gen_ids, skip_special_tokens=True).strip()
 
 # ---------------- Helpline rendering ----------------
 def _clean_phone_for_links(p: str) -> str:
@@ -109,12 +109,13 @@ def helplines_block(lang: str) -> str:
             lines.append(f"**{nm}**\n{ph}\n[📞 Call]({tel})  |  [💬 WhatsApp]({wa})")
     return "\n\n".join(lines)
 
-# ---------------- Core prompts ----------------
+# ---------------- Core prompt ----------------
 SAFEPAK_SYSTEM = """
 You are SafePak – 1122 Guide, a multilingual emergency disaster assistant.
-Always reply in user's language.
-Give medium length, action-oriented checklists (5–7 bullets) + Go-Bag tips if evacuation is implied.
-Never panic. End with an emotional calming line.
+Always reply in user's language (Urdu/English/regional).
+Return medium-length, action-oriented checklists (5–7 bullets) and, if evacuation is implied or requested, append a Go-Bag sublist (4–8 items).
+Never panic. Provide offline-safe steps. End with a calming line.
+No personal data storage. No medical diagnoses (first aid only).
 """
 
 def format_response(base: str, user_msg: str, lang: str) -> str:
@@ -122,68 +123,192 @@ def format_response(base: str, user_msg: str, lang: str) -> str:
         f"<system>\n{SAFEPAK_SYSTEM}\n</system>\n"
         f"<user>\n{user_msg}\n\nDraft response:\n{base}\n</user>"
     )
-    return llm_reply(refine_prompt, max_new_tokens=100, temperature=0.3)
+    refined = llm_reply(refine_prompt, max_new_tokens=100, temperature=0.3)
+    return refined if refined else base
 
-# ---------------- Chat logic ----------------
-def chat_fn(user_msg: str, chat_history: List[Tuple[str, str]], sim_state: dict):
+# ---------------- Base checklist + Go-Bag ----------------
+def base_checklist_and_bag(user_msg: str, lang: str) -> Tuple[str, List[str]]:
+    low = user_msg.lower()
+    evac = False
+    if any(k in low for k in ["fire","آگ","smoke"]):
+        evac = True
+        checklist = ("✅ ابھی یہ کریں:\n"
+                     "- جھک جائیں/Stay low — دھواں اوپر جاتا ہے\n"
+                     "- ناک/منہ پر گیلا کپڑا رکھیں\n"
+                     "- اگر محفوظ ہو تو بجلی/گیس مین بند کریں\n"
+                     "- گرم دروازہ مت کھولیں؛ دوسرا راستہ لیں\n"
+                     "- سیڑھیاں استعمال کریں — لفٹ نہیں\n"
+                     "- بچوں/بزرگوں کو ساتھ رکھیں\n"
+                     "🕊️ گھبرائیں نہیں — میں آپ کے ساتھ ہوں۔"
+                     ) if lang=="ur" else (
+                     "✅ Do this now:\n"
+                     "- Stay low — smoke rises\n"
+                     "- Wet cloth over nose/mouth\n"
+                     "- Cut power/gas if safe\n"
+                     "- Do not open hot doors; use alternate exit\n"
+                     "- Use stairs, never elevators\n"
+                     "- Keep kids/elderly close\n"
+                     "🕊️ Stay calm — I’m with you."
+                     )
+        bag = (["شناختی کارڈ/کاغذات","نقدی","موبائل+پاور بینک","پانی","خشک کھانا","دوائیں","ہلکی چادر","ٹارچ"]
+               if lang=="ur" else
+               ["IDs/documents","Cash","Phone+power bank","Water","Dry food","Medicines","Light blanket","Flashlight"])
+    elif any(k in low for k in ["زلزلہ","earthquake","tremor","shaking"]):
+        evac = True
+        checklist = ("✅ ابھی یہ کریں:\n"
+                     "- Drop, Cover, Hold — جھکیں، ڈھکیں، پکڑیں\n"
+                     "- کھڑکیوں/بھاری اشیاء سے دور رہیں\n"
+                     "- جھٹکے رکنے پر سیڑھیوں سے باہر نکلیں (لفٹ نہیں)\n"
+                     "- کھلی جگہ میں رکیں\n"
+                     "🕊️ حوصلہ رکھیں — میں آپ کے ساتھ ہوں۔"
+                     ) if lang=="ur" else (
+                     "✅ Do this now:\n"
+                     "- Drop, Cover, Hold On\n"
+                     "- Stay away from windows/heavy objects\n"
+                     "- After shaking, exit via stairs (no elevators)\n"
+                     "- Wait in an open safe area\n"
+                     "🕊️ Stay calm — I’m with you."
+                     )
+        bag = (["شناختی کارڈ/کاغذات","موبائل+پاور بینک","پانی","خشک کھانا","دوائیں","وسل","چھوٹی فرسٹ ایڈ","ٹارچ"]
+               if lang=="ur" else
+               ["IDs/documents","Phone+power bank","Water","Dry food","Medicines","Whistle","Small first-aid","Flashlight"])
+    elif any(k in low for k in ["سیلاب","flood","overflow","water entering","طوفان","storm","آندھی"]):
+        evac = True
+        checklist = ("✅ ابھی یہ کریں:\n"
+                     "- اگر محفوظ ہو تو بجلی مین سوئچ بند کریں\n"
+                     "- اونچی جگہ/چھت پر منتقل ہوں\n"
+                     "- پانی میں گاڑی نہ چلائیں\n"
+                     "- بچوں/بزرگوں کو پہلے نکالیں\n"
+                     "🕊️ گھبرائیں نہیں — آپ محفوظ نکل سکتے ہیں۔"
+                     ) if lang=="ur" else (
+                     "✅ Do this now:\n"
+                     "- Turn off main power if safe\n"
+                     "- Move to higher ground/roof\n"
+                     "- Do not drive through water\n"
+                     "- Evacuate kids/elderly first\n"
+                     "🕊️ Stay calm — you can get to safety."
+                     )
+        bag = (["شناختی کارڈ/کاغذات","نقدی","موبائل+پاور بینک","پانی","خشک کھانا","دوائیں","واٹر پروف بیگ","چپل/بوٹس"]
+               if lang=="ur" else
+               ["IDs/documents","Cash","Phone+power bank","Water","Dry food","Medicines","Waterproof pouches","Boots/Sandals"])
+    elif any(k in low for k in ["gas","گیس","leak","smell gas","بو"]):
+        checklist = ("✅ ابھی یہ کریں:\n"
+                     "- کوئی چنگاری/سوئچ/لائٹر استعمال نہ کریں\n"
+                     "- کھڑکیاں/دروازے کھول کر ہوا دار کریں\n"
+                     "- گیس مین والو بند کریں\n"
+                     "- محفوظ فاصلے پر چلے جائیں\n"
+                     "🕊️ پرسکون رہیں — میں رہنمائی کر رہا/رہی ہوں۔"
+                     ) if lang=="ur" else (
+                     "✅ Do this now:\n"
+                     "- No sparks (no switches/lighters/flash)\n"
+                     "- Ventilate: open windows/doors\n"
+                     "- Shut the main gas valve\n"
+                     "- Move to a safe distance\n"
+                     "🕊️ Stay calm — I’m guiding you."
+                     )
+        bag = (["ماسک/گیلا کپڑا","شناختی کارڈ","موبائل+پاور بینک","پانی","دوائیں"]
+               if lang=="ur" else
+               ["Mask/wet cloth","IDs","Phone+power bank","Water","Medicines"])
+    elif any(k in low for k in ["injury","زخمی","bleeding","cut","fracture","burn"]):
+        checklist = ("✅ ابھی یہ کریں:\n"
+                     "- خون ہو تو مضبوط دباؤ دیں (صاف کپڑا)\n"
+                     "- زخم صاف پانی سے دھوئیں\n"
+                     "- گہرا زخم/زیادہ خون ہو تو فوری مدد لیں\n"
+                     "- گردن/کمر چوٹ میں مریض کو نہ ہلائیں\n"
+                     "🕊️ پرسکون رہیں — آپ سنبھال سکتے ہیں۔"
+                     ) if lang=="ur" else (
+                     "✅ Do this now:\n"
+                     "- Apply firm direct pressure (clean cloth)\n"
+                     "- Rinse with clean water\n"
+                     "- Deep/heavy bleeding → seek urgent help\n"
+                     "- Suspected spine injury: do not move\n"
+                     "🕊️ Stay calm — you’ve got this."
+                     )
+        bag = (["فرسٹ ایڈ کٹ","صاف کپڑا/بینڈیج","پانی","درد کش دوا","شناختی کارڈ"]
+               if lang=="ur" else
+               ["First-aid kit","Clean cloth/bandage","Water","Pain reliever","ID"])
+    else:
+        checklist = ("✅ فوری رہنمائی:\n"
+                     "- اردگرد خطرات پہچانیں (بجلی/گیس/دھواں/پانی)\n"
+                     "- محفوظ کور یا اخراج کا راستہ منتخب کریں\n"
+                     "- بچوں/بزرگوں کو ساتھ رکھیں\n"
+                     "- لفٹ سے پرہیز کریں\n"
+                     "🕊️ گھبرائیں نہیں — میں آپ کے ساتھ ہوں۔"
+                     ) if lang=="ur" else (
+                     "✅ General guidance:\n"
+                     "- Identify hazards (electricity/gas/smoke/water)\n"
+                     "- Choose safe cover or exit route\n"
+                     "- Keep kids/elderly close\n"
+                     "- Avoid elevators\n"
+                     "🕊️ Stay calm — I’m with you."
+                     )
+        evac = True
+        bag = (["شناختی کارڈ/کاغذات","نقدی","فون+پاور بینک","پانی","خشک کھانا","دوائیں"]
+               if lang=="ur" else
+               ["IDs/documents","Cash","Phone+power bank","Water","Dry food","Medicines"])
+    if evac:
+        if lang=="ur":
+            checklist += "\n\n🎒 ساتھ کیا لیں (Go-Bag):\n" + "\n".join(f"- {i}" for i in bag)
+        else:
+            checklist += "\n\n🎒 Take with you (Go-Bag):\n" + "\n".join(f"- {i}" for i in bag)
+    return checklist, bag
+
+# ---------------- Chat logic (messages format) ----------------
+def chat_fn(user_msg: str, chat_messages: List[Dict[str,str]], sim_state: dict):
     if not user_msg:
-        return chat_history, sim_state
+        return chat_messages, sim_state
+
     lang = detect_lang(user_msg)
-    status, reason = GUARD.check(user_msg)
+    status, _ = GUARD.check(user_msg)
 
     # BLOCK
     if status == "BLOCK":
         msg = GUARD.refusal_msg_ur if lang == "ur" else GUARD.refusal_msg_en
-        return chat_history + [(user_msg, msg)], sim_state
+        msg += "\n\n" + helplines_block(lang)
+        return chat_messages + [
+            {"role":"user","content":user_msg},
+            {"role":"assistant","content":msg}
+        ], sim_state
 
-    # base checklist by keyword
-    checklist = ""
-    low = user_msg.lower()
-    if any(k in low for k in ["fire","آگ","smoke"]):
-        checklist = "Fire safety steps"
-    elif any(k in low for k in ["زلزلہ","earthquake","tremor"]):
-        checklist = "Earthquake safety steps"
-    elif any(k in low for k in ["سیلاب","flood","overflow"]):
-        checklist = "Flood survival steps"
-    elif any(k in low for k in ["gas","گیس","leak"]):
-        checklist = "Gas leak safety steps"
-    elif any(k in low for k in ["injury","زخمی","bleeding"]):
-        checklist = "First aid for injury"
-    else:
-        checklist = "General emergency guidance"
-
-    final = format_response(checklist, user_msg, lang)
+    # Build base checklist + go-bag
+    base, _ = base_checklist_and_bag(user_msg, lang)
 
-    # SOFT warning
+    # SOFT prepend note
     if status == "SOFT":
-        if lang == "ur":
-            final = "⚠️ محتاط رہیں: یہ موضوع حساس ہے۔\n\n" + final
-        else:
-            final = "⚠️ Note: Sensitive topic.\n\n" + final
+        base = ("⚠️ محتاط رہیں: یہ موضوع حساس ہے۔\n\n" + base) if lang=="ur" else ("⚠️ Note: sensitive topic.\n\n" + base)
 
+    # Refine with LLM (medium length). If model unavailable, keep base.
+    final = format_response(base, user_msg, lang)
     final += "\n\n" + helplines_block(lang)
-    return chat_history + [(user_msg, final)], sim_state
+
+    return chat_messages + [
+        {"role":"user","content":user_msg},
+        {"role":"assistant","content":final}
+    ], sim_state
 
 # ---------------- UI ----------------
 with gr.Blocks(title="SafePak – 1122 Guide") as demo:
     gr.Markdown("## SafePak – 1122 Guide\nMultilingual emergency assistant (CPU-only).")
 
-    # ثابت اوپر Helplines panel
     gr.Markdown(render_quick_helplines_md("ur"))
 
     state = gr.State({"active": False, "step": 0, "scenario": None})
-    chatbot = gr.Chatbot(height=420)
+
+    chatbot = gr.Chatbot(height=420, type="messages")
     msg = gr.Textbox(label="پیغام / Message", placeholder="یہاں لکھیں…", lines=2)
     send = gr.Button("Send / بھیجیں")
     clear = gr.Button("Clear")
 
-    def _on_submit(u,h,s): return chat_fn(u,h,s)
-    msg.submit(_on_submit, [msg,chatbot,state],[chatbot,state])
-    send.click(_on_submit, [msg,chatbot,state],[chatbot,state])
-    clear.click(lambda: ([], {"active":False,"step":0,"scenario":None}), [], [chatbot,state])
+    def on_submit(u, h, s):
+        new_h, new_s = chat_fn(u, h, s)
+        return new_h, "", new_s
+
+    msg.submit(on_submit, [msg, chatbot, state], [chatbot, msg, state])
+    send.click(on_submit, [msg, chatbot, state], [chatbot, msg, state])
+    clear.click(lambda: ([], {"active": False, "step": 0, "scenario": None}), [], [chatbot, state])
 
 if __name__ == "__main__":
-    demo.queue(concurrency_count=1, max_size=32).launch(
+    demo.queue().launch(
         server_name="0.0.0.0",
         server_port=7860,
         share=False