hangman: add retry + log validation failures for word generation
Lint / Shell (shellcheck) (push) Successful in 9s
Lint / JS (eslint) (push) Successful in 7s
Lint / Python (ruff) (push) Successful in 5s
Lint / Python deps (pip-audit) (push) Failing after 42s
Lint / Secret scan (gitleaks) (push) Successful in 7s

Silent failures (word too long/short, has hyphens, empty hint) are now
logged as warnings showing the actual word/hint returned. Retry up to
2 times before giving up, matching riddle's behavior.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-04-26 15:19:58 -04:00
parent 0a486c2176
commit 6eb435010d
+33 -31
View File
@@ -1390,37 +1390,39 @@ async def _generate_hangman_word() -> dict | None:
'Format: {"word": "example", "hint": "short category or hint"}'
)
user_msg = "Pick a common English word between 5 and 8 letters (lowercase letters only, no hyphens or spaces) and give a short hint."
try:
timeout = aiohttp.ClientTimeout(total=60)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with session.post(
f"{OLLAMA_URL}/api/chat",
json={
"model": ASK_MODEL,
"stream": False,
"messages": [
{"role": "system", "content": system_msg},
{"role": "user", "content": user_msg},
],
},
) as response:
data = await response.json()
text = data.get("message", {}).get("content", "").strip()
if "```" in text:
text = re.sub(r"```[a-z]*\n?", "", text).strip()
m = re.search(r"\{[^{}]+\}", text, re.DOTALL)
candidate = m.group(0) if m else text
try:
parsed = json.loads(candidate)
except json.JSONDecodeError:
logger.warning("hangman: JSON parse failed, raw: %.200s", text)
parsed = {}
word = parsed.get("word", "").lower().strip()
hint = parsed.get("hint", "").strip()
if word.isalpha() and 5 <= len(word) <= 8 and hint:
return {"word": word, "hint": hint}
except Exception as e:
logger.error(f"hangman word generation error: {e}", exc_info=True)
for attempt in range(2):
try:
timeout = aiohttp.ClientTimeout(total=60)
async with aiohttp.ClientSession(timeout=timeout) as session:
async with session.post(
f"{OLLAMA_URL}/api/chat",
json={
"model": ASK_MODEL,
"stream": False,
"messages": [
{"role": "system", "content": system_msg},
{"role": "user", "content": user_msg},
],
},
) as response:
data = await response.json()
text = data.get("message", {}).get("content", "").strip()
if "```" in text:
text = re.sub(r"```[a-z]*\n?", "", text).strip()
m = re.search(r"\{[^{}]+\}", text, re.DOTALL)
candidate = m.group(0) if m else text
try:
parsed = json.loads(candidate)
except json.JSONDecodeError:
logger.warning("hangman: JSON parse failed (attempt %d), raw: %.200s", attempt + 1, text)
parsed = {}
word = parsed.get("word", "").lower().strip()
hint = parsed.get("hint", "").strip()
if word.isalpha() and 5 <= len(word) <= 8 and hint:
return {"word": word, "hint": hint}
logger.warning("hangman: validation failed (attempt %d): word=%r hint=%r", attempt + 1, word, hint)
except Exception as e:
logger.error(f"hangman word generation error (attempt {attempt + 1}): {e}", exc_info=True)
return None