refactor interrogate/analyze/vqa code

Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2025-02-01 11:47:20 -05:00
parent ceaf0238fa
commit 654f44f66f
14 changed files with 64 additions and 42 deletions
+4 -2
View File
@@ -2,7 +2,7 @@ import math
import gradio as gr
import modules.scripts as scripts
from modules import deepbooru, images, processing, shared
from modules import images, processing
from modules.processing import Processed
from modules.shared import opts, state
@@ -90,8 +90,10 @@ class Script(scripts.Script):
if append_interrogation != "None":
p.prompt = f"{original_prompt}, " if original_prompt else ""
if append_interrogation == "CLIP":
p.prompt += shared.interrogator.interrogate(p.init_images[0])
from modules.interrogate import legacy
p.prompt += legacy.interrogator.interrogate(p.init_images[0])
elif append_interrogation == "DeepBooru":
from modules.interrogate import deepbooru
p.prompt += deepbooru.model.tag(p.init_images[0])
state.job = f"loopback iteration {i+1}/{loops} batch {n+1}/{batch_count}"