diff options
| author | random-thoughtss <116161560+random-thoughtss@users.noreply.github.com> | 2022-10-27 18:19:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-27 18:19:12 +0000 |
| commit | f3f2ffd448bae76c0f731ecd96550a1aecf24ea9 (patch) | |
| tree | 436a8d6be7a1430fdc6b4cba900521f8232ebc1d /modules/api/api.py | |
| parent | 8b4f32779f28010fc8077e8fcfb85a3205b36bc2 (diff) | |
| parent | 737eb28faca8be2bb996ee0930ec77d1f7ebd939 (diff) | |
| download | stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.tar.gz stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.tar.bz2 stable-diffusion-webui-gfx803-f3f2ffd448bae76c0f731ecd96550a1aecf24ea9.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/api/api.py')
| -rw-r--r-- | modules/api/api.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/modules/api/api.py b/modules/api/api.py index a860a964..6e9d6097 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -7,6 +7,7 @@ import uvicorn from fastapi import Body, APIRouter, HTTPException from fastapi.responses import JSONResponse from pydantic import BaseModel, Field, Json +from typing import List import json import io import base64 @@ -15,12 +16,12 @@ from PIL import Image sampler_to_index = lambda name: next(filter(lambda row: name.lower() == row[1].name.lower(), enumerate(all_samplers)), None) class TextToImageResponse(BaseModel): - images: list[str] = Field(default=None, title="Image", description="The generated image in base64 format.") + images: List[str] = Field(default=None, title="Image", description="The generated image in base64 format.") parameters: Json info: Json class ImageToImageResponse(BaseModel): - images: list[str] = Field(default=None, title="Image", description="The generated image in base64 format.") + images: List[str] = Field(default=None, title="Image", description="The generated image in base64 format.") parameters: Json info: Json @@ -65,7 +66,7 @@ class Api: i.save(buffer, format="png") b64images.append(base64.b64encode(buffer.getvalue())) - return TextToImageResponse(images=b64images, parameters=json.dumps(vars(txt2imgreq)), info=json.dumps(processed.info)) + return TextToImageResponse(images=b64images, parameters=json.dumps(vars(txt2imgreq)), info=processed.js()) @@ -111,7 +112,11 @@ class Api: i.save(buffer, format="png") b64images.append(base64.b64encode(buffer.getvalue())) - return ImageToImageResponse(images=b64images, parameters=json.dumps(vars(img2imgreq)), info=json.dumps(processed.info)) + if (not img2imgreq.include_init_images): + img2imgreq.init_images = None + img2imgreq.mask = None + + return ImageToImageResponse(images=b64images, parameters=json.dumps(vars(img2imgreq)), info=processed.js()) def extrasapi(self): raise NotImplementedError |