StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update using original defaults

Browse Source
This commit is contained in:
Vladimir Mandic 2023-03-04 17:51:37 -05:00 committed by GitHub
parent f8e219bad9
commit b012d70f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/api/api.py
View File

@ -180,8 +180,8 @@ class Api:
populate = txt2imgreq.copy(update={ # Override __init__ params populate = txt2imgreq.copy(update={ # Override __init__ params
"sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index), "sampler_name": validate_sampler_name(txt2imgreq.sampler_name or txt2imgreq.sampler_index),
"do_not_save_samples": True if not 'do_not_save_samples' in vars(txt2imgreq) else txt2imgreq.do_not_save_samples, "do_not_save_samples": txt2imgreq.do_not_save,
"do_not_save_grid": True if not 'do_not_save_grid' in vars(txt2imgreq) else txt2imgreq.do_not_save_grid, "do_not_save_grid": txt2imgreq.do_not_save,
} }
) )
if populate.sampler_name: if populate.sampler_name:
@ -190,8 +190,9 @@ class Api:
args = vars(populate) args = vars(populate)
args.pop('script_name', None) args.pop('script_name', None)
send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images'] send_images = True if not 'do_not_send' in args else not args['do_not_send']
args.pop('do_not_send_images', None) args.pop('do_not_send', None)
args.pop('do_not_save', None)
with self.queue_lock: with self.queue_lock:
p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args) p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)
@ -223,8 +224,8 @@ class Api:
populate = img2imgreq.copy(update={ # Override __init__ params populate = img2imgreq.copy(update={ # Override __init__ params
"sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index), "sampler_name": validate_sampler_name(img2imgreq.sampler_name or img2imgreq.sampler_index),
"do_not_save_samples": True if not 'do_not_save_samples' in img2imgreq else img2imgreq.do_not_save_samples, "do_not_save_samples": img2imgreq.do_not_save,
"do_not_save_grid": True if not 'do_not_save_grid' in img2imgreq else img2imgreq.do_not_save_grid, "do_not_save_grid": img2imgreq.do_not_save,
"mask": mask "mask": mask
} }
) )
@ -235,6 +236,10 @@ class Api:
args.pop('include_init_images', None) # this is meant to be done by "exclude": True in model, but it's for a reason that I cannot determine. args.pop('include_init_images', None) # this is meant to be done by "exclude": True in model, but it's for a reason that I cannot determine.
args.pop('script_name', None) args.pop('script_name', None)
send_images = True if not 'do_not_send' in args else not args['do_not_send']
args.pop('do_not_send', None)
args.pop('do_not_save', None)
send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images'] send_images = True if not 'do_not_send_images' in args else not args['do_not_send_images']
args.pop('do_not_send_images', None) args.pop('do_not_send_images', None)

6
modules/api/models.py
View File

@ -104,7 +104,8 @@ StableDiffusionTxt2ImgProcessingAPI = PydanticModelGenerator(
{"key": "sampler_index", "type": str, "default": "Euler"}, {"key": "sampler_index", "type": str, "default": "Euler"},
{"key": "script_name", "type": str, "default": None}, {"key": "script_name", "type": str, "default": None},
{"key": "script_args", "type": list, "default": []}, {"key": "script_args", "type": list, "default": []},
{"key": "do_not_send_images", "type": bool, "default": False} {"key": "do_not_send", "type": bool, "default": False},
{"key": "do_not_save", "type": bool, "default": True}
] ]
).generate_model() ).generate_model()
@ -119,7 +120,8 @@ StableDiffusionImg2ImgProcessingAPI = PydanticModelGenerator(
{"key": "include_init_images", "type": bool, "default": False, "exclude" : True}, {"key": "include_init_images", "type": bool, "default": False, "exclude" : True},
{"key": "script_name", "type": str, "default": None}, {"key": "script_name", "type": str, "default": None},
{"key": "script_args", "type": list, "default": []}, {"key": "script_args", "type": list, "default": []},
{"key": "do_not_send_images", "type": bool, "default": False} {"key": "do_not_send", "type": bool, "default": False},
{"key": "do_not_save", "type": bool, "default": True}
] ]
).generate_model() ).generate_model()