Refactor intent handling to use Pydantic models for strict parsing; update GenerateImageIntent to inherit from BaseModel and improve route_intent function for better error handling and data extraction.

app.py

@@ -330,7 +330,7 @@ class PollResultsIntent(BaseIntent):
 class PollEndIntent(BaseIntent):
     action: Literal["poll_end"]
 
-class GenerateImageIntent(BaseIntent):
+class GenerateImageIntent(BaseModel):
     action: Literal["generate_image"]
     prompt: str
     count: int = Field(default=1, ge=1)
@@ -341,7 +341,8 @@ class SendTextIntent(BaseIntent):
     action: Literal["send_text"]
     message: str
 
-IntentUnion = Union[
+# list of all intent models
+INTENT_MODELS = [
     SummarizeIntent, TranslateIntent, JokeIntent, WeatherIntent,
     InspireIntent, MemeIntent, PollCreateIntent, PollVoteIntent,
     PollResultsIntent, PollEndIntent, GenerateImageIntent, SendTextIntent
@@ -364,7 +365,7 @@ ACTION_HANDLERS = {
 
 # --- Intent Routing with Fallback ------------------------------------------
 
-def route_intent(user_input: str, chat_id: str, sender: str) -> IntentUnion:
+def route_intent(user_input: str, chat_id: str, sender: str):
     history_text = get_history_text(chat_id, sender)
     sys_prompt = (
         "You are Eve. You can either chat or call one of these functions:\n"
@@ -384,53 +385,56 @@ def route_intent(user_input: str, chat_id: str, sender: str) -> IntentUnion:
         "  {\"action\":\"generate_image\",\"prompt\":\"a red fox\",\"count\":3,\"width\":512,\"height\":512}\n"
         "Otherwise, use send_text to reply with plain chat.\n"
     )
-    prompt = (
-        f"{sys_prompt}\n"
-        f"Conversation so far:\n{history_text}\n\n"
-        f"User: {user_input}"
-    )
+    prompt = f"{sys_prompt}\nConversation so far:\n{history_text}\n\nUser: {user_input}"
     raw = generate_llm(prompt)
 
-    # 1) Try strict Pydantic parse
+    # 1) Strict: try each Pydantic model
     try:
         parsed = json.loads(raw)
-        intent = IntentUnion.parse_obj(parsed)
-        return intent
-    except (json.JSONDecodeError, ValidationError) as e:
-        logger.warning(f"Strict parse failed: {e}. Falling back to lenient.")
-
-    # 2) Lenient: basic JSON get + defaults
-    try:
-        data = json.loads(raw)
     except json.JSONDecodeError:
         return SendTextIntent(action="send_text", message=raw)
 
-    action = data.get("action")
+    for M in INTENT_MODELS:
+        try:
+            intent = M.parse_obj(parsed)
+            return intent
+        except ValidationError:
+            continue
+
+    logger.warning("Strict parse failed for all models, falling back to lenient")
+
+    # 2) Lenient JSON get
+    action = parsed.get("action")
     if action in ACTION_HANDLERS:
+        data = parsed
         kwargs = {}
         if action == "generate_image":
-            kwargs["prompt"] = data.get("prompt", "")
+            kwargs["prompt"] = data.get("prompt","")
             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", "")
+            kwargs["message"] = data.get("message","")
         elif action == "translate":
-            kwargs["lang"] = data.get("lang", "")
-            kwargs["text"] = data.get("text", "")
+            kwargs["lang"] = data.get("lang","")
+            kwargs["text"] = data.get("text","")
         elif action == "summarize":
-            kwargs["text"] = data.get("text", "")
+            kwargs["text"] = data.get("text","")
         elif action == "weather":
-            kwargs["location"] = data.get("location", "")
+            kwargs["location"] = data.get("location","")
         elif action == "meme":
-            kwargs["text"] = data.get("text", "")
+            kwargs["text"] = data.get("text","")
         elif action == "poll_create":
-            kwargs["question"] = data.get("question", "")
-            kwargs["options"] = data.get("options", [])
+            kwargs["question"] = data.get("question","")
+            kwargs["options"] = data.get("options",[])
         elif action == "poll_vote":
             kwargs["voter"] = sender
-            kwargs["choice"] = int(data.get("choice", 0))
-        return IntentUnion.parse_obj({"action": action, **kwargs})
+            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})
+        except Exception:
+            return SendTextIntent(action="send_text", message=raw)
 
     return SendTextIntent(action="send_text", message=raw)
 
@@ -531,9 +535,7 @@ async def whatsapp_webhook(request: Request):
     if tmd.get("contextInfo", {}).get("mentionedJidList"):
         return {"success": True}
 
-    # Handle quoted replies if needed...
     effective = body
-
     intent = route_intent(effective, chat_id, sender)
     handler = ACTION_HANDLERS.get(intent.action)
     if handler: