refac

backend/open_webui/routers/images.py

@@ -153,9 +153,8 @@ def normalize_openai_edit_image_data_url(data_url: str) -> str:
     return data_url
 
 
-def get_image_file_item(base64_string, param_name='image', normalize=False):
+def get_image_file_item(base64_string, param_name='image'):
-    data = normalize_openai_edit_image_data_url(base64_string) if normalize else base64_string
+    header, encoded = base64_string.split(',', 1)
-    header, encoded = data.split(',', 1)
     mime_type = header.split(';')[0].lstrip('data:') or 'image/png'
     image_data = base64.b64decode(encoded)
     extension = IMAGE_FILE_EXTENSIONS.get(mime_type.lower()) or mimetypes.guess_extension(mime_type) or '.png'
@@ -1007,21 +1006,15 @@ async def image_edits(
 
             files = []
             if isinstance(form_data.image, str):
-                files = [
+                image = form_data.image
-                    get_image_file_item(
+                if ENABLE_OPENAI_IMAGE_EDIT_NORMALIZATION:
-                        form_data.image,
+                    image = normalize_openai_edit_image_data_url(image)
-                        normalize=ENABLE_OPENAI_IMAGE_EDIT_NORMALIZATION,
+                files = [get_image_file_item(image)]
-                    )
-                ]
             elif isinstance(form_data.image, list):
                 for img in form_data.image:
-                    files.append(
+                    if ENABLE_OPENAI_IMAGE_EDIT_NORMALIZATION:
-                        get_image_file_item(
+                        img = normalize_openai_edit_image_data_url(img)
-                            img,
+                    files.append(get_image_file_item(img, 'image[]'))
-                            'image[]',
-                            normalize=ENABLE_OPENAI_IMAGE_EDIT_NORMALIZATION,
-                        )
-                    )
 
             url_search_params = ''
             if image_config.IMAGES_EDIT_OPENAI_API_VERSION: