Refactor handle_image_generation function for improved error handling and clarity; update system prompt in config.yaml with enhanced command descriptions.

app.py

@@ -147,27 +147,24 @@ 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):
-        for attempt in range(1, 4):
-            try:
-                img, path, ret_prompt, url = generate_image(
-                    prompt,
-                    message_id,
-                    f"{message_id}_{i}",
-                    BotConfig.IMAGE_DIR
-                )
-                if not img:
-                    raise RuntimeError("No image returned")
-                formatted = "\n\n".join(f"_{p.strip()}_" for p in ret_prompt.split("\n\n") if p.strip())
-                caption = f"✨ Image {i}/{count}: {url}\n>{chr(8203)} {formatted}"
-                client.send_media(message_id, chat_id, path, caption, media_type="image")
-                os.remove(path)
-                break
-            except Exception as e:
-                logging.warning(f"Image {i}/{count} attempt {attempt} failed: {e}")
-                time.sleep(2 * attempt)
-        else:
-            client.send_message(message_id, chat_id, f"😢 Failed to generate image {i}.")
+        try:
+            img, path, ret_prompt, url = generate_image(
+                prompt,
+                message_id,
+                message_id,
+                BotConfig.IMAGE_DIR
+            )
+            if not img:
+                raise RuntimeError("generate_image returned no image")
+            formatted = "\n\n".join(f"_{p.strip()}_" for p in ret_prompt.split("\n\n") if p.strip())
+            caption = f"✨ Image {i}/{count}: {url}\n>{chr(8203)} {formatted}"
+            client.send_media(message_id, chat_id, path, caption, media_type="image")
+            os.remove(path)
+        except Exception as e:
+            logging.warning(f"Image {i}/{count} failed: {e}")
+            client.send_message(message_id, chat_id, f"😢 Failed to generate image {i}/{count}.")
 
 # --- Startup ---
 
@@ -206,7 +203,7 @@ async def whatsapp_webhook(request: Request):
     global last_message_time
     last_message_time = time.time()
 
-    # --- Auth & basic routing ---
+    # Auth
     if request.headers.get("Authorization") != f"Bearer {BotConfig.WEBHOOK_AUTH_TOKEN}":
         raise HTTPException(403, "Unauthorized")
 
@@ -218,19 +215,19 @@ async def whatsapp_webhook(request: Request):
     md = data.get("messageData", {})
     mid = data["idMessage"]
 
-    # --- Extract text + contextInfo in one go ---
+    # Extract text + context
     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 if this is a quoted/replied message ---
+    # Skip replies/quotes
     if ctx.get("quotedMessageId") or ctx.get("quotedMessage"):
         logging.debug("Skipping quoted/reply message")
         return {"success": True}
 
-    # --- SKIP if someone is @-mentioned ---
+    # Skip @-mentions
     if ctx.get("mentionedJidList"):
         logging.debug("Skipping mention")
         return {"success": True}

config.yaml

@@ -2,22 +2,24 @@ config:
   llm:
     model: koboldcpp/HF_SPACE_Tiefighter-13B
     system_prompt: |-
-      You are {char}, a sweet and helpful AI assistant in Telegram and WhatsApp. 
-      You generate images and voice, text replies, and support these commands:
-      • /help — list all commands  
-      • /gen <prompt> — generate an image  
-      • /summarize <text>  
-      • /translate <lang>|<text>  
-      • /joke  
-      • /weather <location>  
-      • /inspire  
-      • /trivia  
-      • /answer  
-      • /meme <text>  
-      • /poll <Q>|<opt1>|<opt2>|…  
-      • /results  
-      • /endpoll  
-      Use a concise, friendly tone. If a command is malformed, gently ask the user to correct it. For any other message, respond via voice or text.  
+      You are {char}, a sweet and helpful AI assistant in Telegram and WhatsApp.
+      You generate images, voice and text replies, and support these commands:
+        • /help — list all commands
+        • /gen <prompt>|<count> — generate <count> images (default 4)
+        • /summarize <text> — get a concise summary
+        • /translate <lang>|<text> — translate text
+        • /joke — tell a short joke
+        • /weather <location> — short, creative weather report in °C
+        • /weatherpoem <location> — poetic weather summary in °C
+        • /inspire — inspirational quote
+        • /trivia — start a trivia question
+        • /answer — answer the current trivia
+        • /meme <text> — generate a meme image
+        • /poll <Q>|<opt1>|<opt2>|… — create a poll
+        • /results — show poll results
+        • /endpoll — end the poll
+      Use a concise, friendly tone. If a command is malformed, gently ask the user to correct it.
+      For any other message, respond via voice or text.
     char: Eve
 
   SD: