michael/stable-diffusion-webui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reverse run_extras change

Browse source 
Update serialization on the batch images endpoint
This commit is contained in:
Bruno Seoane 2022-10-24 08:32:18 -03:00
parent 90f02c7522
commit 595dca85af
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/api/api.py
View file

@ -109,7 +109,12 @@ class Api:
def extras_batch_images_api(self, req: ExtrasBatchImagesRequest): def extras_batch_images_api(self, req: ExtrasBatchImagesRequest):
reqDict = setUpscalers(req) 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') reqDict.pop('imageList')
with self.queue_lock: with self.queue_lock:

8
modules/api/models.py
View file

@ -138,12 +138,12 @@ class ExtrasSingleImageRequest(ExtrasBaseRequest):
class ExtrasSingleImageResponse(ExtraBaseResponse): class ExtrasSingleImageResponse(ExtraBaseResponse):
image: str = Field(default=None, title="Image", description="The generated image in base64 format.") image: str = Field(default=None, title="Image", description="The generated image in base64 format.")
class ImageItem(BaseModel): class FileData(BaseModel):
data: str = Field(title="image data") data: str = Field(title="File data", description="Base64 representation of the file")
name: str = Field(title="filename") name: str = Field(title="File name")
class ExtrasBatchImagesRequest(ExtrasBaseRequest): 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): class ExtrasBatchImagesResponse(ExtraBaseResponse):
images: list[str] = Field(title="Images", description="The generated images in base64 format.") images: list[str] = Field(title="Images", description="The generated images in base64 format.")

2
modules/extras.py
View file

@ -33,7 +33,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
for img in image_folder: for img in image_folder:
image = Image.open(img) image = Image.open(img)
imageArr.append(image) imageArr.append(image)
imageNameArr.append(os.path.splitext(img.name)[0]) imageNameArr.append(os.path.splitext(img.orig_name)[0])
elif extras_mode == 2: elif extras_mode == 2:
assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled' assert not shared.cmd_opts.hide_ui_dir_config, '--hide-ui-dir-config option must be disabled'