refactor: update image generation response structure to return base64 images, simplify Dockerfile permissions, and clean up unused code in image service

Dockerfile

@@ -46,11 +46,9 @@ COPY --from=frontend-builder --chown=nextjs:nodejs /app/.next/cache ./frontend/.
 COPY --from=backend /backend ./backend
 COPY --from=backend /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages
 
-# Create directories and set permissions
-RUN mkdir -p /app/generated_images && \
-    chown -R nextjs:nodejs /app/backend /app/generated_images && \
-    chmod -R 755 /app/backend && \
-    chmod 755 /app/generated_images
+# Set permissions for backend
+RUN chown -R nextjs:nodejs /app/backend && \
+    chmod -R 755 /app/backend
 
 COPY start.sh .
 RUN chmod +x start.sh

app/page.tsx

@@ -25,8 +25,7 @@ interface ImageGenerationRequest {
 interface ImageGenerationResponse {
   success: boolean;
   message: string;
-  filename?: string;
-  filenames?: string[];
+  images?: string[];
   count?: number;
 }
 
@@ -153,10 +152,10 @@ export default function Home() {
 
       const data: ImageGenerationResponse = await response.json();
 
-      if (data.success && (data.filenames || data.filename)) {
-        const filenames = data.filenames || (data.filename ? [data.filename] : []);
-        const imageUrls = filenames.map(filename => 
-          `/api/v1/images/download/${filename}`
+      if (data.success && data.images && data.images.length > 0) {
+        // Convert base64 data to data URLs for display
+        const imageUrls = data.images.map(base64Data => 
+          `data:image/png;base64,${base64Data}`
         );
         setGeneratedImages(imageUrls);
         setLoadingImages([]);
@@ -187,7 +186,7 @@ export default function Home() {
   };
 
   const downloadAllImages = () => {
-    generatedImages.forEach((imageUrl, index) => {
+    generatedImages.forEach((imageUrl: string, index: number) => {
       const link = document.createElement('a');
       link.href = imageUrl;
       link.download = `fox-cat-${index + 1}.png`;

backend/app/api/v1/endpoints/images.py

@@ -1,6 +1,4 @@
 from fastapi import APIRouter, HTTPException, status
-from fastapi.responses import FileResponse
-import os
 import logging
 
 from ....schemas.image import ImageGenerationRequest, ImageGenerationResponse
@@ -15,6 +13,7 @@ router = APIRouter(prefix="/images", tags=["images"])
 async def generate_image(request: ImageGenerationRequest):
     """
     Generate an image using OpenAI DALL-E, optionally with a reference image
+    Returns base64 encoded image data directly
     """
     try:
         result = await image_service.generate_image(
@@ -34,8 +33,7 @@ async def generate_image(request: ImageGenerationRequest):
         return ImageGenerationResponse(
             success=True,
             message=result["message"],
-            filename=result["filename"],
-            filenames=result.get("filenames", []),
+            images=result.get("images", []),
             count=result.get("count", 0),
         )
 
@@ -47,28 +45,3 @@ async def generate_image(request: ImageGenerationRequest):
             status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
             detail="An unexpected error occurred while generating the image",
         )
-
-
-@router.get("/download/{filename}")
-async def download_image(filename: str):
-    """
-    Download a generated image by filename
-    """
-    try:
-        filepath = os.path.join(image_service.output_dir, filename)
-
-        if not os.path.exists(filepath):
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND, detail="Image not found"
-            )
-
-        return FileResponse(filepath, media_type="image/png", filename=filename)
-
-    except HTTPException:
-        raise
-    except Exception as e:
-        logger.error(f"Error downloading image: {str(e)}")
-        raise HTTPException(
-            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            detail="An error occurred while downloading the image",
-        )

backend/app/schemas/image.py

@@ -30,7 +30,7 @@ class ImageGenerationResponse(BaseModel):
 
     success: bool
     message: str
-    image_url: Optional[str] = None
-    filename: Optional[str] = None
-    filenames: Optional[List[str]] = None
+    images: Optional[List[str]] = Field(
+        default=None, description="List of base64 encoded generated images"
+    )
     count: Optional[int] = None

backend/app/services/image_service.py

@@ -19,13 +19,6 @@ class ImageGenerationService:
             timeout=60.0,  # Increase timeout for Hugging Face environment
             max_retries=2,  # Reduce retries to fail faster
         )
-        self.output_dir = "generated_images"
-        self._ensure_output_directory()
-
-    def _ensure_output_directory(self):
-        """Ensure the output directory exists"""
-        if not os.path.exists(self.output_dir):
-            os.makedirs(self.output_dir)
 
     async def _fallback_to_dalle(
         self, prompt: str, size: str, n: int, model: str
@@ -45,33 +38,25 @@ class ImageGenerationService:
                 response_format="b64_json",
             )
 
-            generated_filenames = []
+            generated_images = []
 
             for i, image_data in enumerate(response.data):
                 try:
-                    image_bytes = base64.b64decode(image_data.b64_json)
-
-                    # Generate unique filename and save
-                    filename = f"{uuid.uuid4()}.png"
-                    filepath = os.path.join(self.output_dir, filename)
-
-                    with open(filepath, "wb") as f:
-                        f.write(image_bytes)
-
-                    generated_filenames.append(filename)
-                    logger.info(f"Fallback image {i+1} saved successfully: {filename}")
+                    # Keep the base64 data instead of saving to file
+                    image_base64 = image_data.b64_json
+                    generated_images.append(image_base64)
+                    logger.info(f"Fallback image {i+1} processed successfully")
 
                 except Exception as e:
-                    logger.warning(f"Failed to save fallback image {i+1}: {str(e)}")
+                    logger.warning(f"Failed to process fallback image {i+1}: {str(e)}")
                     continue
 
-            if generated_filenames:
+            if generated_images:
                 return {
                     "success": True,
-                    "message": f"Generated {len(generated_filenames)}/{n} images using DALL-E fallback (reference image ignored due to network restrictions)",
-                    "filename": generated_filenames[0],
-                    "filenames": generated_filenames,
-                    "count": len(generated_filenames),
+                    "message": f"Generated {len(generated_images)}/{n} images using DALL-E fallback (reference image ignored due to network restrictions)",
+                    "images": generated_images,
+                    "count": len(generated_images),
                 }
             else:
                 raise Exception("Fallback also failed to generate any images")
@@ -99,7 +84,7 @@ class ImageGenerationService:
             reference_image: Base64 encoded reference image (optional)
 
         Returns:
-            dict: Result containing success status, message, and filename(s)
+            dict: Result containing success status, message, and base64 image data
         """
         try:
             logger.info(f"Generating {n} image(s) with prompt: {prompt}")
@@ -108,7 +93,7 @@ class ImageGenerationService:
                 # Use the newer responses API with image generation tools for reference images
                 logger.info("Using reference image with responses API")
 
-                generated_filenames = []
+                generated_images = []
 
                 # Generate multiple images by making multiple requests
                 for i in range(n):
@@ -154,18 +139,9 @@ class ImageGenerationService:
                             )
                             continue
 
-                        # Decode base64 image
-                        image_bytes = base64.b64decode(image_data)
-
-                        # Generate unique filename and save
-                        filename = f"{uuid.uuid4()}.png"
-                        filepath = os.path.join(self.output_dir, filename)
-
-                        with open(filepath, "wb") as f:
-                            f.write(image_bytes)
-
-                        generated_filenames.append(filename)
-                        logger.info(f"Image {i+1} saved successfully: {filename}")
+                        # Keep the base64 data instead of saving to file
+                        generated_images.append(image_data)
+                        logger.info(f"Image {i+1} processed successfully")
 
                     except Exception as e:
                         error_msg = str(e)
@@ -192,7 +168,7 @@ class ImageGenerationService:
 
                         continue
 
-                if not generated_filenames:
+                if not generated_images:
                     # If responses API failed due to network restrictions, try fallback to regular DALL-E
                     logger.warning(
                         "Responses API failed, attempting fallback to regular DALL-E"
@@ -200,15 +176,14 @@ class ImageGenerationService:
                     return await self._fallback_to_dalle(prompt, size, n, model)
 
                 logger.info(
-                    f"Successfully generated {len(generated_filenames)}/{n} images"
+                    f"Successfully generated {len(generated_images)}/{n} images"
                 )
 
                 return {
                     "success": True,
-                    "message": f"Generated {len(generated_filenames)}/{n} images successfully",
-                    "filename": generated_filenames[0] if generated_filenames else None,
-                    "filenames": generated_filenames,
-                    "count": len(generated_filenames),
+                    "message": f"Generated {len(generated_images)}/{n} images successfully",
+                    "images": generated_images,
+                    "count": len(generated_images),
                 }
 
             else:
@@ -223,32 +198,24 @@ class ImageGenerationService:
                     response_format="b64_json",
                 )
 
-                generated_filenames = []
+                generated_images = []
 
                 for i, image_data in enumerate(response.data):
                     try:
-                        image_bytes = base64.b64decode(image_data.b64_json)
-
-                        # Generate unique filename and save
-                        filename = f"{uuid.uuid4()}.png"
-                        filepath = os.path.join(self.output_dir, filename)
-
-                        with open(filepath, "wb") as f:
-                            f.write(image_bytes)
-
-                        generated_filenames.append(filename)
-                        logger.info(f"Image {i+1} saved successfully: {filename}")
+                        # Keep the base64 data instead of saving to file
+                        image_base64 = image_data.b64_json
+                        generated_images.append(image_base64)
+                        logger.info(f"Image {i+1} processed successfully")
 
                     except Exception as e:
-                        logger.warning(f"Failed to save image {i+1}: {str(e)}")
+                        logger.warning(f"Failed to process image {i+1}: {str(e)}")
                         continue
 
                 return {
                     "success": True,
-                    "message": f"Generated {len(generated_filenames)}/{n} images successfully",
-                    "filename": generated_filenames[0] if generated_filenames else None,
-                    "filenames": generated_filenames,
-                    "count": len(generated_filenames),
+                    "message": f"Generated {len(generated_images)}/{n} images successfully",
+                    "images": generated_images,
+                    "count": len(generated_images),
                 }
 
         except Exception as e:
@@ -256,8 +223,7 @@ class ImageGenerationService:
             return {
                 "success": False,
                 "message": f"Failed to generate image: {str(e)}",
-                "filename": None,
-                "filenames": [],
+                "images": [],
                 "count": 0,
             }