Update app.py

app.py

@@ -6,6 +6,7 @@ import io
 import os
 import logging
 import base64
+import re
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -80,30 +81,69 @@ def convert_image():
         # Handle JSON payload
         data = request.get_json()
         if not data or 'file' not in data:
+            logger.error("No image data provided in request")
             return jsonify({'error': 'No image data provided'}), 400
 
-        # Decode base64 image
+        # Extract base64 string
         base64_string = data['file']
-        if base64_string.startswith('data:image'):
-            base64_string = base64_string.split(',')[1]
+        if not base64_string:
+            logger.error("Empty base64 string")
+            return jsonify({'error': 'Invalid base64 image data: empty string'}), 400
+
+        # Parse data URL
+        match = re.match(r'^data:image/(\w+);base64,(.+)$', base64_string)
+        if not match:
+            logger.error("Invalid data URL format")
+            return jsonify({'error': 'Invalid base64 image data: incorrect data URL format'}), 400
+
+        image_format, base64_data = match.groups()
+        if image_format not in ['jpeg', 'png']:
+            logger.error(f"Unsupported image format: {image_format}")
+            return jsonify({'error': f'Invalid base64 image data: unsupported format {image_format}'}), 400
+
+        # Validate base64 string
+        if not re.match(r'^[A-Za-z0-9+/=]+$', base64_data):
+            logger.error("Invalid base64 string characters")
+            return jsonify({'error': 'Invalid base64 image data: contains invalid characters'}), 400
+
+        # Decode base64
         try:
-            image_data = base64.b64decode(base64_string)
+            image_data = base64.b64decode(base64_data, validate=True)
+            logger.info(f"Decoded base64 data, length: {len(image_data)}")
         except Exception as e:
-            return jsonify({'error': 'Invalid base64 image data'}), 400
-        image = Image.open(io.BytesIO(image_data)).convert('RGB')
+            logger.error(f"Base64 decode failed: {str(e)}")
+            return jsonify({'error': f'Invalid base64 image data: {str(e)}'}), 400
+
+        # Validate image data
+        if len(image_data) == 0:
+            logger.error("Decoded image data is empty")
+            return jsonify({'error': 'Invalid base64 image data: empty after decoding'}), 400
+
+        # Process image
+        try:
+            image = Image.open(io.BytesIO(image_data))
+            if image_format == 'png':
+                image = image.convert('RGB')  # Convert PNG to RGB for consistency
+        except Exception as e:
+            logger.error(f"Image processing failed: {str(e)}")
+            return jsonify({'error': f'Failed to process image: {str(e)}'}), 400
 
         # Get parameters (with defaults)
         colormode = data.get('colormode', 'color')
         hierarchical = data.get('hierarchical', 'stacked')
         mode = data.get('mode', 'spline')
-        filter_speckle = int(data.get('filter_speckle', 4))
-        color_precision = int(data.get('color_precision', 6))
-        layer_difference = int(data.get('layer_difference', 16))
-        corner_threshold = int(data.get('corner_threshold', 60))
-        length_threshold = float(data.get('length_threshold', 4.0))
-        max_iterations = int(data.get('max_iterations', 10))
-        splice_threshold = int(data.get('splice_threshold', 45))
-        path_precision = int(data.get('path_precision', 3))
+        try:
+            filter_speckle = int(data.get('filter_speckle', 4))
+            color_precision = int(data.get('color_precision', 6))
+            layer_difference = int(data.get('layer_difference', 16))
+            corner_threshold = int(data.get('corner_threshold', 60))
+            length_threshold = float(data.get('length_threshold', 4.0))
+            max_iterations = int(data.get('max_iterations', 10))
+            splice_threshold = int(data.get('splice_threshold', 45))
+            path_precision = int(data.get('path_precision', 3))
+        except (ValueError, TypeError) as e:
+            logger.error(f"Invalid parameter format: {str(e)}")
+            return jsonify({'error': f'Invalid parameter format: {str(e)}'}), 400
 
         logger.info("Received request to /convert")