Commit 595dca85 authored by Bruno Seoane's avatar Bruno Seoane
Browse files

Reverse run_extras change

Update serialization on the batch images endpoint
parent 90f02c75
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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:
+4 −4
Original line number Diff line number Diff line
@@ -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.")
+1 −1
Original line number Diff line number Diff line
@@ -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'