changes v11

question.py

@@ -7,7 +7,6 @@ from typing import List
 from redis_client import redis_client as r
 from dotenv import load_dotenv
 from urllib.parse import quote_plus
-import re
 import json
 
 load_dotenv()
@@ -20,24 +19,54 @@ askMe = APIRouter()
 class QuestionInput(BaseModel):
     question: str
 
+HF_API_URL = "https://api-inference.huggingface.co/models/mistralai/Mistral-7B-Instruct-v0.3"
+HEADERS = {
+    "Authorization": f"Bearer {HF_TOKEN}",
+    "Content-Type": "application/json"
+}
+
+def mistral_generate(prompt: str, max_new_tokens=128):
+    payload = {
+        "inputs": prompt,
+        "parameters": {
+            "max_new_tokens": max_new_tokens,
+            "temperature": 0.7
+        }
+    }
+    try:
+        response = requests.post(HF_API_URL, headers=HEADERS, data=json.dumps(payload), timeout=30)
+        response.raise_for_status()
+        result = response.json()
+        if isinstance(result, list) and len(result) > 0:
+            return result[0].get("generated_text", "").strip()
+        else:
+            return ""
+    except Exception as e:
+        return ""
+
 @askMe.post("/ask")
 async def ask_question(input: QuestionInput):
     question = input.question
 
-    # Basic keyword extraction with stopword filtering
-    STOPWORDS = {"what", "about", "which", "would", "could", "this", "that"}
-    keywords = [
-        kw for kw in re.findall(r"\b\w{4,}\b", question.lower())
-        if kw not in STOPWORDS
-    ]
-    query_string = " OR ".join(f'"{kw}"' for kw in keywords[:7])
-    encoded_query = quote_plus(query_string)
+    # --- 1. Ask Mistral to extract keywords ---
+    keyword_prompt = (
+        f"<s>[INST] Extract the 3–6 most important keywords or phrases from the question below. "
+        f"Return only comma-separated keywords (no explanations).\n\nQuestion: {question} [/INST]"
+    )
+    raw_keywords = mistral_generate(keyword_prompt, max_new_tokens=32)
 
-    print("Query string", encoded_query)
+    print("Raw extracted keywords:", raw_keywords)
 
-    gnews_url = f"https://gnews.io/api/v4/search?q={encoded_query}&lang=en&max=3&expand=content&token={GNEWS_API_KEY}"
+    if not raw_keywords:
+        return {"error": "Keyword extraction failed."}
 
-    print("GNEWS URL", gnews_url)
+    # Clean and parse keywords
+    keywords = [kw.strip().strip('"') for kw in raw_keywords.split(",") if kw.strip()]
+    query_string = " OR ".join(f'"{kw}"' for kw in keywords)
+    encoded_query = quote_plus(query_string)
+
+    gnews_url = f"https://gnews.io/api/v4/search?q={encoded_query}&lang=en&max=3&expand=content&token={GNEWS_API_KEY}"
+    print("GNews URL:", gnews_url)
 
     try:
         response = requests.get(gnews_url, timeout=10)
@@ -45,11 +74,11 @@ async def ask_question(input: QuestionInput):
         articles = response.json().get("articles", [])
     except Exception as e:
         return {"error": f"GNews API error: {str(e)}"}
-    
-    print("the articles are", articles)
+
+    print("Fetched articles:", articles)
 
     context = "\n\n".join([
-        article.get("content") or article.get("description") or ""
+        article.get("description") or ""
         for article in articles
     ])[:1500]
 
@@ -60,34 +89,17 @@ async def ask_question(input: QuestionInput):
             "sources": []
         }
 
-    # Call HF Inference API manually
-    hf_api_url = "https://api-inference.huggingface.co/models/mistralai/Mistral-7B-Instruct-v0.3"
-    prompt = f"<s>[INST] Use the context below to answer the question. If not enough information is available, say 'Cannot answer'.\n\nContext:\n{context}\n\nQuestion: {question} [/INST]"
-    headers = {
-        "Authorization": f"Bearer {HF_TOKEN}",
-        "Content-Type": "application/json"
-    }
-
-    payload = {
-        "inputs": prompt,
-        "parameters": {
-            "max_new_tokens": 256,
-            "temperature": 0.7
-        }
-    }
+    # --- 2. Ask Mistral to answer the question using the context ---
+    answer_prompt = (
+        f"<s>[INST] Use the context below to answer the question. If not enough information is available, say 'Cannot answer'.\n\n"
+        f"Context:\n{context}\n\nQuestion: {question} [/INST]"
+    )
 
+    answer = mistral_generate(answer_prompt, max_new_tokens=256)
+    if not answer:
+        answer = "Cannot answer – model did not return a valid response."
 
-    try:
-        response = requests.post(hf_api_url, headers=headers, data=json.dumps(payload), timeout=30)
-        response.raise_for_status()
-        hf_response = response.json()
-        if isinstance(hf_response, list) and len(hf_response) > 0:
-            answer = hf_response[0].get("generated_text", "").strip()
-        else:
-            answer = "Cannot answer – model did not return a valid response."
-
-    except Exception as e:
-        return {"error": f"Hugging Face API error: {str(e)}"}
+    print("Answer:", answer)
 
     return {
         "question": question,