wa integrating llm

routes/question.py

@@ -77,17 +77,28 @@ async def ask_question(input: QuestionInput):
                 "answer": "Cannot answer – no relevant context found.",
                 "sources": sources
             }
+        
+         # Step 3: Ask Mistral to answer
+        answer_prompt = (
+            f"You are a concise news assistant. Answer the user's question clearly using the context below if relevant. "
+            f"Make sure you are precise, accurate and to the point. Do not assume that the reader has any prerequisite understanding of the subject."
+            f"If the context is not helpful, you may rely on your own knowledge, but do not mention the context or question again.\n\n"
+            f"Context:\n{context}\n\n"
+            f"Question: {question}\n\n"
+            f"Answer:"
+        )
+        answer_raw = mistral_generate(answer_prompt, max_new_tokens=256)
+        
+    else:
+
+        answer_prompt = (
+            f"You are a concise news assistant. Answer the user's question clearly using the context below if relevant. "
+            f"Make sure you are precise, accurate and to the point. Do not assume that the reader has any prerequisite understanding of the subject."
+            f"Question: {question}\n\n"
+            f"Answer:"
+        )
 
-    # Step 3: Ask Mistral to answer
-    answer_prompt = (
-        f"You are a concise news assistant. Answer the user's question clearly using the context below if relevant. "
-        f"Make sure you are precise, accurate and to the point. Do not assume that the reader has any prerequisite understanding of the subject."
-        f"If the context is not helpful, you may rely on your own knowledge, but do not mention the context or question again.\n\n"
-        f"Context:\n{context}\n\n"
-        f"Question: {question}\n\n"
-        f"Answer:"
-    )
-    answer_raw = mistral_generate(answer_prompt, max_new_tokens=256)
+        answer_raw = mistral_generate(answer_prompt, max_new_tokens=256)
 
     if not answer_raw:
         final_answer = "Cannot answer – model did not return a valid response."

routes/wa_gateway.py

@@ -1,120 +1,108 @@
 # app/routes/wa_gateway.py
 from fastapi import APIRouter, Request
-import os
-import requests
+import os, requests, asyncio
 from dotenv import load_dotenv
 from fastapi.responses import PlainTextResponse, JSONResponse
 
+# ----- import the Q&A logic -----
+from routes.question import ask_question, QuestionInput   # ← new
+
 load_dotenv()
 
 wa_router = APIRouter()
 
-VERIFY_TOKEN = os.getenv("VERIFY_TOKEN")
-ACCESS_TOKEN = os.getenv("WHATSAPP_ACCESS_TOKEN")
-PHONE_NUMBER_ID = os.getenv("WHATSAPP_PHONE_NUMBER_ID")
-RECIPIENT_NUMBER = "+353 89 949 5777"  # or pass dynamically
-
-def send_preferences_flow(to, name):
-    url = f"https://graph.facebook.com/v22.0/714483311743364/messages"
+VERIFY_TOKEN      = os.getenv("VERIFY_TOKEN")
+ACCESS_TOKEN      = os.getenv("WHATSAPP_ACCESS_TOKEN")
+PHONE_NUMBER_ID   = os.getenv("WHATSAPP_PHONE_NUMBER_ID")
+
+# ------------------------------------------------------------------
+# Helper: actually POST a plain-text WhatsApp message via Graph API
+# ------------------------------------------------------------------
+def send_whatsapp_text(to: str, text: str) -> dict:
+    """
+    Send a plain text message (max 4096 chars per WhatsApp limits).
+    Returns {'status': 'sent' | 'failed', ... } for easy logging.
+    """
+    url = f"https://graph.facebook.com/v17.0/{PHONE_NUMBER_ID}/messages"
     headers = {
         "Authorization": f"Bearer {ACCESS_TOKEN}",
-        "Content-Type": "application/json"
+        "Content-Type":  "application/json",
     }
     payload = {
         "messaging_product": "whatsapp",
-        "to": to,
-        "type": "interactive",
-        "interactive": {
-            "type": "list",
-            "header": { "type": "text", "text": "Select Your Interests" },
-            "body": { "text": f"Hi {name}! Please pick your preferred news topics." },
-            "footer": { "text": "Powered by nuse" },
-            "action": {
-            "button": "Choose Topics",
-            "sections": [{
-                "title": "Categories",
-                "rows": [
-                { "id": "world", "title": "World" },
-                { "id": "india", "title": "India" },
-                { "id": "finance", "title": "Finance" },
-                { "id": "sports", "title": "Sports" },
-                { "id": "entertainment", "title": "Entertainment" }
-                ]
-            }]
-            }
-        }
+        "to":   to,
+        "type": "text",
+        "text": {"body": text[:4096]},    # truncate if necessary
     }
 
-    response = requests.post(url, headers=headers, json=payload)
     try:
-        response.raise_for_status()
-        return {"status": "sent", "response": response.json()}
+        r = requests.post(url, headers=headers, json=payload)
+        r.raise_for_status()
+        return {"status": "sent", "response": r.json()}
     except Exception as e:
         return {"status": "failed", "error": str(e)}
 
+# ------------------------------------------------------------------
+# Helper: glue logic – ask Mistral and relay the reply to WhatsApp
+# ------------------------------------------------------------------
+async def nuse_interact(to: str, name: str, prompt: str) -> dict:
+    """
+    1. Call ask_question() directly (no HTTP round-trip);
+    2. Extract the answer text (+sources if you like);
+    3. Push it back to the user via WhatsApp API.
+    """
+    # 1) Ask the news assistant
+    qa_result = await ask_question(QuestionInput(question=prompt))
+    answer_text = qa_result["answer"]
+
+    # Optional: include sources as bullet list
+    if qa_result.get("sources"):
+        bullet_list = "\n".join(f"• {s['title']}" for s in qa_result["sources"])
+        answer_text = f"{answer_text}\n\nSources:\n{bullet_list}"
+
+    # 2) Send to WhatsApp
+    return send_whatsapp_text(to, answer_text)
+
+# ------------------------------------------------------------------
+# Webhook verification (unchanged)
+# ------------------------------------------------------------------
 @wa_router.get("/webhook")
 async def verify_webhook(request: Request):
     params = request.query_params
     if params.get("hub.mode") == "subscribe" and params.get("hub.verify_token") == VERIFY_TOKEN:
-        # Return raw plain text (not JSON)
         return PlainTextResponse(content=params.get("hub.challenge"))
     return JSONResponse(status_code=403, content={"error": "Verification failed"})
 
+# ------------------------------------------------------------------
+# Incoming WhatsApp messages
+# ------------------------------------------------------------------
 @wa_router.post("/webhook")
 async def receive_whatsapp_event(request: Request):
     body = await request.json()
-    print("[WEBHOOK] Incoming message:", body)
+    print("[WEBHOOK] Incoming:", body)
 
-    # Detect message and extract user number + message
     try:
-        entry = body["entry"][0]
-        changes = entry["changes"][0]
-        value = changes["value"]
+        entry    = body["entry"][0]
+        changes  = entry["changes"][0]
+        value    = changes["value"]
         messages = value.get("messages")
         contacts = value.get("contacts")
 
         if messages and contacts:
-            msg = messages[0]
+            msg     = messages[0]
             contact = contacts[0]
 
-            from_number = msg["from"]
-            sender_name = contact["profile"]["name"]  # <- 👈 This is the name
-            text = msg["text"]["body"]
-
-            print(f"[INFO] Message from {sender_name} ({from_number}): {text}")
-
-            response = send_preferences_flow(from_number, sender_name)
+            from_number  = msg["from"]
+            sender_name  = contact["profile"]["name"]
+            incoming_txt = msg["text"]["body"]
 
-            if response["status"] == "failed":
-                print("[ERROR] Failed to send interactive message:", response["error"])
+            print(f"[INFO] {sender_name} ({from_number}): {incoming_txt}")
 
-            # Trigger your response logic here — for example, reply with interactive message
+            # Hand off to Q&A -> WhatsApp reply
+            result = await nuse_interact(from_number, sender_name, incoming_txt)
+            print("[INFO] Reply status:", result)
 
     except Exception as e:
         print("[ERROR] Webhook processing failed:", str(e))
 
     return JSONResponse(content={"status": "received"})
-
-@wa_router.post("/whatsapp/send")
-def send_whatsapp_message():
-    url = f"https://graph.facebook.com/v17.0/{PHONE_NUMBER_ID}/messages"
-    headers = {
-        "Authorization": f"Bearer {ACCESS_TOKEN}",
-        "Content-Type": "application/json"
-    }
-    payload = {
-        "messaging_product": "whatsapp",
-        "to": RECIPIENT_NUMBER,
-        "type": "template",
-        "template": {
-            "name": "hello_world",
-            "language": { "code": "en_US" }
-        }
-    }
-
-    response = requests.post(url, headers=headers, json=payload)
-    try:
-        response.raise_for_status()
-        return {"status": "sent", "response": response.json()}
-    except Exception as e:
-        return {"status": "failed", "error": str(e)}