diff --git a/TODO.md b/TODO.md index 6a48f27eb..8bf519283 100644 --- a/TODO.md +++ b/TODO.md @@ -17,6 +17,8 @@ Main ToDo list can be found at [GitHub projects](https://github.com/users/vladma - remove training: ti - remove training: hypernetwork - extra network hide page with no entries +- ipadapter masking: +- theme/cozynest: ## Control missing features diff --git a/modules/face/__init__.py b/modules/face/__init__.py index f26d841eb..e0d76b689 100644 --- a/modules/face/__init__.py +++ b/modules/face/__init__.py @@ -72,7 +72,7 @@ class Script(scripts.Script): id_strength = gr.Slider(label='Strength', minimum=0.0, maximum=2.0, step=0.01, value=1.0) id_conditioning = gr.Slider(label='Control', minimum=0.0, maximum=2.0, step=0.01, value=0.5) with gr.Row(visible=True): - id_cache = gr.Checkbox(label='Cache model', value=True) + id_cache = gr.Checkbox(label='Cache model', value=False) with gr.Group(visible=False) as cfg_photomaker: with gr.Row(): gr.HTML('  Tenecent ARC Lab PhotoMaker
') diff --git a/modules/shared.py b/modules/shared.py index 937073bf1..526d27731 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -295,6 +295,8 @@ def temp_disable_extensions(): disable_themes.append('sdnext-ui-ux') if theme_name.lower() != 'lobe': disable_themes.append('sd-webui-lobe-theme') + if theme_name.lower() != 'cozy-nest': + disable_themes.append('Cozy-Nest') for ext in disable_themes: if ext not in opts.disabled_extensions: disabled.append(ext) diff --git a/modules/theme.py b/modules/theme.py index 7380b3672..eb594834e 100644 --- a/modules/theme.py +++ b/modules/theme.py @@ -49,7 +49,11 @@ def list_themes(): if f.endswith('.css'): engines.append(f'modern/{os.path.splitext(f)[0]}') if 'sd-webui-lobe-theme' in extensions: + modules.shared.log.info('Theme: installed="lobe"') engines.append('lobe') + if 'Cozy-Nest' in extensions: + modules.shared.log.info('Theme: installed="cozy-nest"') + engines.append('cozy-nest') gradio = ["gradio/default", "gradio/base", "gradio/glass", "gradio/monochrome", "gradio/soft"] huggingface = refresh_themes(no_update=True) huggingface = {x['id'] for x in huggingface if x['status'] == 'RUNNING' and 'test' not in x['id'].lower()} @@ -75,7 +79,7 @@ def reload_gradio_theme(theme_name=None): gradio_theme = gr.themes.Base(**default_font_params) modules.shared.log.info(f'UI theme: name="{theme_name}" style={modules.shared.opts.theme_style} base={base}') return True - elif theme_name.lower() in ['lobe']: + elif theme_name.lower() in ['lobe', 'cozy-nest']: gradio_theme = gr.themes.Base(**default_font_params) modules.shared.log.info(f'UI theme: name="{theme_name}" style={modules.shared.opts.theme_style} base={base}') elif theme_name.lower() == 'modern' or theme_name.lower().startswith('modern/'): diff --git a/modules/ui_javascript.py b/modules/ui_javascript.py index 7bcb0dc27..b6201c3cb 100644 --- a/modules/ui_javascript.py +++ b/modules/ui_javascript.py @@ -58,6 +58,8 @@ def html_css(is_builtin: bool): head += stylesheet(cssfile) theme_name = modules.shared.cmd_opts.theme or modules.shared.opts.gradio_theme or '' + if theme_name == 'default': + theme_name = 'black-teal' if theme_name.startswith('modern/'): theme_name = theme_name[7:] theme_folder = next((e.path for e in modules.extensions.extensions if e.name == 'sdnext-ui-ux'), None)