diff --git a/cli/modules/preview-body.jpg b/cli/modules/preview-body.jpg new file mode 100644 index 000000000..9f3ef70f6 Binary files /dev/null and b/cli/modules/preview-body.jpg differ diff --git a/cli/modules/preview-face.jpg b/cli/modules/preview-face.jpg new file mode 100644 index 000000000..bf1246e0a Binary files /dev/null and b/cli/modules/preview-face.jpg differ diff --git a/cli/modules/preview.py b/cli/modules/preview.py index 9365fa91e..161f594aa 100755 --- a/cli/modules/preview.py +++ b/cli/modules/preview.py @@ -6,10 +6,11 @@ import logging from PIL import Image from util import Map, log -from sdapi import postsync +from sdapi import getsync, postsync +mask = 'preview-body.jpg' template = 'photo of "{name}", {suffix}, high detailed, skin texture, facing camera, 135mm, shot on dslr, 4k, modelshoot style' -opt = { +img2img_options = { 'prompt': None, 'negative_prompt': '', 'init_images': [], @@ -32,11 +33,12 @@ def encode(f): return encoded def img2img(name: str, suffix: str): - opt['prompt'] = template.format(name = name, suffix = suffix) - log.info({ 'preview prompt': opt['prompt'] }) - log.info({ 'preview options': opt }) - opt['init_images'].append(encode('sillouethe.jpg')) - data = postsync('/sdapi/v1/img2img', opt) + options = getsync('/sdapi/v1/options') + img2img_options['prompt'] = template.format(name = name, suffix = suffix) + log.info({ 'preview prompt': img2img_options['prompt'] }) + log.info({ 'preview options': img2img_options }) + img2img_options['init_images'].append(encode(mask)) + data = postsync('/sdapi/v1/img2img', img2img_options) if 'error' in data: log.error({ 'preview': data['error'], 'reason': data['reason'] }) return @@ -47,10 +49,9 @@ def img2img(name: str, suffix: str): return obj = data.copy() del obj['images'] - log.info({ 'preview response': obj }) - for b64 in data['images']: - image = Image.open(io.BytesIO(base64.b64decode(b64.split(",",1)[0]))) - image.save('test.jpg') + log.info({ 'preview': { 'model': options["sd_model_checkpoint"], 'seed': obj['info']['seed'] } }) + image = Image.open(io.BytesIO(base64.b64decode(data['images'][0].split(",",1)[0]))) + image.save('test.jpg') if __name__ == "__main__": # log.setLevel(logging.DEBUG) diff --git a/cli/modules/test.jpg b/cli/modules/test.jpg index 3302cbf8f..b4add9c5f 100644 Binary files a/cli/modules/test.jpg and b/cli/modules/test.jpg differ diff --git a/extensions-builtin/sd-extension-steps-animation b/extensions-builtin/sd-extension-steps-animation index 61c98ad07..83a41babf 160000 --- a/extensions-builtin/sd-extension-steps-animation +++ b/extensions-builtin/sd-extension-steps-animation @@ -1 +1 @@ -Subproject commit 61c98ad077a0cbb089326ec0abcefc9a4fc3bee9 +Subproject commit 83a41babff87ff1c87289daef884f8a968269b81