diff options
| author | Billy Cao <aliencaocao@gmail.com> | 2022-11-01 23:37:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-01 23:37:03 +0800 |
| commit | b11713ec2ac56d6949d5bb6741f365462cc1fa72 (patch) | |
| tree | a854d82a8aced046d8f9e2b4adfc0b973725deb0 /modules | |
| parent | bc607686065b8c7751d1af7c05b960378fa256de (diff) | |
| parent | fb3931400672119f5c842becdf996315dd7bc855 (diff) | |
Merge branch 'AUTOMATIC1111:master' into enable-override-hypernet
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/api/api.py | 6 | ||||
| -rw-r--r-- | modules/extras.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/modules/api/api.py b/modules/api/api.py index 6c06d449..e702c9c0 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -40,6 +40,7 @@ class Api: self.app.add_api_route("/sdapi/v1/extra-batch-images", self.extras_batch_images_api, methods=["POST"], response_model=ExtrasBatchImagesResponse) self.app.add_api_route("/sdapi/v1/png-info", self.pnginfoapi, methods=["POST"], response_model=PNGInfoResponse) self.app.add_api_route("/sdapi/v1/progress", self.progressapi, methods=["GET"], response_model=ProgressResponse) + self.app.add_api_route("/sdapi/v1/interrupt", self.interruptapi, methods=["POST"]) def text2imgapi(self, txt2imgreq: StableDiffusionTxt2ImgProcessingAPI): sampler_index = sampler_to_index(txt2imgreq.sampler_index) @@ -176,6 +177,11 @@ class Api: return ProgressResponse(progress=progress, eta_relative=eta_relative, state=shared.state.dict(), current_image=current_image) + def interruptapi(self): + shared.state.interrupt() + + return {} + def launch(self, server_name, port): self.app.include_router(self.router) uvicorn.run(self.app, host=server_name, port=port) diff --git a/modules/extras.py b/modules/extras.py index 4d51088b..8e2ab35c 100644 --- a/modules/extras.py +++ b/modules/extras.py @@ -141,7 +141,7 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_ upscaling_resize_w, upscaling_resize_h, upscaling_crop)
cache_key = LruCache.Key(image_hash=hash(np.array(image.getdata()).tobytes()),
info_hash=hash(info),
- args_hash=hash(upscale_args))
+ args_hash=hash((upscale_args, upscale_first)))
cached_entry = cached_images.get(cache_key)
if cached_entry is None:
res = upscale(image, *upscale_args)
|