fix image generation failing

app.py

@@ -5,7 +5,7 @@ Description: A comprehensive WhatsApp bot with a professional, class-based struc
              Features include image generation, image editing, voice replies,
              and various utility functions, all handled by an asynchronous task queue.
              Includes request logging and chat ID filtering.
-             Version 2.1.0: Added caching for bot-sent images to allow for editing via replies.
+             Version 2.3.0: Fixed image generation ID mismatch issue.
 """
 
 import os
@@ -306,7 +306,7 @@ class WhatsAppBot:
         # NEW: Cache for bot-sent image message IDs and their local file paths
         self.sent_image_path_cache = defaultdict(lambda: deque(maxlen=50))
 
-        self.fastapi_app = FastAPI(title="WhatsApp Eve Bot", version="2.1.0")
+        self.fastapi_app = FastAPI(title="WhatsApp Eve Bot", version="2.3.0")
         self._setup_routes()
         self._start_workers()
 
@@ -539,7 +539,27 @@ class WhatsAppBot:
         for i in range(count):
             path = None
             try:
-                _, path, _, _ = generate_image(prompt, mid, str(i), self.config.IMAGE_DIR, width=task.get("width"), height=task.get("height"))
+                # Create a unique ID for each image in the batch to avoid mismatches.
+                unique_image_id = f"{mid}_{i}"
+                
+                # Call the image generation library with matching IDs
+                generation_result = generate_image(
+                    prompt, 
+                    unique_image_id, 
+                    unique_image_id, 
+                    self.config.IMAGE_DIR, 
+                    width=task.get("width"), 
+                    height=task.get("height")
+                )
+
+                # If generation fails, the result will be None. Handle this gracefully.
+                if not generation_result:
+                    self.logger.error(f"Image generation {i+1} failed because the generator returned None.")
+                    self.api_client.send_message(chat_id, f"😢 Failed to generate image {i+1}.", mid)
+                    continue # Move to the next image in the loop
+
+                _, path, _, _ = generation_result
+                
                 caption = f"✨ Image {i+1}/{count}: {prompt}"
                 response = self.api_client.send_file(chat_id, path, caption, mid)
 
@@ -548,12 +568,17 @@ class WhatsAppBot:
                     self.logger.info(f"Caching sent image path for message {sent_message_id}: {path}")
                     self._manage_cached_file(chat_id, sent_message_id, path)
                 else:
+                    # If we can't get the message ID, we can't cache the image for later editing.
+                    # It's better to delete it to avoid filling up the disk.
                     self.logger.warning(f"Could not get sent message ID for {path}. Deleting file.")
-                    os.remove(path)
+                    if path and os.path.exists(path):
+                        os.remove(path)
             except Exception as e:
-                self.logger.error(f"Image generation {i+1} failed: {e}", exc_info=True)
-                self.api_client.send_message(chat_id, f"😢 Failed to generate image {i+1}.", mid)
-                if path and os.path.exists(path): os.remove(path)
+                # Catch any other unexpected errors during the process
+                self.logger.error(f"Image generation {i+1} failed with an exception: {e}", exc_info=True)
+                self.api_client.send_message(chat_id, f"😢 An error occurred while generating image {i+1}.", mid)
+                if path and os.path.exists(path):
+                    os.remove(path) # Clean up partially created files
     
     def _task_edit_image(self, task: Dict[str, Any]):
         chat_id, mid, prompt = task["chat_id"], task["message_id"], task["prompt"]
@@ -662,5 +687,4 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print("\n🛑 Bot stopped by user.")
     except Exception as e:
-        logging.basicConfig()
         logging.getLogger().critical(f"❌ A fatal error occurred: {e}", exc_info=True)