changes v15

question.py

@@ -33,7 +33,6 @@ def extract_last_keywords(raw: str, max_keywords=6):
             return parts
     return []
 
-
 def mistral_generate(prompt: str, max_new_tokens=128):
     payload = {
         "inputs": prompt,
@@ -50,22 +49,32 @@ def mistral_generate(prompt: str, max_new_tokens=128):
             return result[0].get("generated_text", "").strip()
         else:
             return ""
-    except Exception as e:
+    except Exception:
         return ""
 
+def fetch_gnews_articles(query: str) -> List[dict]:
+    encoded_query = quote(query)
+    gnews_url = f"https://gnews.io/api/v4/search?q={encoded_query}&lang=en&max=5&expand=content&token={GNEWS_API_KEY}"
+    print("GNews URL:", gnews_url)
+    try:
+        response = requests.get(gnews_url, timeout=10)
+        response.raise_for_status()
+        return response.json().get("articles", [])
+    except Exception as e:
+        print("GNews API error:", str(e))
+        return []
+
 @askMe.post("/ask")
 async def ask_question(input: QuestionInput):
     question = input.question
 
-    # --- 1. Ask Mistral to extract keywords ---
+    # Step 1: Ask Mistral to extract keywords
     keyword_prompt = (
         f"Extract the 3–6 most important keywords from the following question. "
         f"Return only the keywords, comma-separated (no explanations):\n\n"
         f"{question}"
     )
-
     raw_keywords = mistral_generate(keyword_prompt, max_new_tokens=32)
-
     keywords = extract_last_keywords(raw_keywords)
 
     print("Raw extracted keywords:", keywords)
@@ -73,25 +82,18 @@ async def ask_question(input: QuestionInput):
     if not keywords:
         return {"error": "Keyword extraction failed."}
 
+    # Step 2: Fetch articles using AND, then fallback to OR
+    query_and = " AND ".join(f'"{kw}"' for kw in keywords)
+    articles = fetch_gnews_articles(query_and)
 
-    # Clean and parse keywords
-    query_string = " AND ".join(f'"{kw}"' for kw in keywords)
-    encoded_query = quote(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)
-        response.raise_for_status()
-        articles = response.json().get("articles", [])
-    except Exception as e:
-        return {"error": f"GNews API error: {str(e)}"}
+    if not articles:
+        query_or = " OR ".join(f'"{kw}"' for kw in keywords)
+        articles = fetch_gnews_articles(query_or)
 
     print("Fetched articles:", articles)
 
     context = "\n\n".join([
-        article.get("content") or ""
+        article.get("content") or article.get("description") or ""
         for article in articles
     ])[:1500]
 
@@ -102,12 +104,12 @@ async def ask_question(input: QuestionInput):
             "sources": []
         }
 
-    # --- 2. Ask Mistral to answer the question using the context ---
+    # Step 3: Ask Mistral to answer 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"<s>[INST] Use the context below to answer the question. "
+        f"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."