changes v13

question.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel
 from typing import List
 from redis_client import redis_client as r
 from dotenv import load_dotenv
-from urllib.parse import quote_plus
+from urllib.parse import quote
 import json
 
 load_dotenv()
@@ -25,6 +25,15 @@ HEADERS = {
     "Content-Type": "application/json"
 }
 
+def extract_last_keywords(raw: str, max_keywords=6):
+    segments = raw.strip().split("\n")
+    for line in reversed(segments):
+        parts = [kw.strip().strip('"') for kw in line.split(",") if kw.strip()]
+        if 1 <= len(parts) <= max_keywords:
+            return parts
+    return []
+
+
 def mistral_generate(prompt: str, max_new_tokens=128):
     payload = {
         "inputs": prompt,
@@ -57,17 +66,19 @@ async def ask_question(input: QuestionInput):
 
     raw_keywords = mistral_generate(keyword_prompt, max_new_tokens=32)
 
-    print("Raw extracted keywords:", raw_keywords)
+    keywords = extract_last_keywords(raw_keywords)
+
+    print("Raw extracted keywords:", keywords)
 
-    if not raw_keywords:
+    if not keywords:
         return {"error": "Keyword extraction failed."}
 
+
     # 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)
-
+    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: