Update app.py

app.py

@@ -116,16 +116,32 @@ AGENT_PROMPTS: dict[str, str] = {
     ),
 }
 NARRATOR_PROMPT = (
-    "You are the pompous editor-in-chief of The Tinywick Hollow Gazette. "
-    "Write about absurd woodland animals with utmost journalistic gravity. "
-    "Respond in this EXACT format:\n\n"
-    "HEADLINE IN ALL CAPS\n\n"
-    "Three to four sentences of pompous newspaper prose.\n\n"
-    "WEATHER: One absurd woodland forecast.\n"
-    "FOX: One sentence about the fox's day.\n"
-    "BADGER: One sentence about the badger's day.\n"
-    "SQUIRREL: One sentence about the squirrel's day.\n"
-    "MOLE: One cryptic sentence."
+    "You are the pompous editor-in-chief of The Tinywick Hollow Gazette, "
+    "a broadsheet for an absurd woodland civilisation. "
+    "Given today's events, write the front page. "
+    "Copy this format EXACTLY — including the blank lines, the colon labels, "
+    "and writing the headline in ALL CAPITALS:\n\n"
+    "WRITE YOUR ACTUAL HEADLINE HERE IN ALL CAPS\n\n"
+    "Write the actual article here. Three to four sentences. "
+    "Pompous, formal, treating trivial events as major news.\n\n"
+    "WEATHER: One sentence of absurd woodland weather.\n"
+    "FOX: One sentence about what Reginald Fox did today.\n"
+    "BADGER: One sentence about what Beatrice Badger did today.\n"
+    "SQUIRREL: One sentence about what Cornelius Squirrel did today.\n"
+    "MOLE: One cryptic sentence about Millicent Mole.\n\n"
+    "EXAMPLE OF CORRECT OUTPUT:\n"
+    "FOX PROPOSES REPLACING ACORNS WITH FORGED CERTIFICATES\n\n"
+    "Reginald Fox has formally proposed that the hollow's economy be restructured "
+    "entirely around certificates of authenticity, a development which Beatrice Badger "
+    "has declared unconstitutional on eleven separate counts. "
+    "The proposal has garnered significant attention from those who already "
+    "own several suspicious certificates.\n\n"
+    "WEATHER: Partly suspicious, with a seventy percent chance of decrees.\n"
+    "FOX: Forged three certificates before the morning dew had lifted.\n"
+    "BADGER: Filed eleven formal objections before elevenses.\n"
+    "SQUIRREL: Invented a certificate-counting machine that counts to seven then resets.\n"
+    "MOLE: Something certificated is already circulating underground.\n\n"
+    "NOW WRITE THE REAL GAZETTE ENTRY FOR TODAY."
 )
 
 # ═══════════════════════════════════════════════════════════════════
@@ -187,28 +203,76 @@ def _nudge_ctx(nudge_type, nudge_value, nudge_target, day_number):
         return f"A new law proposed: '{nudge_value}'."
     return ""
 
+# Words that indicate the model echoed a template instead of writing a real headline
+_TEMPLATE_WORDS = {"HEADLINE", "INSERT", "PLACEHOLDER", "CAPS HERE",
+                   "YOUR HEADLINE", "ACTUAL HEADLINE", "WRITE YOUR", "EXAMPLE"}
+
+def _is_template_headline(text: str) -> bool:
+    up = text.upper()
+    return any(w in up for w in _TEMPLATE_WORDS)
+
+# Labels that should never land in the article body
+_KNOWN_LABELS = {"WEATHER","FOX","BADGER","SQUIRREL","MOLE",
+                 "CLASSIFIEDS","EXAMPLE","NOW WRITE","CORRECT OUTPUT"}
+
 def _parse_newspaper_full(raw: str, day_number: int) -> dict:
     lines = [l.strip() for l in raw.strip().splitlines() if l.strip()]
     result = {
-        "headline": f"ANOTHER EVENTFUL DAY IN TINYWICK HOLLOW (DAY {day_number})",
+        "headline": f"BREAKING: DAY {day_number} IN TINYWICK HOLLOW",
         "article": "", "weather": "Overcast, with philosophical observations.",
-        "briefs": {c: f"{c.capitalize()} was present." for c in CREATURES},
+        "briefs": {c: "" for c in CREATURES},
     }
     body_start = 0
+
+    # Find headline: first ALL-CAPS line that isn't a template echo
     for i, line in enumerate(lines):
-        cleaned = re.sub(r'[*_#"\'`]', "", line).strip()
-        if cleaned and (cleaned == cleaned.upper() or i == 0):
-            result["headline"] = cleaned.upper(); body_start = i+1; break
+        cleaned = re.sub(r'[*_#"\'`]', "", line).strip().rstrip(":")
+        if not cleaned:
+            continue
+        if cleaned == cleaned.upper() and len(cleaned) > 8 and not _is_template_headline(cleaned):
+            result["headline"] = cleaned
+            body_start = i + 1
+            break
+        # Fallback: first line regardless (but still reject templates)
+        if i == 0 and not _is_template_headline(cleaned):
+            result["headline"] = cleaned.upper()
+            body_start = 1
+            break
+
     article_lines = []
+    skip_rest = False
     for line in lines[body_start:]:
-        u = line.upper()
-        if   u.startswith("WEATHER:"): result["weather"]           = line.split(":",1)[1].strip()
-        elif u.startswith("FOX:"):     result["briefs"]["fox"]      = line.split(":",1)[1].strip()
-        elif u.startswith("BADGER:"): result["briefs"]["badger"]    = line.split(":",1)[1].strip()
-        elif u.startswith("SQUIRREL:"):result["briefs"]["squirrel"] = line.split(":",1)[1].strip()
-        elif u.startswith("MOLE:"):   result["briefs"]["mole"]      = line.split(":",1)[1].strip()
-        else: article_lines.append(line)
+        u = line.upper().strip()
+        # Stop collecting article when we hit the example block
+        if "EXAMPLE OF CORRECT" in u or "NOW WRITE THE REAL" in u:
+            skip_rest = True
+        if skip_rest:
+            continue
+        # Route labelled lines to the right bucket
+        if   u.startswith("WEATHER:"):   result["weather"]            = line.split(":",1)[1].strip()
+        elif u.startswith("FOX:"):        result["briefs"]["fox"]      = line.split(":",1)[1].strip()
+        elif u.startswith("BADGER:"):     result["briefs"]["badger"]   = line.split(":",1)[1].strip()
+        elif u.startswith("SQUIRREL:"):   result["briefs"]["squirrel"] = line.split(":",1)[1].strip()
+        elif u.startswith("MOLE:"):       result["briefs"]["mole"]     = line.split(":",1)[1].strip()
+        elif u.startswith("CLASSIFIEDS:"): pass   # skip — we supply our own
+        elif any(u.startswith(lbl+":") for lbl in _KNOWN_LABELS): pass  # skip other labels
+        elif _is_template_headline(line): pass  # skip echoed format instructions
+        else:
+            article_lines.append(line)
+
     result["article"] = " ".join(article_lines).strip() or raw.strip()
+
+    # Fill in any empty briefs with a sensible default
+    defaults = {
+        "fox":      "Reginald Fox was seen conducting suspicious business.",
+        "badger":   "Beatrice Badger issued a firm statement.",
+        "squirrel": "Cornelius Squirrel invented something that nearly worked.",
+        "mole":     "Something is happening underground.",
+    }
+    for c in CREATURES:
+        if not result["briefs"].get(c):
+            result["briefs"][c] = defaults[c]
+
     return result
 
 def _run_simulation_step(nudge_type, nudge_value, nudge_target):