make interrupt work

- use wrap_gradio_gpu_call to use webUI's queue system
- remove async from fastAPI routes (turns out was what blocked requests)
- remove waiting for no requests before getting backend state

Author: Interpause

backend/app.py

@@ -8,6 +8,7 @@
 from fastapi import APIRouter, Request
 from fastapi.responses import StreamingResponse
 from modules import shared
+from modules.call_queue import wrap_gradio_gpu_call
 from PIL import Image, ImageOps
 from starlette.concurrency import iterate_in_threadpool
 
@@ -53,8 +54,9 @@
 
 # TODO: Consider using pipeline directly instead of Gradio API for less surprises & better control
 
+
 @router.get("/config", response_model=ConfigResponse)
-async def get_state():
+def get_state():
     """Get information about backend API.
 
     Returns config from `krita_config.yaml`, other metadata,
@@ -83,7 +85,7 @@ async def get_state():
 
 
 @router.post("/txt2img", response_model=ImageResponse)
-async def f_txt2img(req: Txt2ImgRequest):
+def f_txt2img(req: Txt2ImgRequest):
     """Post request for Txt2Img.
 
     Args:
@@ -105,7 +107,7 @@ async def f_txt2img(req: Txt2ImgRequest):
         req.base_size, req.max_size, req.orig_width, req.orig_height
     )
 
-    images, info, html = modules.txt2img.txt2img(
+    images, info, html = wrap_gradio_gpu_call(modules.txt2img.txt2img)(
         parse_prompt(req.prompt),  # prompt
         parse_prompt(req.negative_prompt),  # negative_prompt
         "None",  # prompt_style: saved prompt styles (unsupported)
@@ -131,6 +133,10 @@ async def f_txt2img(req: Txt2ImgRequest):
         req.firstphase_height,  # firstphase_height (yes its inconsistently width/height first)
         *args,
     )
+    if len(images) < 1:
+        log.warning("Interrupted!")
+        return {"outputs": [], "info": info}
+
     if shared.opts.return_grid:
         if not req.include_grid and len(images) > 1 and script_ind == 0:
             images = images[1:]
@@ -160,7 +166,7 @@ async def f_txt2img(req: Txt2ImgRequest):
 
 
 @router.post("/img2img", response_model=ImageResponse)
-async def f_img2img(req: Img2ImgRequest):
+def f_img2img(req: Img2ImgRequest):
     """Post request for Img2Img.
 
     Args:
@@ -203,7 +209,7 @@ async def f_img2img(req: Img2ImgRequest):
     # - new color sketch functionality in webUI is irrelevant so None is used for their options.
     # - the internal code for img2img is confusing and duplicative...
 
-    images, info, html = modules.img2img.img2img(
+    images, info, html = wrap_gradio_gpu_call(modules.img2img.img2img)(
         req.mode,  # mode
         parse_prompt(req.prompt),  # prompt
         parse_prompt(req.negative_prompt),  # negative_prompt
@@ -243,6 +249,10 @@ async def f_img2img(req: Img2ImgRequest):
         "",  # img2img_batch_output_dir (unspported)
         *args,
     )
+    if len(images) < 1:
+        log.warning("Interrupted!")
+        return {"outputs": [], "info": info}
+
     if shared.opts.return_grid:
         if not req.include_grid and len(images) > 1 and script_ind == 0:
             images = images[1:]
@@ -288,7 +298,7 @@ def apply_mask(img):
 
 
 @router.post("/upscale", response_model=UpscaleResponse)
-async def f_upscale(req: UpscaleRequest):
+def f_upscale(req: UpscaleRequest):
     """Post request for upscaling.
 
     Args:

frontends/krita/krita_diff/client.py

@@ -12,6 +12,7 @@
     ERR_BAD_URL,
     ERR_NO_CONNECTION,
     GET_CONFIG_TIMEOUT,
+    OFFICIAL_ROUTE_PREFIX,
     POST_TIMEOUT,
     ROUTE_PREFIX,
     STATE_READY,
@@ -24,11 +25,11 @@
 # except to prevent user from spamming themselves
 
 
-def get_url(cfg: Config, route: str = ...):
+def get_url(cfg: Config, route: str = ..., prefix: str = ROUTE_PREFIX):
     base = cfg("base_url", str)
     if not urlparse(base).scheme in {"http", "https"}:
         return None
-    url = urljoin(base, ROUTE_PREFIX)
+    url = urljoin(base, prefix)
     if route is not ...:
         url = urljoin(url, route)
     # print("url:", url)
@@ -137,7 +138,6 @@ def __init__(self, cfg: Config, ext_cfg: Config):
         self.ext_cfg = ext_cfg
         self.reqs = []
         # NOTE: this is a hacky workaround for detecting if backend is reachable
-        # this is to prevent zombie post requests (since they have no timeout)
         self.is_connected = False
 
     def handle_api_error(self, exc: Exception):
@@ -255,11 +255,6 @@ def cb(obj):
             self.is_connected = True
             self.status.emit(STATE_READY)
 
-        # only get config if there are no pending post requests jamming the backend
-        # NOTE: this might prevent get_config() from ever working if zombie requests can happen
-        if len(self.reqs) > 0:
-            return
-
         url = get_url(self.cfg, "config")
         if not url:
             self.status.emit(ERR_BAD_URL)
@@ -375,3 +370,8 @@ def post_upscale(self, cb, src_img):
             else {"src_img": img_to_b64(src_img)}
         )
         self.post("upscale", params, cb)
+
+    def post_interrupt(self, cb):
+        # get official API url
+        url = get_url(self.cfg, prefix=OFFICIAL_ROUTE_PREFIX)
+        self.post("interrupt", {}, cb, base_url=url)

frontends/krita/krita_diff/defaults.py

@@ -14,6 +14,7 @@
 STATE_IMG2IMG = "img2img done!"
 STATE_INPAINT = "inpaint done!"
 STATE_UPSCALE = "upscale done!"
+STATE_INTERRUPT = "Interrupted!"
 
 # Other currently hardcoded stuff
 GET_CONFIG_TIMEOUT = 10  # there is prevention for get request accumulation
@@ -26,6 +27,7 @@
 ADD_MASK_TIMEOUT = 200
 THREADED = True
 ROUTE_PREFIX = "/sdapi/interpause/"
+OFFICIAL_ROUTE_PREFIX = "/sdapi/v1/"
 
 # error messages
 ERR_MISSING_CONFIG = "Report this bug, developer missed out a config key somewhere."

frontends/krita/krita_diff/pages/common.py

@@ -1,4 +1,4 @@
-from krita import QHBoxLayout, QVBoxLayout, QWidget
+from krita import QHBoxLayout, QPushButton, QVBoxLayout, QWidget
 
 from ..script import script
 from ..widgets import QCheckBox, QComboBoxLayout, QLabel, QSpinBoxLayout
@@ -63,6 +63,9 @@ def __init__(self, *args, **kwargs):
         # Tiling mode
         self.tiling = QCheckBox(script.cfg, "sd_tiling", "Tiling mode")
 
+        # Interrupt button
+        self.interrupt_btn = QPushButton("Interrupt")
+
         layout = QVBoxLayout()
         layout.setContentsMargins(0, 0, 0, 0)
 
@@ -74,6 +77,7 @@ def __init__(self, *args, **kwargs):
         layout.addLayout(self.sd_model_layout)
         layout.addLayout(batch_layout)
         layout.addLayout(size_layout)
+        layout.addWidget(self.interrupt_btn)
 
         self.setLayout(layout)
 
@@ -112,3 +116,5 @@ def toggle_codeformer_weights(visible):
         toggle_codeformer_weights(
             self.face_restorer_layout.qcombo.currentText() == "CodeFormer"
         )
+
+        self.interrupt_btn.released.connect(script.action_interrupt)

frontends/krita/krita_diff/script.py

@@ -22,6 +22,7 @@
     EXT_CFG_NAME,
     STATE_IMG2IMG,
     STATE_INPAINT,
+    STATE_INTERRUPT,
     STATE_RESET_DEFAULT,
     STATE_TXT2IMG,
     STATE_UPSCALE,
@@ -363,5 +364,11 @@ def action_simple_upscale(self):
             return
         self.apply_simple_upscale()
 
+    def action_interrupt(self):
+        def cb(response=None):
+            self.status_changed.emit(STATE_INTERRUPT)
+
+        self.client.post_interrupt(cb)
+
 
 script = Script()