Refactor route_intent function for improved prompt clarity and intent handling; enhance error messaging and logging

app.py

@@ -4,7 +4,7 @@ import requests
 import logging
 import queue
 import json
-from typing import List, Optional, Literal
+from typing import List, Optional, Union, Literal
 from collections import defaultdict, deque
 from concurrent.futures import ThreadPoolExecutor
 
@@ -356,6 +356,7 @@ class SendTextIntent(BaseIntent):
     action: Literal["send_text"]
     message: str
 
+# list of all intent models
 INTENT_MODELS = [
     SummarizeIntent, TranslateIntent, JokeIntent, WeatherIntent,
     InspireIntent, MemeIntent, PollCreateIntent, PollVoteIntent,
@@ -382,50 +383,98 @@ ACTION_HANDLERS = {
 def route_intent(user_input: str, chat_id: str, sender: str):
     history_text = get_history_text(chat_id, sender)
     sys_prompt = (
-        "You are Eve, a sweet, innocent, and helpful assistant.\n"
-        "You never do work yourself—you only invoke functions.\n"
-        "If the user’s request matches a function, return exactly one JSON object matching that signature—and nothing else.\n"
-        "Do not wrap it in markdown or show it to the user.\n"
-        "If no function matches, reply in plain text (no JSON, no internals).\n\n"
-        "Functions:\n"
-        "- summarize(text)\n"
-        "- translate(lang, text)\n"
-        "- joke()\n"
-        "- weather(location)\n"
-        "- inspire()\n"
-        "- meme(text)\n"
-        "- poll_create(question, options)\n"
-        "- poll_vote(voter, choice)\n"
-        "- poll_results()\n"
-        "- poll_end()\n"
-        "- generate_image(prompt, count, width, height)\n"
-        "- send_text(message)\n\n"
-        f"Conversation so far:\n{history_text}\n\n"
+        "You are Eve, a sweet, innocent, and helpful assistant. "
+        "You never perform work yourself—you only invoke one of the available functions. "
+        "When the user asks for something that matches a function signature, you must return exactly one JSON object matching that function’s parameters—and nothing else. "
+        "Do not wrap it in markdown, do not add extra text, and do not show the JSON to the user. "
+        "If the user’s request does not match any function, reply in plain text, and never mention JSON or internal logic.\n\n"
+        "Functions you can call:\n"
+        "  summarize(text)\n"
+        "  translate(lang, text)\n"
+        "  joke()\n"
+        "  weather(location)\n"
+        "  inspire()\n"
+        "  meme(text)\n"
+        "  poll_create(question, options)\n"
+        "  poll_vote(voter, choice)\n"
+        "  poll_results()\n"
+        "  poll_end()\n"
+        "  generate_image(prompt, count, width, height)\n"
+        "  send_text(message)\n\n"
+        "Conversation so far:\n"
+        f"{history_text}\n\n"
+        "Current user message:\n"
         f"User: {user_input}"
     )
 
+    #prompt = f"{sys_prompt}\nConversation so far:\n{history_text}\n\n current message: User: {user_input}"
+
     try:
         raw = generate_llm(sys_prompt)
     except LLMBadRequestError:
+        # Clear history on HTTP 400 from the LLM
         clear_history(chat_id, sender)
-        return SendTextIntent(action="send_text", message="Oops, let’s start fresh!")
+        return SendTextIntent(action="send_text", message="Oops, I lost my train of thought—let’s start fresh!")
 
     logger.debug(f"LLM raw response: {raw}")
 
-    # Attempt strict JSON parse
+    # 1) Strict: try each Pydantic model
     try:
         parsed = json.loads(raw)
+        logger.debug(f"Parsed JSON: {parsed}")
     except json.JSONDecodeError:
         return SendTextIntent(action="send_text", message=raw)
 
-    # Validate against each intent model
     for M in INTENT_MODELS:
         try:
-            return M.model_validate(parsed)
+            intent = M.model_validate(parsed)
+            logger.debug(f"Matched intent model: {M.__name__} with data {parsed}")
+            return intent
         except ValidationError:
             continue
 
-    # Fallback to plain text
+    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["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))
+        try:
+            # coerce into Pydantic for uniform interface
+            model = next(
+                m for m in INTENT_MODELS
+                if getattr(m, "__fields__", {}).get("action").default == action
+            )
+            intent = model.model_validate({"action":action, **kwargs})
+            logger.debug(f"Leniently matched intent model: {model.__name__} with kwargs {kwargs}")
+            return intent
+        except Exception as e:
+            logger.error(f"Lenient parsing into Pydantic failed: {e}")
+            return SendTextIntent(action="send_text", message=raw)
+
     return SendTextIntent(action="send_text", message=raw)
 
 # --- FastAPI & Webhook ----------------------------------------------------
@@ -442,7 +491,7 @@ help_text = (
     "• /meme <text>\n"
     "• /poll <Q>|… / /results / /endpoll\n"
     "• /gen <prompt>|<count>|<width>|<height>\n"
-    "Otherwise chat or reply to invoke tools."
+    "Otherwise chat or reply to my message to invoke tools."
 )
 
 @app.post("/whatsapp")
@@ -455,6 +504,7 @@ async def whatsapp_webhook(request: Request):
     sender  = data["senderData"]["sender"]
     mid     = data["idMessage"]
     set_thread_context(chat_id, sender, mid)
+    logger.debug(f"Received webhook for message {mid} from {sender}")
 
     if chat_id != BotConfig.BOT_GROUP_CHAT or data["typeWebhook"] != "incomingMessageReceived":
         return {"success": True}
@@ -466,9 +516,10 @@ async def whatsapp_webhook(request: Request):
 
     body = (tmd.get("textMessage") or tmd.get("text","")).strip()
     record_user_message(chat_id, sender, body)
+    logger.debug(f"User message: {body}")
 
     low = body.lower()
-    # Slash commands....
+    # Slash commands...
     if low == "/help":
         _fn_send_text(mid, chat_id, help_text)
         return {"success": True}
@@ -543,14 +594,13 @@ async def whatsapp_webhook(request: Request):
     # Route intent & dispatch
     intent = route_intent(effective, chat_id, sender)
     logger.debug(f"Final intent: {intent}")
-
-    # Normal routing
-    intent = route_intent(body, chat_id, sender)
     handler = ACTION_HANDLERS.get(intent.action)
     if handler:
         kwargs = intent.model_dump(exclude={"action"})
+        logger.debug(f"Dispatching action '{intent.action}' with args {kwargs}")
         handler(mid, chat_id, **kwargs)
     else:
+        logger.warning(f"No handler for action '{intent.action}'")
         _fn_send_text(mid, chat_id, "Sorry, I didn't understand that.")
 
     return {"success": True}