diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 10:09:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-08 10:09:20 +0000 |
| commit | 7348440524d550cb58e776729bfc141bbc441d9a (patch) | |
| tree | e947875e58bf60d822e3c8c2afe4d9d9a172765f /modules/api | |
| parent | fab73f2e7d388ca99cdb3d5de7f36c0b9a1a3b1c (diff) | |
| parent | c1c04928596f69ddb39b8841a8435ecefb0594e9 (diff) | |
| download | stable-diffusion-webui-gfx803-7348440524d550cb58e776729bfc141bbc441d9a.tar.gz stable-diffusion-webui-gfx803-7348440524d550cb58e776729bfc141bbc441d9a.tar.bz2 stable-diffusion-webui-gfx803-7348440524d550cb58e776729bfc141bbc441d9a.zip | |
Merge pull request #11569 from ramyma/hotfix-api-cache
Hotfix: API cache cleanup
Diffstat (limited to 'modules/api')
| -rw-r--r-- | modules/api/api.py | 54 |
1 files changed, 28 insertions, 26 deletions
diff --git a/modules/api/api.py b/modules/api/api.py index 279c384a..e92c2938 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -30,6 +30,7 @@ from modules import devices from typing import Dict, List, Any import piexif import piexif.helper +from contextlib import closing def script_name_to_index(name, scripts): @@ -322,19 +323,19 @@ class Api: args.pop('save_images', None) with self.queue_lock: - p = StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args) - p.scripts = script_runner - p.outpath_grids = opts.outdir_txt2img_grids - p.outpath_samples = opts.outdir_txt2img_samples - - shared.state.begin() - if selectable_scripts is not None: - p.script_args = script_args - processed = scripts.scripts_txt2img.run(p, *p.script_args) # Need to pass args as list here - else: - p.script_args = tuple(script_args) # Need to pass args as tuple here - processed = process_images(p) - shared.state.end() + with closing(StableDiffusionProcessingTxt2Img(sd_model=shared.sd_model, **args)) as p: + p.scripts = script_runner + p.outpath_grids = opts.outdir_txt2img_grids + p.outpath_samples = opts.outdir_txt2img_samples + + shared.state.begin() + if selectable_scripts is not None: + p.script_args = script_args + processed = scripts.scripts_txt2img.run(p, *p.script_args) # Need to pass args as list here + else: + p.script_args = tuple(script_args) # Need to pass args as tuple here + processed = process_images(p) + shared.state.end() b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else [] @@ -378,20 +379,21 @@ class Api: args.pop('save_images', None) with self.queue_lock: - p = StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args) - p.init_images = [decode_base64_to_image(x) for x in init_images] - p.scripts = script_runner - p.outpath_grids = opts.outdir_img2img_grids - p.outpath_samples = opts.outdir_img2img_samples + with closing(StableDiffusionProcessingImg2Img(sd_model=shared.sd_model, **args)) as p: + p.init_images = [decode_base64_to_image(x) for x in init_images] + p.scripts = script_runner + p.outpath_grids = opts.outdir_img2img_grids + p.outpath_samples = opts.outdir_img2img_samples + + shared.state.begin() + if selectable_scripts is not None: + p.script_args = script_args + processed = scripts.scripts_img2img.run(p, *p.script_args) # Need to pass args as list here + else: + p.script_args = tuple(script_args) # Need to pass args as tuple here + processed = process_images(p) + shared.state.end() - shared.state.begin() - if selectable_scripts is not None: - p.script_args = script_args - processed = scripts.scripts_img2img.run(p, *p.script_args) # Need to pass args as list here - else: - p.script_args = tuple(script_args) # Need to pass args as tuple here - processed = process_images(p) - shared.state.end() b64images = list(map(encode_pil_to_base64, processed.images)) if send_images else [] |