From 595dca85af9e26b5d76cd64659a5bdd9da4f2b89 Mon Sep 17 00:00:00 2001
From: Bruno Seoane <brunoseoaneamarillo@gmail.com>
Date: Mon, 24 Oct 2022 08:32:18 -0300
Subject: [PATCH] Reverse run_extras change

Update serialization on the batch images endpoint
---
 modules/api/api.py    | 7 ++++++-
 modules/api/models.py | 8 ++++----
 modules/extras.py     | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/api/api.py b/modules/api/api.py
index 799e37018..67b783de8 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -109,7 +109,12 @@ class Api:
     def extras_batch_images_api(self, req: ExtrasBatchImagesRequest):
         reqDict = setUpscalers(req)
 
-        reqDict['image_folder'] = list(map(decode_base64_to_file, reqDict['imageList']))
+        def prepareFiles(file):
+            file = decode_base64_to_file(file.data, file_path=file.name)
+            file.orig_name = file.name
+            return file
+
+        reqDict['image_folder'] = list(map(prepareFiles, reqDict['imageList']))
         reqDict.pop('imageList')
 
         with self.queue_lock:
diff --git a/modules/api/models.py b/modules/api/models.py
index e461d397c..fca2f9912 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -138,12 +138,12 @@ class ExtrasSingleImageRequest(ExtrasBaseRequest):
 class ExtrasSingleImageResponse(ExtraBaseResponse):
     image: str = Field(default=None, title="Image", description="The generated image in base64 format.")
 
-class ImageItem(BaseModel):
-    data: str = Field(title="image data")
-    name: str = Field(title="filename")
+class FileData(BaseModel):
+    data: str = Field(title="File data", description="Base64 representation of the file")
+    name: str = Field(title="File name")
 
 class ExtrasBatchImagesRequest(ExtrasBaseRequest):
-    imageList: list[str] = Field(title="Images", description="List of images to work on. Must be Base64 strings")
+    imageList: list[FileData] = Field(title="Images", description="List of images to work on. Must be Base64 strings")
 
 class ExtrasBatchImagesResponse(ExtraBaseResponse):
     images: list[str] = Field(title="Images", description="The generated images in base64 format.")
diff --git a/modules/extras.py b/modules/extras.py
index 29ac312e0..22c5a1c12 100644
--- a/modules/extras.py
+++ b/modules/extras.py
@@ -33,7 +33,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
         for img in image_folder:
             image = Image.open(img)
             imageArr.append(image)
-            imageNameArr.append(os.path.splitext(img.name)[0])
+            imageNameArr.append(os.path.splitext(img.orig_name)[0])
     elif extras_mode == 2:
         assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled'