update with logging and error handling

image_processor.py

@@ -9,6 +9,9 @@ from r2_uploader import upload_image_to_r2
 from mongo_logger import create_log, update_log_status
 from helpers import encode_image_to_base64, is_valid_image
 
+import logging
+
+logger = logging.getLogger(__name__)
 
 def process_zip_and_generate_images(
     zip_path, category, size, quality, user_prompt,
@@ -33,25 +36,24 @@ def process_zip_and_generate_images(
         return existing_images + modified_urls if existing_images else modified_urls
 
     except Exception as e:
+        logger.exception(f"Global error during processing file: {zip_path}")
         return [f"Error: {str(e)}"]
 
 
-    except Exception as e:
-        log_error(f"Global error in zip processing: {e}")
-        return [], [f"Global error: {e}"]
-
-
 def extract_zip_file(zip_path):
+    try:
+        temp_dir = tempfile.TemporaryDirectory()
+        with zipfile.ZipFile(zip_path, 'r') as zip_ref:
+            zip_ref.extractall(temp_dir.name)
+        logger.info(f"Extracted ZIP file: {zip_path}")
+        return temp_dir
+    except Exception as e:
+        logger.exception(f"Failed to extract ZIP file: {zip_path}")
+        raise
 
-    temp_dir = tempfile.TemporaryDirectory()
-    with zipfile.ZipFile(zip_path, 'r') as zip_ref:
-        zip_ref.extractall(temp_dir.name)
-
-    return temp_dir
 
 
 def get_valid_image_files(temp_dir):
-
     valid_files = []
     zip_contents = os.listdir(temp_dir.name)
 
@@ -59,10 +61,14 @@ def get_valid_image_files(temp_dir):
         file_path = os.path.join(temp_dir.name, file)
         if is_valid_image(file) and "__MACOSX" not in file:
             valid_files.append((file, file_path))
+        else:
+            logger.warning(f"Ignored non-image or unwanted file: {file}")
 
+    logger.info(f"Found {len(valid_files)} valid images.")
     return valid_files
 
 
+
 def process_image_files(image_files, category, size, quality, user_prompt, sentiment, platform, num_images):
     final_results = []
     logs = []
@@ -92,9 +98,12 @@ def process_image_files(image_files, category, size, quality, user_prompt, senti
             )
 
         for future in as_completed(futures):
-            result = future.result()
-            if result:
-                final_results.append(result)
+            try:
+                result = future.result()
+                if result:
+                    final_results.append(result)
+            except Exception as e:
+                logger.exception("Unhandled exception during image processing thread.")
 
     return final_results
 
@@ -121,19 +130,24 @@ def process_single_image(file_name, file_path, category, size, quality, user_pro
         return None
 
     except Exception as e:
-        logs.append(f"Processing failed for {file_name}: {e}")
+        error_msg = f"Processing failed for {file_name}: {e}"
+        logger.error(error_msg)
+        logs.append(error_msg)
         update_log_status(log_id, "failed", urls=[], message=str(e))
         return None
 
 
+
 def generate_images_from_prompts(file_path, size, quality, category, sentiment, user_prompt, platform, num_images):
     image_urls = []
 
     for _ in range(num_images):
         try:
             img_url = generate_image(file_path, size, quality, category, sentiment, user_prompt, platform)
-
+            
             s3_url = upload_image_to_r2(img_url)
+            logger.info(f"Generated and uploaded image to: {s3_url}")
+
             image_urls.append(s3_url)
 
         except Exception as e:
@@ -143,4 +157,4 @@ def generate_images_from_prompts(file_path, size, quality, category, sentiment,
 
 
 def log_error(message):
-    print(f"ERROR: {message}")
+    logger.error(message)