From 634f7bc920ad36fc4a6bfd17e23736cd6f0297ce Mon Sep 17 00:00:00 2001 From: Sj-Si Date: Mon, 15 Apr 2024 12:37:04 -0400 Subject: [PATCH] fix bug caused by refresh not being called properly --- extensions-builtin/Lora/ui_extra_networks_lora.py | 1 + javascript/extraNetworks.js | 4 ++++ modules/ui_extra_networks.py | 5 +++++ modules/ui_extra_networks_checkpoints.py | 1 + modules/ui_extra_networks_hypernets.py | 1 + modules/ui_extra_networks_textual_inversion.py | 1 + 6 files changed, 13 insertions(+) diff --git a/extensions-builtin/Lora/ui_extra_networks_lora.py b/extensions-builtin/Lora/ui_extra_networks_lora.py index 5f2b5dc05..8ce116b7d 100644 --- a/extensions-builtin/Lora/ui_extra_networks_lora.py +++ b/extensions-builtin/Lora/ui_extra_networks_lora.py @@ -14,6 +14,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): def refresh(self): networks.list_available_networks() + super().refresh() def create_item(self, name, index=None, enable_filter=True): lora_on_disk = networks.available_networks.get(name) diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js index fb14e9d46..e9f3597b9 100644 --- a/javascript/extraNetworks.js +++ b/javascript/extraNetworks.js @@ -337,6 +337,8 @@ class ExtraNetworksTab { } async onFetchCardsData(div_ids) { + await this.waitForServerPageReady(); + return JSON.parse( await requestGetPromise( "./sd_extra_networks/fetch-cards-data", @@ -349,6 +351,8 @@ class ExtraNetworksTab { } async onFetchTreeData(div_ids) { + await this.waitForServerPageReady(); + return JSON.parse( await requestGetPromise( "./sd_extra_networks/fetch-tree-data", diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 41fe91495..22d3177f1 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -201,7 +201,12 @@ def fetch_cover_images(extra_networks_tabname: str = "", item: str = "", index: def init_tree_data(tabname: str = "", extra_networks_tabname: str = "") -> JSONResponse: page = get_page_by_name(extra_networks_tabname) + data = page.generate_tree_view_data(tabname) + + if data is None: + return JSONResponse({}, status_code=503) + return JSONResponse(data, status_code=200) def fetch_tree_data( diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py index d69d144db..f4ae88d77 100644 --- a/modules/ui_extra_networks_checkpoints.py +++ b/modules/ui_extra_networks_checkpoints.py @@ -13,6 +13,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage): def refresh(self): shared.refresh_checkpoints() + super().refresh() def create_item(self, name, index=None, enable_filter=True): checkpoint: sd_models.CheckpointInfo = sd_models.checkpoint_aliases.get(name) diff --git a/modules/ui_extra_networks_hypernets.py b/modules/ui_extra_networks_hypernets.py index 2fb4bd190..5ea0ef294 100644 --- a/modules/ui_extra_networks_hypernets.py +++ b/modules/ui_extra_networks_hypernets.py @@ -11,6 +11,7 @@ class ExtraNetworksPageHypernetworks(ui_extra_networks.ExtraNetworksPage): def refresh(self): shared.reload_hypernetworks() + super().refresh() def create_item(self, name, index=None, enable_filter=True): full_path = shared.hypernetworks.get(name) diff --git a/modules/ui_extra_networks_textual_inversion.py b/modules/ui_extra_networks_textual_inversion.py index deb7cb873..d3e2680fe 100644 --- a/modules/ui_extra_networks_textual_inversion.py +++ b/modules/ui_extra_networks_textual_inversion.py @@ -11,6 +11,7 @@ class ExtraNetworksPageTextualInversion(ui_extra_networks.ExtraNetworksPage): def refresh(self): sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings(force_reload=True) + super().refresh() def create_item(self, name, index=None, enable_filter=True): embedding = sd_hijack.model_hijack.embedding_db.word_embeddings.get(name)