diff --git a/extensions-builtin/Lora/networks.py b/extensions-builtin/Lora/networks.py index 1f02f3846..9f77aac1a 100644 --- a/extensions-builtin/Lora/networks.py +++ b/extensions-builtin/Lora/networks.py @@ -543,6 +543,7 @@ def network_MultiheadAttention_load_state_dict(self, *args, **kwargs): def list_available_networks(): + print('HERE') t0 = time.time() available_networks.clear() available_network_aliases.clear() diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py index 4220b8e02..c5adbb81f 100644 --- a/extensions-builtin/Lora/ui_extra_networks_lora.py +++ b/extensions-builtin/Lora/ui_extra_networks_lora.py @@ -12,6 +12,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): def __init__(self): super().__init__('Lora') self.list_time = 0 + shared.log.warning('Networks: type=lora method=legacy') def refresh(self): networks.list_available_networks() @@ -79,6 +80,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): def create_item(self, name): l = networks.available_networks.get(name) if l is None: + print('HERE1') shared.log.warning(f'Networks: type=lora registered={len(list(networks.available_networks))} file="{name}" not registered') return None try: diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 64aa7f159..96c9e4391 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -473,7 +473,7 @@ def register_pages(): if shared.opts.diffusers_enable_embed: from modules.ui_extra_networks_textual_inversion import ExtraNetworksPageTextualInversion register_page(ExtraNetworksPageTextualInversion()) - if shared.native: + if not shared.opts.lora_legacy: from modules.ui_extra_networks_lora import ExtraNetworksPageLora register_page(ExtraNetworksPageLora()) if shared.opts.hypernetwork_enabled: diff --git a/modules/ui_javascript.py b/modules/ui_javascript.py index b3aa03cd4..ccf5f8c0d 100644 --- a/modules/ui_javascript.py +++ b/modules/ui_javascript.py @@ -57,8 +57,6 @@ def html_css(css: str): usercss = os.path.join(data_path, "user.css") if os.path.exists(os.path.join(data_path, "user.css")) else None if modules.shared.opts.theme_type == 'Standard': - if shared.opts.extra_networks_height == 0: - shared.opts.extra_networks_height = 55 themecss = os.path.join(script_path, "javascript", f"{modules.shared.opts.gradio_theme}.css") if os.path.exists(themecss): head += stylesheet(themecss) @@ -66,8 +64,6 @@ def html_css(css: str): else: modules.shared.log.error(f'UI theme: css="{themecss}" not found') elif modules.shared.opts.theme_type == 'Modern': - if shared.opts.extra_networks_height == 0: - shared.opts.extra_networks_height = 87 theme_folder = next((e.path for e in modules.extensions.extensions if e.name == 'sdnext-modernui'), None) themecss = os.path.join(theme_folder or '', 'themes', f'{modules.shared.opts.gradio_theme}.css') if os.path.exists(themecss):