Refactor image handling in handle_image_generation to streamline image sending and improve error handling

app.py

@@ -112,30 +112,6 @@ def send_image(message_id, to_number, image_path, caption="Here you go!", retrie
         except requests.RequestException as e:
             if i == retries - 1:
                 return {"error": str(e)}
-        finally:
-            for _, filetuple in files:
-                filetuple[1].close()
-
-def send_images(message_id, to_number, image_paths, caption="Here are your images!", retries=3):
-    """
-    Sends multiple images concurrently by calling send_image for each image in parallel.
-    """
-    responses = []
-    threads = []
-    lock = threading.Lock()
-
-    def send_single(image_path):
-        resp = send_image(message_id, to_number, image_path, caption)
-        with lock:
-            responses.append(resp)
-
-    for path in image_paths:
-        t = threading.Thread(target=send_single, args=(path,))
-        t.start()
-        threads.append(t)
-    for t in threads:
-        t.join()
-    return responses
 
 def send_audio(message_id, to_number, audio_path, retries=3):
     logging.debug("send_audio")
@@ -182,39 +158,24 @@ def response_audio(message_id, chat_id, prompt):
         send_message(message_id, chat_id, "Error generating audio. Try again later.")
 
 def handle_image_generation(message_id, chat_id, prompt):
-    try:
-        images_info = []
-        # Generate 4 images using the same prompt.
-        for _ in range(4):
+    for i in range(4):
+        try:
             img, path, ret_prompt, url = generate_image(prompt, message_id, message_id, image_dir)
-            if not img:
+            if img:
+                formatted_ret_prompt = "\n\n".join(
+                    f"_{paragraph.strip()}_" for paragraph in ret_prompt.split("\n\n") if paragraph.strip()
+                )
+                send_image(
+                    message_id,
+                    chat_id,
+                    path,
+                    caption=f"✨ Image ready: {url}\n>{chr(8203)} {formatted_ret_prompt}"
+                )
+            else:
                 send_message(message_id, chat_id, "Image generation failed.")
-                return
-            images_info.append((path, ret_prompt, url))
-        
-        # Build caption with URLs of all images.
-        caption = "✨ Images ready:\n" + "\n".join(url for _, _, url in images_info)
-        
-        # Send first 3 images without caption.
-        for path, _, _ in images_info[:3]:
-            result = send_image(message_id, chat_id, path, caption="")
-            if "error" in result:
-                send_message(message_id, chat_id, "Failed to send one of the images.")
-        
-        # Send the last image with the caption.
-        last_image_path = images_info[3][0]
-        result = send_image(message_id, chat_id, last_image_path, caption=caption)
-        if "error" in result:
-            send_message(message_id, chat_id, "Failed to send the final image with caption.")
-        
-        # Cleanup generated image files.
-        for path, _, _ in images_info:
-            if os.path.exists(path):
-                os.remove(path)
-    except Exception as e:
-        logging.error("Error in handle_image_generation: %s", e)
-        send_message(message_id, chat_id, "Error generating images.")
-
+        except Exception as e:
+            logging.error("Error in handle_image_generation: %s", e)
+            send_message(message_id, chat_id, "Error generating image.")
 
 # --- Startup Message ---
 def send_startup_message():
@@ -227,22 +188,22 @@ def send_startup_message():
         logging.warning("BOT_STATUS_CHAT is not set; startup message not sent.")
 
 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 of your text._\n"
-    "• */translate <language>|<text>* – _Translate text to your chosen language._\n"
-    "• */joke* – _Enjoy a random, funny joke._\n"
-    "• */weather <location>* – _Get the current weather for a location._\n"
-    "• */inspire* – _Receive a short inspirational quote._\n"
-    "• */trivia* – _Start a new trivia question._\n"
-    "• */answer [your answer]* – _Reveal the trivia answer or check your answer if provided._\n"
-    "• */meme <text>* – _Generate a fun meme image._\n"
-    "• */poll <Question>|<Option1>|<Option2>|…* – _Create a poll._\n"
-    "• */results* – _See current poll results._\n"
-    "• */endpoll* – _End the poll and show final results._\n"
-    "• */gen <prompt>* – _Generate an image from your prompt._\n\n"
-    "Send any other text and I'll reply with a voice message. I'm here to help, so don't hesitate to ask!"
-)
+            "🤖 *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 of your text._\n"
+            "• */translate <language>|<text>* – _Translate text to your chosen language._\n"
+            "• */joke* – _Enjoy a random, funny joke._\n"
+            "• */weather <location>* – _Get the current weather for a location._\n"
+            "• */inspire* – _Receive a short inspirational quote._\n"
+            "• */trivia* – _Start a new trivia question._\n"
+            "• */answer [your answer]* – _Reveal the trivia answer or check your answer if provided._\n"
+            "• */meme <text>* – _Generate a fun meme image._\n"
+            "• */poll <Question>|<Option1>|<Option2>|…* – _Create a poll._\n"
+            "• */results* – _See current poll results._\n"
+            "• */endpoll* – _End the poll and show final results._\n"
+            "• */gen <prompt>* – _Generate an image from your prompt._\n\n"
+            "Send any other text and I'll reply with a voice message. I'm here to help, so don't hesitate to ask!"
+        )
 
 # --- Webhook ---
 @app.post("/whatsapp")
@@ -359,12 +320,14 @@ async def whatsapp_webhook(request: Request):
             send_message(mid, chat, "Failed to generate trivia. Please try again.")
         return {"success": True}
 
-    # ANSWER
+    # ANSWER: Accept any message starting with /answer. If additional text is provided, check it.
     if low.startswith("/answer"):
+        # Remove command and any extra spaces
         user_response = body[len("/answer"):].strip()
         if chat in trivia_store:
             correct_answer = trivia_store[chat]["answer"]
             question = trivia_store[chat]["question"]
+            # If user provided an answer, evaluate it via LLM; otherwise, just reveal the answer.
             if user_response:
                 eval_prompt = (
                     f"Question: {question}\n"
@@ -469,6 +432,7 @@ def index():
     return "Server is running!"
 
 if __name__ == "__main__":
+    # Send startup message on launch
     def send_startup_message():
         if BOT_STATUS_CHAT:
             startup_msg = "🌟 Hi! I'm Eve, your friendly AI assistant. I'm now live and ready to help with images, voice replies, and more!"