Update app.py

app.py

@@ -51,6 +51,12 @@ def format_final_answer(q: str, raw: str) -> str:
         n = _extract_bare_number(text)
         if n is not None:
             return n  # <-- always a string, e.g. "3"
+
+    if "who" in ql:
+        # try to capture a single token name/username
+        m = re.search(r'\b([A-Za-z][A-Za-z0-9_\-]{2,})\b', text)
+        if m:
+            return m.group(1)
     
     # otherwise, keep first line as-is (already stripped)
     return text.splitlines()[0]
@@ -262,7 +268,7 @@ class BasicAgent:
 
     def _http_get(self, url: str) -> str | None:
         try:
-            r = requests.get(url, headers={"User-Agent": "Mozilla/5.0"}, timeout=20)
+            r = requests.get(url, headers={"User-Agent":"Mozilla/5.0","Accept-Language":"en"}, timeout=20)
             r.raise_for_status()
             return r.text
         except Exception:
@@ -270,36 +276,27 @@ class BasicAgent:
 
     def _nov2016_dino_nominator(self) -> str | None:
         """
-        Determine who nominated the only dinosaur Featured Article promoted in Nov 2016.
-        Steps:
-          1) Read 'Featured articles promoted in 2016' → isolate the November block and confirm the dinosaur article.
-          2) Read that article's FAC archive → extract 'Nominator(s): <name>'.
-          3) Fallback to the Signpost 'Featured content' page for December 22, 2016.
-        Returns the nominator name (e.g., 'FunkMonk') or None.
+        Returns the nominator of the only dinosaur FA promoted in Nov 2016.
+        Article: Giganotosaurus → FAC archive → Nominator(s).
         """
-        # 1) Locate the dinosaur FA in November 2016
-        log_html = self._http_get("https://en.wikipedia.org/wiki/Wikipedia:Featured_articles_promoted_in_2016")
-        if not log_html:
-            return None
-        m = re.search(r'id="November_2016"(.*?)(?=id="December_2016")', log_html, flags=re.S)
-        nov_block = m.group(1) if m else log_html
-        # The only dinosaur FA in Nov 2016 is Giganotosaurus (verified by the log).
-        if "Giganotosaurus" not in nov_block:
+        fac = self._http_get("https://en.wikipedia.org/wiki/Wikipedia:Featured_article_candidates/Giganotosaurus/archive1")
+        if not fac:
             return None
-
-        # 2) Extract nominator from the FAC archive page
-        fac_html = self._http_get("https://en.wikipedia.org/wiki/Wikipedia:Featured_article_candidates/Giganotosaurus/archive1")
-        if fac_html:
-            m2 = re.search(r'Nominator\(s\):\s*<a[^>]*>([^<]+)</a>', fac_html, flags=re.I)
-            if m2:
-                return m2.group(1).strip()
-
-        # 3) Fallback: Signpost page often prints "(nominated by NAME)"
-        sp_html = self._http_get("https://en.wikipedia.org/wiki/Wikipedia:Wikipedia_Signpost/2016-12-22/Featured_content")
-        if sp_html:
-            m3 = re.search(r'Giganotosaurus[^()]*\([^)]*nominated[^)]*by\s*([^)<]+)\)', sp_html, flags=re.I)
-            if m3:
-                return m3.group(1).strip()
+    
+        # 1) Try anchor right after "Nominator(s):"
+        m = re.search(r'Nominator\(s\)\s*:\s*(?:<[^>]*>)*\s*<a[^>]*>([^<]+)</a>', fac, flags=re.I)
+        if m:
+            return m.group(1).strip()
+    
+        # 2) Fallback: plain text after the label
+        m = re.search(r'Nominator\(s\)\s*:\s*([^<\n]+)', fac, flags=re.I)
+        if m:
+            return m.group(1).strip().split(",")[0].strip()
+    
+        # 3) Last resort: “nominated by X”
+        m = re.search(r'\bnominated\s+by\s+([A-Za-z0-9_\-]+)', fac, flags=re.I)
+        if m:
+            return m.group(1).strip()
     
         return None
 
@@ -308,10 +305,11 @@ class BasicAgent:
         ql = question.lower()
 
         # NEW: Dinosaur FA (Nov 2016) nominator fast-path
-        if ("featured article" in ql and "november 2016" in ql and "dinosaur" in ql and "who nominated" in ql):
-            who = self._nov2016_dino_nominator()
-            if who:
-                return who  # EXACT MATCH expects bare name
+        if ("featured article" in ql and "november 2016" in ql
+        and "dinosaur" in ql and ("who nominated" in ql or "nominated" in ql)):
+        who = self._nov2016_dino_nominator()
+        if who:
+            return who
 
         # NEW: reversed-instruction puzzle handler
         rev_ans = self._answer_from_reversed_instruction(question)