Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-19 01:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup/refactor state history

Browse Source 
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2025-09-12 16:12:43 -04:00
parent a8b850adf4
commit 175e9cbe29
41 changed files with 172 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/interrogate/openclip.py
+4 -4
View File
@@ -135,7 +135,7 @@ def interrogate(image, mode, caption=None):
def interrogate_image(image, clip_model, blip_model, mode):
shared.state.begin('Interrogate')
jobid = shared.state.begin('Interrogate')
try:
if shared.sd_loaded:
from modules.sd_models import apply_balanced_offload # prevent circular import
@@ -148,7 +148,7 @@ def interrogate_image(image, clip_model, blip_model, mode):
prompt = f"Exception {type(e)}"
shared.log.error(f'Interrogate: {e}')
errors.display(e, 'Interrogate')
shared.state.end()
shared.state.end(jobid)
return prompt
@@ -164,7 +164,7 @@ def interrogate_batch(batch_files, batch_folder, batch_str, clip_model, blip_mod
if len(files) == 0:
shared.log.warning('Interrogate batch: type=clip no images')
return ''
shared.state.begin('Interrogate batch')
jobid = shared.state.begin('Interrogate batch')
prompts = []
load_interrogator(clip_model, blip_model)
@@ -191,7 +191,7 @@ def interrogate_batch(batch_files, batch_folder, batch_str, clip_model, blip_mod
writer.close()
ci.config.quiet = False
unload_clip_model()
shared.state.end()
shared.state.end(jobid)
return '\n\n'.join(prompts)
modules/interrogate/vqa.py
+4 -5
View File
@@ -605,8 +605,7 @@ def sa2(question: str, image: Image.Image, repo: str = None):
def interrogate(question:str='', system_prompt:str=None, prompt:str=None, image:Image.Image=None, model_name:str=None, quiet:bool=False):
global quant_args # pylint: disable=global-statement
if not quiet:
shared.state.begin('Interrogate')
jobid = shared.state.begin('Interrogate')
t0 = time.time()
quant_args = model_quant.create_config(module='LLM')
model_name = model_name or shared.opts.interrogate_vlm_model
@@ -691,7 +690,7 @@ def interrogate(question:str='', system_prompt:str=None, prompt:str=None, image:
t1 = time.time()
if not quiet:
shared.log.debug(f'Interrogate: type=vlm model="{model_name}" repo="{vqa_model}" args={get_kwargs()} time={t1-t0:.2f}')
shared.state.end()
shared.state.end(jobid)
return answer
@@ -725,7 +724,7 @@ def batch(model_name, system_prompt, batch_files, batch_folder, batch_str, quest
if len(files) == 0:
shared.log.warning('Interrogate batch: type=vlm no images')
return ''
shared.state.begin('Interrogate batch')
jobid = shared.state.begin('Interrogate batch')
prompts = []
if write:
mode = 'w' if not append else 'a'
@@ -751,5 +750,5 @@ def batch(model_name, system_prompt, batch_files, batch_folder, batch_str, quest
if write:
writer.close()
shared.opts.interrogate_offload = orig_offload
shared.state.end()
shared.state.end(jobid)
return '\n\n'.join(prompts)