1580158
/
sd-Img2img-batch-interrogator
mirror of https://github.com/Alvi-alvarez/sd-Img2img-batch-interrogator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Shared State 

Updated Shared State references to be uniform.
pull/10/head
Smirking Kitsune 2024-07-04 14:28:17 -07:00 committed by GitHub
parent 82aa96f3f0
commit 1a423bf1dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/sd_tag_batch.py
View File

@ -2,6 +2,7 @@ import gradio as gr
import re
from modules import scripts, deepbooru, script_callbacks, shared
from modules.processing import process_images
from modules.shared import state
import sys
import importlib.util
@ -279,15 +280,15 @@ class Script(scripts.Script):
for model in model_selection:
# Check for skipped job
if shared.state.skipped:
if state.skipped:
print("Job skipped.")
shared.state.skipped = False
state.skipped = False
continue
# Check for interruption
if shared.state.interrupted:
if state.interrupted:
print("Job interrupted. Ending process.")
shared.state.interrupted = False
state.interrupted = False
break
# Should add the interrogators in the order determined by the model_selection list
@ -307,14 +308,14 @@ class Script(scripts.Script):
job_no = state.job_no
job_count = state.job_count
# Check for skipped job
if shared.state.skipped:
if state.skipped:
print("Job skipped.")
shared.state.skipped = False
state.skipped = False
continue
# Check for interruption
if shared.state.interrupted:
if state.interrupted:
print("Job interrupted. Ending process.")
shared.state.interrupted = False
state.interrupted = False
break
preliminary_interrogation = self.clip_ext.image_to_prompt(p.init_images[0], clip_ext_mode, clip_model)
if unload_clip_models_afterwords:
@ -329,14 +330,15 @@ class Script(scripts.Script):
if self.wd_ext_utils is not None:
for wd_model in wd_ext_model:
# Check for skipped job
if shared.state.skipped:
# Check for skipped job
if state.skipped:
print("Job skipped.")
shared.state.skipped = False
state.skipped = False
continue
# Check for interruption
if shared.state.interrupted:
if state.interrupted:
print("Job interrupted. Ending process.")
shared.state.interrupted = False
state.interrupted = False
break
rating, tags = self.wd_ext_utils.interrogators[wd_model].interrogate(p.init_images[0])
tags_list = [tag for tag, conf in tags.items() if conf > wd_threshold]