From 3d5cab66a7d1244305085e2de5a25a8b99c32773 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 7 Jan 2025 10:32:32 -0500 Subject: [PATCH] settings debug Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 2 +- extensions-builtin/sd-webui-agent-scheduler | 2 +- modules/shared.py | 13 +++++++++---- modules/ui_loadsave.py | 4 ++-- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5d707b33..d5e9a3c7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log for SD.Next -## Update for 2025-01-06 +## Update for 2025-01-07 - [Allegro Video](https://huggingface.co/rhymes-ai/Allegro) - optimizations: full offload and quantization support diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index 721a36f59..198e1b498 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit 721a36f59507e625c9982397c22edd7c14a0f62a +Subproject commit 198e1b4980ab595468198f1d012f357ff4a31186 diff --git a/modules/shared.py b/modules/shared.py index 3e1f50607..015465a4c 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -1009,6 +1009,7 @@ class Options: data_labels = options_templates filename = None typemap = {int: float} + debug = os.environ.get('SD_CONFIG_DEBUG', None) is not None def __init__(self): self.data = {k: v.default for k, v in self.data_labels.items()} @@ -1022,6 +1023,8 @@ class Options: if cmd_opts.hide_ui_dir_config and key in restricted_opts: log.warning(f'Settings key is restricted: {key}') return + if self.debug: + log.trace(f'Settings set: {key}={value}') self.data[key] = value return return super(Options, self).__setattr__(key, value) # pylint: disable=super-with-arguments @@ -1079,13 +1082,13 @@ class Options: diff = {} unused_settings = [] - if os.environ.get('SD_CONFIG_DEBUG', None) is not None: + if self.debug: log.debug('Settings: user') for k, v in self.data.items(): log.trace(f' Config: item={k} value={v} default={self.data_labels[k].default if k in self.data_labels else None}') - log.debug('Settings: defaults') - for k in self.data_labels.keys(): - log.trace(f' Setting: item={k} default={self.data_labels[k].default}') + # log.debug('Settings: defaults') + # for k in self.data_labels.keys(): + # log.trace(f' Setting: item={k} default={self.data_labels[k].default}') for k, v in self.data.items(): if k in self.data_labels: @@ -1099,6 +1102,8 @@ class Options: if not k.startswith('uiux_'): unused_settings.append(k) writefile(diff, filename, silent=silent) + if self.debug: + log.trace(f'Settings save: {diff}') if len(unused_settings) > 0: log.debug(f"Settings: unused={unused_settings}") except Exception as err: diff --git a/modules/ui_loadsave.py b/modules/ui_loadsave.py index 6e398603a..01cf2e97c 100644 --- a/modules/ui_loadsave.py +++ b/modules/ui_loadsave.py @@ -4,7 +4,7 @@ from modules import errors from modules.ui_components import ToolButton -debug = os.environ.get('SD_UI_DEBUG', None) +debug_ui = os.environ.get('SD_UI_DEBUG', None) class UiLoadsave: @@ -46,7 +46,7 @@ class UiLoadsave: setattr(obj, field, saved_value) if init_field is not None: init_field(saved_value) - if debug and key in self.component_mapping and not key.startswith('customscript'): + if debug_ui and key in self.component_mapping and not key.startswith('customscript'): errors.log.warning(f'UI duplicate: key="{key}" id={getattr(obj, "elem_id", None)} class={getattr(obj, "elem_classes", None)}') if field == 'value' and key not in self.component_mapping: self.component_mapping[key] = x