Refactor error handling in generate_llm to raise LLMBadRequestError on HTTP 400; add clear_history function to reset conversation history on bad requests.

app.py

@@ -14,7 +14,7 @@ from pydantic import BaseModel, Field, ValidationError
 
 from FLUX import generate_image
 from VoiceReply import generate_voice_reply
-from polLLM import generate_llm
+from polLLM import generate_llm, LLMBadRequestError  # <- assume this exception is raised on 400
 
 # --- Logging Setup ---------------------------------------------------------
 
@@ -64,6 +64,9 @@ def record_bot_message(chat_id, sender, message):
 def get_history_text(chat_id, sender):
     return "\n".join(history[(chat_id, sender)])
 
+def clear_history(chat_id, sender):
+    history[(chat_id, sender)].clear()
+
 # --- Bot Config & Client --------------------------------------------------
 
 class BotConfig:
@@ -259,7 +262,6 @@ def _fn_poll_end(mid, cid):
 def _fn_generate_images(message_id: str, chat_id: str, prompt: str,
                         count: int = 1, width: Optional[int] = None,
                         height: Optional[int] = None, **_):
-    # send accept message
     _fn_send_accept(message_id, chat_id, f"✨ Generating {count} image(s)…")
     for i in range(1, count+1):
         try:
@@ -365,7 +367,7 @@ ACTION_HANDLERS = {
     "send_text":      lambda mid,cid,**i: _fn_send_text(mid,cid,i["message"]),
 }
 
-# --- Intent Routing with Fallback ------------------------------------------
+# --- Intent Routing with Fallback & History‐Reset on 400 -------------------
 
 def route_intent(user_input: str, chat_id: str, sender: str):
     history_text = get_history_text(chat_id, sender)
@@ -388,7 +390,13 @@ def route_intent(user_input: str, chat_id: str, sender: str):
         "Otherwise, use send_text to reply with plain chat.\n"
     )
     prompt = f"{sys_prompt}\nConversation so far:\n{history_text}\n\nUser: {user_input}"
-    raw = generate_llm(prompt)
+
+    try:
+        raw = generate_llm(prompt)
+    except LLMBadRequestError:
+        # Clear history on HTTP 400 from the LLM
+        clear_history(chat_id, sender)
+        return SendTextIntent(action="send_text", message="Oops, I lost my train of thought—let’s start fresh!")
 
     # 1) Strict: try each Pydantic model
     try:
@@ -432,9 +440,10 @@ def route_intent(user_input: str, chat_id: str, sender: str):
         elif action == "poll_vote":
             kwargs["voter"] = sender
             kwargs["choice"] = int(data.get("choice",0))
-        # parse into Pydantic for uniformity
         try:
-            return next(M for M in INTENT_MODELS if getattr(M, "__fields__", {}).get("action").default == action).parse_obj({"action":action,**kwargs})
+            # coerce into Pydantic for uniform interface
+            model = next(m for m in INTENT_MODELS if getattr(m, "__fields__", {}).get("action").default == action)
+            return model.parse_obj({"action":action, **kwargs})
         except Exception:
             return SendTextIntent(action="send_text", message=raw)
 

polLLM.py

@@ -19,14 +19,19 @@ handler.setFormatter(logging.Formatter("%(asctime)s [%(levelname)s] %(message)s"
 logger.addHandler(handler)
 
 # --- LLM settings from config.yaml ---
-_DEFAULT_MODEL     = "openai-large" #_config.get("model", "openai-large")
+_DEFAULT_MODEL     = "openai-large"  # _config.get("model", "openai-large")
 _SYSTEM_TEMPLATE   = _config.get("system_prompt", "")
 _CHAR              = _config.get("char", "Eve")
 
+# --- Custom exception ---
+class LLMBadRequestError(Exception):
+    """Raised when the LLM returns HTTP 400 (Bad Request)."""
+    pass
+
 # --- OpenAI client init ---
 client = OpenAI(
-    base_url    = "https://text.pollinations.ai/openai",
-    api_key     = "OPENAI_API_KEY"
+    base_url="https://text.pollinations.ai/openai",
+    api_key="OPENAI_API_KEY"
 )
 
 def _build_system_prompt() -> str:
@@ -63,10 +68,9 @@ def generate_llm(
             logger.debug("LLM response received")
             return text
         except Exception as e:
-            # Check if the error is a 400 Bad Request
-            if hasattr(e, "status_code") and e.status_code == 400:
+            if getattr(e, "status_code", None) == 400:
                 logger.error("LLM error 400 (Bad Request): Not retrying.")
-                return "Error: Bad Request (400)"
+                raise LLMBadRequestError("LLM returned HTTP 400")
             logger.error(f"LLM error on attempt {attempt}: {e}")
             if attempt < 5:
                 time.sleep(backoff)
@@ -78,4 +82,7 @@ def generate_llm(
 # Example local test
 if __name__ == "__main__":
     logger.info("Testing generate_llm() with a sample prompt")
-    print(generate_llm("Say hello in a poetic style."))
+    try:
+        print(generate_llm("Say hello in a poetic style."))
+    except LLMBadRequestError as e:
+        logger.warning(f"Test failed with bad request: {e}")