Update app.py

app.py

@@ -116,7 +116,7 @@ AGENT_PROMPTS: dict[str, str] = {
     ),
 }
 NARRATOR_PROMPT = (
-    "You are the pompous editor-in-chief of The Tinywick Hollow Gazette, "
+    "CRITICAL RULES: (1) Do NOT start with the newspaper name. (2) Do NOT use markdown — no asterisks, no hashtags, no bold text, no bullet points. (3) Write plain flowing prose only. (4) The HEADLINE must be specific breaking news, never the paper name.\n\n""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, "
@@ -205,13 +205,33 @@ def _nudge_ctx(nudge_type, nudge_value, nudge_target, day_number):
 
 # 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"}
+                   "YOUR HEADLINE", "ACTUAL HEADLINE", "WRITE YOUR", "EXAMPLE",
+                   "TINYWICK", "GAZETTE", "THE GAZETTE", "HOLLOW GAZETTE"}
 
 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
+def _strip_markdown(text: str) -> str:
+    if not text: return text
+    # Bold/italic anywhere: **x** *x* ***x*** -> x
+    text = re.sub(r'\*{1,3}(.+?)\*{1,3}', r'\1', text, flags=re.DOTALL)
+    # Headers at line start: ## Heading -> Heading
+    text = re.sub(r'^#{1,6}\s+', '', text, flags=re.MULTILINE)
+    # Headers mid-line: "text ### Heading more" -> "text Heading more"
+    text = re.sub(r'\s*#{1,6}\s+', ' ', text)
+    # Any remaining lone # characters
+    text = re.sub(r'(?<![\w])#{1,6}(?![\w])', '', text)
+    # Inline code: `x` -> x
+    text = re.sub(r'`+(.+?)`+', r'\1', text)
+    # Horizontal rules (--- *** ___)
+    text = re.sub(r'^[-*_]{3,}\s*$', '', text, flags=re.MULTILINE)
+    # Collapse extra spaces
+    text = re.sub(r' {2,}', ' ', text)
+    return text.strip()
+
+
 _KNOWN_LABELS = {"WEATHER","FOX","BADGER","SQUIRREL","MOLE",
                  "CLASSIFIEDS","EXAMPLE","NOW WRITE","CORRECT OUTPUT"}
 
@@ -249,18 +269,18 @@ def _parse_newspaper_full(raw: str, day_number: int) -> dict:
         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()
+        if   u.startswith("WEATHER:"):   result["weather"]            = _strip_markdown(line.split(":",1)[1].strip())
+        elif u.startswith("FOX:"):        result["briefs"]["fox"]      = _strip_markdown(line.split(":",1)[1].strip())
+        elif u.startswith("BADGER:"):     result["briefs"]["badger"]   = _strip_markdown(line.split(":",1)[1].strip())
+        elif u.startswith("SQUIRREL:"):   result["briefs"]["squirrel"] = _strip_markdown(line.split(":",1)[1].strip())
+        elif u.startswith("MOLE:"):       result["briefs"]["mole"]     = _strip_markdown(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()
+    result["article"] = _strip_markdown(" ".join(article_lines).strip() or raw.strip())
 
     # Fill in any empty briefs with a sensible default
     defaults = {
@@ -270,7 +290,9 @@ def _parse_newspaper_full(raw: str, day_number: int) -> dict:
         "mole":     "Something is happening underground.",
     }
     for c in CREATURES:
-        if not result["briefs"].get(c):
+        if result["briefs"].get(c):
+            result["briefs"][c] = _strip_markdown(result["briefs"][c])
+        else:
             result["briefs"][c] = defaults[c]
 
     return result
@@ -713,16 +735,17 @@ window.tinyCivNewEdition = function() {
 def _e(t): return (t or "").replace("&","&amp;").replace("<","&lt;").replace(">","&gt;")
 
 def _speech_text(parsed: dict) -> str:
-    hed  = parsed.get("headline","")
-    art  = parsed.get("article","")
-    wx   = parsed.get("weather","")
-    brf  = parsed.get("briefs",{})
-    parts = [f"Today's headline: {hed}.", art,
-             f"Weather: {wx}.",
-             f"Fox: {brf.get('fox','')}",
-             f"Badger: {brf.get('badger','')}",
-             f"Squirrel: {brf.get('squirrel','')}",
-             f"Mole: {brf.get('mole','')}"]
+    hed = _strip_markdown(parsed.get("headline",""))
+    art = _strip_markdown(parsed.get("article",""))
+    wx  = _strip_markdown(parsed.get("weather",""))
+    brf = parsed.get("briefs",{})
+    parts = [
+        f"Today's headline: {hed}.", art, f"Weather: {wx}.",
+        f"Fox: {_strip_markdown(brf.get('fox',''))}",
+        f"Badger: {_strip_markdown(brf.get('badger',''))}",
+        f"Squirrel: {_strip_markdown(brf.get('squirrel',''))}",
+        f"Mole: {_strip_markdown(brf.get('mole',''))}",
+    ]
     return " ".join(p for p in parts if p.strip()).replace('"',"'")
 
 def _html_paper(parsed: dict, classified: str, day_num: int) -> str:
@@ -757,8 +780,7 @@ def _html_paper(parsed: dict, classified: str, day_num: int) -> str:
   </div>
   <div class="paper-classifieds"><span>CLASSIFIEDS:</span> {cl}</div>
   <div class="tts-bar">
-    <button class="tts-btn" onclick="tinyCivReadAloud()">🔊 Read Today's News</button>
-    <button class="tts-stop" id="tinyc-tts-stop" onclick="tinyCivStopReading()">⏹ Stop</button>
+    <button class="tts-btn" onclick="var b=this;if(window.speechSynthesis&&window.speechSynthesis.speaking){{window.speechSynthesis.cancel();b.textContent=String.fromCodePoint(0x1F50A)+' Read Aloud';return;}}if(!window.speechSynthesis)return;var p=document.querySelector('.paper-wrap[data-speech]');if(!p)return;var u=new SpeechSynthesisUtterance(p.getAttribute('data-speech'));u.rate=0.82;u.pitch=1.1;b.textContent=String.fromCodePoint(0x23F9)+' Stop';u.onend=u.onerror=function(){{b.textContent=String.fromCodePoint(0x1F50A)+' Read Aloud';}};window.speechSynthesis.speak(u);">🔊 Read Aloud</button>
   </div>
   <div class="paper-daybadge">— Day {day_num} —&nbsp;&nbsp; {emojis}</div>
 </div>