diff --git a/CHANGELOG.md b/CHANGELOG.md index bda73c829..dfee980b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -110,6 +110,7 @@ And it also includes fixes for all reported issues so far - sdxl: fix positive prompt embeds - img2img: clip and blip interrogate - img2img: sampler selection offset + - api: return current image in progress api if requested - sampler: guard against invalid sampler index - config: reset default cfg scale to 6.0 - processing: correct display metadata diff --git a/modules/api/api.py b/modules/api/api.py index 965910b15..a220db17c 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -428,7 +428,7 @@ class Api: if shared.state.job_count == 0: return models.ProgressResponse(progress=0, eta_relative=0, state=shared.state.dict(), textinfo=shared.state.textinfo) - shared.state.set_current_image() + shared.state.do_set_current_image() current_image = None if shared.state.current_image and not req.skip_current_image: current_image = encode_pil_to_base64(shared.state.current_image) diff --git a/modules/modelloader.py b/modules/modelloader.py index c52b810a6..32a945c3e 100644 --- a/modules/modelloader.py +++ b/modules/modelloader.py @@ -12,6 +12,7 @@ from modules.paths import script_path, models_path diffuser_repos = [] + def walk(top, onerror:callable=None): # A near-exact copy of `os.path.walk()`, trimmed slightly. Probably not nessesary for most people's collections, but makes a difference on really large datasets. nondirs = [] diff --git a/modules/shared_state.py b/modules/shared_state.py index c597417f1..470ee19c7 100644 --- a/modules/shared_state.py +++ b/modules/shared_state.py @@ -106,7 +106,7 @@ class State: self.do_set_current_image() def do_set_current_image(self): - if self.current_latent is None or self.api: + if self.current_latent is None: return from modules.shared import opts import modules.sd_samplers # pylint: disable=W0621