diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-08 11:43:06 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-08 11:43:06 +0000 |
commit | 53924aeaf0da56470658ca2a29ce64ff25d71da3 (patch) | |
tree | 41d906a5428007ae6743ad98e847aceb25d951c2 /modules | |
parent | 953147bf6b5f8de6a0effe3e28013ace0b760f75 (diff) | |
parent | b0ec69b360835a901a1aa57df1f7c8c9d55bf31c (diff) | |
download | stable-diffusion-webui-gfx803-53924aeaf0da56470658ca2a29ce64ff25d71da3.tar.gz stable-diffusion-webui-gfx803-53924aeaf0da56470658ca2a29ce64ff25d71da3.tar.bz2 stable-diffusion-webui-gfx803-53924aeaf0da56470658ca2a29ce64ff25d71da3.zip |
Merge pull request #11477 from hako-mikan/master
add `before_hr` script callback
Diffstat (limited to 'modules')
-rw-r--r-- | modules/processing.py | 3 | ||||
-rw-r--r-- | modules/scripts.py | 14 |
2 files changed, 17 insertions, 0 deletions
diff --git a/modules/processing.py b/modules/processing.py index 89ad1bd0..21d1492c 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -1078,6 +1078,9 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing): sd_models.apply_token_merging(self.sd_model, self.get_token_merging_ratio(for_hr=True))
+ if self.scripts is not None:
+ self.scripts.before_hr(self)
+
samples = self.sampler.sample_img2img(self, samples, noise, self.hr_c, self.hr_uc, steps=self.hr_second_pass_steps or self.steps, image_conditioning=image_conditioning)
sd_models.apply_token_merging(self.sd_model, self.get_token_merging_ratio())
diff --git a/modules/scripts.py b/modules/scripts.py index 49e4a611..d96f88b0 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -187,6 +187,11 @@ class Script: return f'script_{tabname}{title}_{item_id}'
+ def before_hr(self, p ,*args):
+ """
+ This function is called before hires fix start.
+ """
+ pass
current_basedir = paths.script_path
@@ -549,6 +554,15 @@ class ScriptRunner: self.scripts[si].args_to = args_to
+ def before_hr(self, p):
+ for script in self.alwayson_scripts:
+ try:
+ script_args = p.script_args[script.args_from:script.args_to]
+ script.before_hr(p, *script_args)
+ except Exception:
+ errors.report(f"Error running before_hr: {script.filename}", exc_info=True)
+
+
scripts_txt2img: ScriptRunner = None
scripts_img2img: ScriptRunner = None
scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None
|