Refactor image and voice reply generation functions for improved readability; enhance logging for better debugging and error handling.

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, LLMBadRequestError  # <- assume this exception is raised on 400
+from polLLM import generate_llm, LLMBadRequestError  # assume this exception is raised on 400
 
 # --- Logging Setup ---------------------------------------------------------
 
@@ -259,9 +259,15 @@ def _fn_poll_end(mid, cid):
     )
     _fn_send_text(mid, cid, txt)
 
-def _fn_generate_images(message_id: str, chat_id: str, prompt: str,
-                        count: int = 1, width: Optional[int] = None,
-                        height: Optional[int] = None, **_):
+def _fn_generate_images(
+    message_id: str,
+    chat_id: str,
+    prompt: str,
+    count: int = 1,
+    width: Optional[int] = None,
+    height: Optional[int] = None,
+    **_
+):
     _fn_send_accept(message_id, chat_id, f"✨ Generating {count} image(s)…")
     for i in range(1, count+1):
         try:
@@ -277,7 +283,12 @@ def _fn_generate_images(message_id: str, chat_id: str, prompt: str,
             logger.warning(f"Img {i}/{count} failed: {e}")
             _fn_send_text(message_id, chat_id, f"😢 Failed to generate image {i}/{count}.")
 
-def _fn_voice_reply(message_id: str, chat_id: str, prompt: str, **_):
+def _fn_voice_reply(
+    message_id: str,
+    chat_id: str,
+    prompt: str,
+    **_
+):
     proc = (
         f"Just say this exactly as written in a friendly, playful, "
         f"happy and helpful but a little bit clumsy-cute way: {prompt}"
@@ -398,15 +409,19 @@ def route_intent(user_input: str, chat_id: str, sender: str):
         clear_history(chat_id, sender)
         return SendTextIntent(action="send_text", message="Oops, I lost my train of thought—let’s start fresh!")
 
+    logger.debug(f"LLM raw response: {raw}")
+
     # 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)
 
     for M in INTENT_MODELS:
         try:
-            intent = M.parse_obj(parsed)
+            intent = M.model_validate(parsed)
+            logger.debug(f"Matched intent model: {M.__name__} with data {parsed}")
             return intent
         except ValidationError:
             continue
@@ -442,9 +457,15 @@ def route_intent(user_input: str, chat_id: str, sender: str):
             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)
-            return model.parse_obj({"action":action, **kwargs})
-        except Exception:
+            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)
@@ -476,7 +497,7 @@ async def whatsapp_webhook(request: Request):
     sender  = data["senderData"]["sender"]
     mid     = data["idMessage"]
     set_thread_context(chat_id, sender, mid)
-    logger.debug("Received webhook")
+    logger.debug(f"Received webhook for message {mid} from {sender}")
 
     if chat_id != BotConfig.BOT_GROUP_CHAT or data["typeWebhook"] != "incomingMessageReceived":
         return {"success": True}
@@ -488,8 +509,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...
     if low == "/help":
         _fn_send_text(mid, chat_id, help_text)
         return {"success": True}
@@ -543,15 +566,34 @@ async def whatsapp_webhook(request: Request):
         })
         return {"success": True}
 
+    # Skip mentions
     if tmd.get("contextInfo", {}).get("mentionedJidList"):
         return {"success": True}
 
-    effective = body
+    # Handle quoted replies to the bot
+    if md.get("typeMessage") == "quotedMessage":
+        ext    = md["extendedTextMessageData"]
+        quoted = md["quotedMessage"]
+        if ext.get("participant") == BotConfig.BOT_JID:
+            effective = (
+                f"Quoted: {quoted.get('textMessage','')}\n"
+                f"User:   {ext.get('text','')}"
+            )
+        else:
+            effective = body
+    else:
+        effective = body
+
+    # Route intent & dispatch
     intent = route_intent(effective, chat_id, sender)
+    logger.debug(f"Final intent: {intent}")
     handler = ACTION_HANDLERS.get(intent.action)
     if handler:
-        handler(mid, chat_id, **intent.dict(exclude={"action"}))
+        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}