diff options
| author | Philpax <me@philpax.me> | 2023-01-05 04:00:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 04:00:58 +0000 |
| commit | 83ca8dd0c96e3cc8dd444e8d980c07718dc647ee (patch) | |
| tree | cbadd09c9305099db7763532b7aaf909d366d326 /modules/interrogate.py | |
| parent | fa931733f6acc94e058a1d3d4655846e33ae34be (diff) | |
| parent | 5f4fa942b8ec3ed3b15a352903489d6f9e6eb46e (diff) | |
| download | stable-diffusion-webui-gfx803-83ca8dd0c96e3cc8dd444e8d980c07718dc647ee.tar.gz stable-diffusion-webui-gfx803-83ca8dd0c96e3cc8dd444e8d980c07718dc647ee.tar.bz2 stable-diffusion-webui-gfx803-83ca8dd0c96e3cc8dd444e8d980c07718dc647ee.zip | |
Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings
Diffstat (limited to 'modules/interrogate.py')
| -rw-r--r-- | modules/interrogate.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/interrogate.py b/modules/interrogate.py index 46935210..738d8ff7 100644 --- a/modules/interrogate.py +++ b/modules/interrogate.py @@ -135,8 +135,9 @@ class InterrogateModels: return caption[0]
def interrogate(self, pil_image):
- res = None
-
+ res = ""
+ shared.state.begin()
+ shared.state.job = 'interrogate'
try:
if shared.cmd_opts.lowvram or shared.cmd_opts.medvram:
@@ -177,5 +178,6 @@ class InterrogateModels: res += "<error>"
self.unload()
+ shared.state.end()
return res
|