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

unified logger

Browse Source
This commit is contained in:
Vladimir Mandic
2026-02-19 09:46:42 +01:00
parent bfe014f5da
commit a3074baf8b
315 changed files with 2507 additions and 2116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui_common.py
+21 -20
View File
@@ -6,10 +6,11 @@ import platform
import subprocess
import gradio as gr
from modules import paths, call_queue, shared, errors, ui_sections, ui_symbols, ui_components, generation_parameters_copypaste, images, scripts_manager, script_callbacks, infotext, processing
from modules import logger
folder_symbol = ui_symbols.folder
debug = shared.log.trace if os.environ.get('SD_PASTE_DEBUG', None) is not None else lambda *args, **kwargs: None
debug = logger.log.trace if os.environ.get('SD_PASTE_DEBUG', None) is not None else lambda *args, **kwargs: None
debug('Trace: PASTE')
@@ -34,7 +35,7 @@ def update_generation_info(generation_info, html_info, img_index):
html_info_formatted = infotext_to_html(info)
return html_info, html_info_formatted
except Exception as e:
shared.log.trace(f'Update info: info="{generation_info}" {e}')
logger.log.trace(f'Update info: info="{generation_info}" {e}')
return html_info, html_info
@@ -75,7 +76,7 @@ def delete_files(js_data, files, all_files, index):
files = [files[index]]
start_index = index
else:
shared.log.error(f'Delete: index={index} first={first_index} files={len(files)} out of range')
logger.log.error(f'Delete: index={index} first={first_index} files={len(files)} out of range')
files = []
deleted = []
all_files = [f.split('/file=')[1] if 'file=' in f else f for f in all_files] if isinstance(all_files, list) else []
@@ -85,23 +86,23 @@ def delete_files(js_data, files, all_files, index):
try:
fn = os.path.normpath(filedata['name'])
if reference_dir in fn:
shared.log.warning(f'Delete: file="{fn}" not allowed')
logger.log.warning(f'Delete: file="{fn}" not allowed')
continue
if os.path.exists(fn) and os.path.isfile(fn):
deleted.append(fn)
os.remove(fn)
if fn in all_files:
all_files.remove(fn)
shared.log.info(f'Delete: image="{fn}"')
logger.log.info(f'Delete: image="{fn}"')
else:
shared.log.warning(f'Delete: image="{fn}" ui mismatch')
logger.log.warning(f'Delete: image="{fn}" ui mismatch')
base, _ext = os.path.splitext(fn)
desc = f'{base}.txt'
if os.path.exists(desc) and os.path.isfile(desc):
os.remove(desc)
shared.log.info(f'Delete: text="{fn}"')
logger.log.info(f'Delete: text="{fn}"')
except Exception as e:
shared.log.error(f'Delete: file="{fn}" {e}')
logger.log.error(f'Delete: file="{fn}" {e}')
deleted = ', '.join(deleted) if len(deleted) > 0 else 'none'
return all_files, plaintext_to_html(f"Deleted: {deleted}", ['performance'])
@@ -151,7 +152,7 @@ def save_files(js_data, files, html_info, index):
files = [files[index]]
start_index = index
else:
shared.log.error(f'Save: index={index} first={p.index_of_first_image} files={len(files)} out of range')
logger.log.error(f'Save: index={index} first={p.index_of_first_image} files={len(files)} out of range')
files = []
filenames = []
fullfns = []
@@ -179,9 +180,9 @@ def save_files(js_data, files, html_info, index):
if not os.path.exists(tgt_filename):
try:
shutil.copy(fullfn, destination)
shared.log.info(f'Copying image: file="{fullfn}" folder="{destination}"')
logger.log.info(f'Copying image: file="{fullfn}" folder="{destination}"')
except Exception as e:
shared.log.error(f'Copying image: {fullfn} {e}')
logger.log.error(f'Copying image: {fullfn} {e}')
if shared.opts.save_txt:
try:
from PIL import Image
@@ -190,9 +191,9 @@ def save_files(js_data, files, html_info, index):
filename_txt = f"{os.path.splitext(tgt_filename)[0]}.txt"
with open(filename_txt, "w", encoding="utf8") as file:
file.write(f"{info}\n")
shared.log.debug(f'Save: text="{filename_txt}"')
logger.log.debug(f'Save: text="{filename_txt}"')
except Exception as e:
shared.log.warning(f'Image description save failed: {filename_txt} {e}')
logger.log.warning(f'Image description save failed: {filename_txt} {e}')
script_callbacks.image_save_btn_callback(tgt_filename)
else:
image = generation_parameters_copypaste.image_from_url_text(filedata)
@@ -209,7 +210,7 @@ def save_files(js_data, files, html_info, index):
fullfn, txt_fullfn, _exif = images.save_image(image, paths.resolve_output_path(shared.opts.outdir_samples, shared.opts.outdir_save), "", seed=seed, prompt=prompt, info=info, extension=shared.opts.samples_format, grid=is_grid, p=p)
except Exception as e:
fullfn, txt_fullfn = None, None
shared.log.error(f'Save: image={image} i={i} seeds={p.all_seeds} prompts={p.all_prompts}')
logger.log.error(f'Save: image={image} i={i} seeds={p.all_seeds} prompts={p.all_prompts}')
errors.display(e, 'save')
if fullfn is None:
continue
@@ -238,10 +239,10 @@ def open_folder(result_gallery, gallery_index = 0):
except Exception:
folder = shared.opts.outdir_samples
if not os.path.exists(folder):
shared.log.warning(f'Folder open: folder="{folder}" does not exist')
logger.log.warning(f'Folder open: folder="{folder}" does not exist')
return
elif not os.path.isdir(folder):
shared.log.warning(f'Folder open: folder="{folder}" not a folder')
logger.log.warning(f'Folder open: folder="{folder}" not a folder')
return
if not shared.cmd_opts.hide_ui_dir_config:
@@ -385,7 +386,7 @@ def reuse_seed(seed_component: gr.Number, reuse_button: gr.Button, subseed:bool=
seed = processing.processed.all_seeds[0] if not subseed else processing.processed.all_subseeds[0]
else:
seed = -1
shared.log.debug(f'Reuse seed: index={selected_gallery_index} seed={seed} subseed={subseed}')
logger.log.debug(f'Reuse seed: index={selected_gallery_index} seed={seed} subseed={subseed}')
return seed
reuse_button.click(fn=reuse_click, _js="selected_gallery_index", inputs=[seed_component], outputs=[seed_component], show_progress='hidden')
@@ -400,7 +401,7 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed_btn: gr.Button, generation_in
restore_strength = -1
try:
gen_info = json.loads(gen_info_string)
shared.log.debug(f'Reuse: info={gen_info}')
logger.log.debug(f'Reuse: info={gen_info}')
index -= gen_info.get('index_of_first_image', 0)
index = int(index)
if is_subseed:
@@ -412,7 +413,7 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed_btn: gr.Button, generation_in
restore_seed = all_seeds[index if 0 <= index < len(all_seeds) else 0]
except json.decoder.JSONDecodeError:
if gen_info_string != '':
shared.log.error(f"Error parsing JSON generation info: {gen_info_string}")
logger.log.error(f"Error parsing JSON generation info: {gen_info_string}")
if is_subseed is not None:
return [restore_seed, gr_show(False), restore_strength]
else:
@@ -428,7 +429,7 @@ def update_token_counter(text):
token_count = 0
max_length = 75
if shared.state.job_count > 0:
shared.log.debug('Tokenizer busy')
logger.log.debug('Tokenizer busy')
return f"<span class='gr-box gr-text-input'>{token_count}/{max_length}</span>"
from modules import extra_networks
if isinstance(text, list):