Refactor intent handling by removing unused actions and improving error handling for LLM requests; update comments for clarity.

app.py

@@ -4,7 +4,7 @@ import requests
 import logging
 import queue
 import json
-from typing import List, Optional, Union, Literal
+from typing import List, Optional, Literal
 from collections import defaultdict, deque
 from concurrent.futures import ThreadPoolExecutor
 
@@ -273,7 +273,6 @@ class SendTextIntent(BaseIntent):
     action: Literal["send_text"]
     message: str
 
-# list of all intent models
 INTENT_MODELS = [
     JokeIntent, WeatherIntent,
     InspireIntent, GenerateImageIntent, SendTextIntent
@@ -287,7 +286,7 @@ ACTION_HANDLERS = {
     "send_text":      lambda mid,cid,**i: _fn_send_text(mid,cid,i["message"]),
 }
 
-# --- Intent Routing with Fallback & History‐Reset on 400 -------------------
+# --- Intent Routing with 400‐Retry & No Spam ------------------------------
 
 def route_intent(user_input: str, chat_id: str, sender: str):
     history_text = get_history_text(chat_id, sender)
@@ -304,16 +303,24 @@ def route_intent(user_input: str, chat_id: str, sender: str):
     )
     prompt = f"{sys_prompt}\nConversation so far:\n{history_text}\n\nUser: {user_input}"
 
+    # try primary LLM call
     try:
         raw = generate_llm(prompt)
     except LLMBadRequestError:
-        # Clear history on HTTP 400 from the LLM
+        # on 400: clear history, retry once without context
         clear_history(chat_id, sender)
-        return SendTextIntent(action="send_text", message="Oops, I lost my train of thought—let’s start fresh!")
+        logger.warning("LLMBadRequestError—cleared history, retrying without context")
+        prompt_retry = f"{sys_prompt}\nUser: {user_input}"
+        try:
+            raw = generate_llm(prompt_retry)
+        except LLMBadRequestError:
+            logger.error("LLMBadRequestError on retry—aborting intent routing")
+            return SendTextIntent(action="send_text",
+                                  message="Sorry, I'm having trouble. Please try again in a moment.")
 
     logger.debug(f"LLM raw response: {raw}")
 
-    # 1) Strict: try each Pydantic model
+    # 1) Strict: Pydantic validation
     try:
         parsed = json.loads(raw)
         logger.debug(f"Parsed JSON: {parsed}")
@@ -337,28 +344,13 @@ def route_intent(user_input: str, chat_id: str, sender: str):
         kwargs = {}
         if action == "generate_image":
             kwargs["prompt"] = data.get("prompt","")
-            kwargs["count"] = int(data.get("count", BotConfig.DEFAULT_IMAGE_COUNT))
-            kwargs["width"] = data.get("width")
+            kwargs["count"]  = int(data.get("count", BotConfig.DEFAULT_IMAGE_COUNT))
+            kwargs["width"]  = data.get("width")
             kwargs["height"] = data.get("height")
         elif action == "send_text":
             kwargs["message"] = data.get("message","")
-        elif action == "translate":
-            kwargs["lang"] = data.get("lang","")
-            kwargs["text"] = data.get("text","")
-        elif action == "summarize":
-            kwargs["text"] = data.get("text","")
-        elif action == "weather":
-            kwargs["location"] = data.get("location","")
-        elif action == "meme":
-            kwargs["text"] = data.get("text","")
-        elif action == "poll_create":
-            kwargs["question"] = data.get("question","")
-            kwargs["options"] = data.get("options",[])
-        elif action == "poll_vote":
-            kwargs["voter"] = sender
-            kwargs["choice"] = int(data.get("choice",0))
+        # ... add other parameter extractions if needed ...
         try:
-            # coerce into Pydantic for uniform interface
             model = next(
                 m for m in INTENT_MODELS
                 if getattr(m, "__fields__", {}).get("action").default == action
@@ -427,7 +419,7 @@ async def whatsapp_webhook(request: Request):
         parts = body[4:].split("|")
         pr = parts[0].strip()
         ct = int(parts[1]) if len(parts) > 1 and parts[1].isdigit() else BotConfig.DEFAULT_IMAGE_COUNT
-        width = int(parts[2]) if len(parts) > 2 and parts[2].isdigit() else None
+        width  = int(parts[2]) if len(parts) > 2 and parts[2].isdigit() else None
         height = int(parts[3]) if len(parts) > 3 and parts[3].isdigit() else None
         _fn_send_accept(mid, chat_id, f"✨ Generating {ct} image(s)…")
         task_queue.put({