Refactor BotConfig validation to include BOT_JID; improve help text formatting and clarity in command descriptions.

app.py

@@ -16,24 +16,28 @@ from polLLM import generate_llm
 # --- Configuration and Client Classes ---
 
 class BotConfig:
-    GREEN_API_URL           = os.getenv("GREEN_API_URL")
-    GREEN_API_MEDIA_URL     = os.getenv("GREEN_API_MEDIA_URL", "https://api.green-api.com")
-    GREEN_API_TOKEN         = os.getenv("GREEN_API_TOKEN")
-    GREEN_API_ID_INSTANCE   = os.getenv("GREEN_API_ID_INSTANCE")
-    WEBHOOK_AUTH_TOKEN      = os.getenv("WEBHOOK_AUTH_TOKEN")
-    BOT_GROUP_CHAT          = "[email protected]"
-    IMAGE_DIR               = "/tmp/images"
-    AUDIO_DIR               = "/tmp/audio"
-    DEFAULT_IMAGE_COUNT     = 4
+    GREEN_API_URL         = os.getenv("GREEN_API_URL")
+    GREEN_API_MEDIA_URL   = os.getenv("GREEN_API_MEDIA_URL", "https://api.green-api.com")
+    GREEN_API_TOKEN       = os.getenv("GREEN_API_TOKEN")
+    GREEN_API_ID_INSTANCE = os.getenv("GREEN_API_ID_INSTANCE")
+    WEBHOOK_AUTH_TOKEN    = os.getenv("WEBHOOK_AUTH_TOKEN")
+    BOT_GROUP_CHAT        = "[email protected]"
+    BOT_JID               = os.getenv("BOT_JID")          # e.g. "[email protected]"
+    IMAGE_DIR             = "/tmp/images"
+    AUDIO_DIR             = "/tmp/audio"
+    DEFAULT_IMAGE_COUNT   = 4
 
     @classmethod
     def validate(cls):
-        missing = [name for name in (
-            "GREEN_API_URL",
-            "GREEN_API_TOKEN",
-            "GREEN_API_ID_INSTANCE",
-            "WEBHOOK_AUTH_TOKEN",
-        ) if not getattr(cls, name)]
+        missing = [
+            name for name in (
+                "GREEN_API_URL",
+                "GREEN_API_TOKEN",
+                "GREEN_API_ID_INSTANCE",
+                "WEBHOOK_AUTH_TOKEN",
+                "BOT_JID",
+            ) if not getattr(cls, name)
+        ]
         if missing:
             raise ValueError(f"Environment variables not set: {', '.join(missing)}")
 
@@ -147,14 +151,10 @@ def handle_image_generation(task):
     prompt     = task["prompt"]
     count      = task.get("num_images", BotConfig.DEFAULT_IMAGE_COUNT)
 
-    # simple loop: one generate_image call per image
     for i in range(1, count + 1):
         try:
             img, path, ret_prompt, url = generate_image(
-                prompt,
-                message_id,
-                message_id,
-                BotConfig.IMAGE_DIR
+                prompt, message_id, message_id, BotConfig.IMAGE_DIR
             )
             if not img:
                 raise RuntimeError("generate_image returned no image")
@@ -179,23 +179,22 @@ send_startup_message()
 # --- FastAPI App & Webhook ---
 
 app = FastAPI()
+
 help_text = (
     "🤖 *Hi there, I'm Eve!* Here are the commands you can use:\n\n"
-    "• */help* – _Show this help message._\n"
-    "• */summarize <text>* – _Get a quick summary._\n"
-    "• */translate <language>|<text>* – _Translate text._\n"
-    "• */joke* – _Get a joke._\n"
-    "• */weather <location>* – _Short, creative weather report (°C)._ \n"
-    "• */weatherpoem <location>* – _Poetic weather summary._\n"
-    "• */inspire* – _Get an inspirational quote._\n"
-    "• */trivia* – _Start trivia._\n"
-    "• */answer* – _Answer trivia._\n"
-    "• */meme <text>* – _Generate a meme._\n"
-    "• */poll Q|A|B…* – _Create a poll._\n"
-    "• */results* – _Show poll results._\n"
-    "• */endpoll* – _End the poll._\n"
-    "• */gen <prompt>|<count>* – _Generate images (default 4)._ \n\n"
-    "Any other text → I'll send you a voice reply!"
+    "• */help* – list commands\n"
+    "• */gen <prompt>|<count>* – generate images (default 4)\n"
+    "• */summarize <text>*\n"
+    "• */translate <lang>|<text>*\n"
+    "• */joke*\n"
+    "• */weather <location>*\n"
+    "• */weatherpoem <location>*\n"
+    "• */inspire*\n"
+    "• */trivia* / *answer*\n"
+    "• */meme <text>*\n"
+    "• */poll <Q>|<opt1>|… / /results / /endpoll*\n\n"
+    "Reply to one of my messages → I'll LLM‑answer it.\n"
+    "Any other text → voice reply."
 )
 
 @app.post("/whatsapp")
@@ -207,34 +206,49 @@ async def whatsapp_webhook(request: Request):
     if request.headers.get("Authorization") != f"Bearer {BotConfig.WEBHOOK_AUTH_TOKEN}":
         raise HTTPException(403, "Unauthorized")
 
-    data = await request.json()
+    data    = await request.json()
     chat_id = data.get("senderData", {}).get("chatId")
     if chat_id != BotConfig.BOT_GROUP_CHAT or data.get("typeWebhook") != "incomingMessageReceived":
         return {"success": True}
 
-    md = data.get("messageData", {})
-    mid = data["idMessage"]
-
-    # Extract text + context
+    md   = data.get("messageData", {})
+    mid  = data["idMessage"]
     text_data = md.get("textMessageData") or md.get("extendedTextMessageData")
     if not text_data:
         return {"success": True}
+
     body = text_data.get("textMessage", text_data.get("text", "")).strip()
     ctx  = text_data.get("contextInfo", {})
 
-    # Skip replies/quotes
-    if ctx.get("quotedMessageId") or ctx.get("quotedMessage"):
-        logging.debug("Skipping quoted/reply message")
+    # --- Quoted‑reply handling ---
+    if ctx.get("quotedMessageId"):
+        # only if the quoted message was sent by our bot
+        quoted_sender = ctx.get("participant") or ctx.get("quotedMessageSender")
+        if quoted_sender == BotConfig.BOT_JID:
+            # extract quoted text
+            qm = ctx.get("quotedMessage", {})
+            if "textMessageData" in qm:
+                quoted_text = qm["textMessageData"].get("textMessage", "")
+            else:
+                quoted_text = qm.get("extendedTextMessageData", {}).get("text", "")
+            # build and send LLM reply
+            prompt = (
+                f"You asked: {quoted_text}\n"
+                f"User replied: {body}\n"
+                "Provide a helpful, concise follow‑up."
+            )
+            reply = generate_llm(prompt)
+            client.send_message(mid, chat_id, reply)
+        # in either case, do not process further
         return {"success": True}
 
-    # Skip @-mentions
+    # --- Skip @‑mentions of others ---
     if ctx.get("mentionedJidList"):
-        logging.debug("Skipping mention")
         return {"success": True}
 
     low = body.lower()
 
-    # --- COMMANDS ---
+    # --- COMMANDS (unchanged) ---
     if low == "/help":
         client.send_message(mid, chat_id, help_text)
         return {"success": True}