From f7d95c401cb213db94c588452234489b83d604ef Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 24 Dec 2024 08:57:36 -0500 Subject: [PATCH] cleanup Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 2 +- extensions-builtin/sdnext-modernui | 2 +- html/locale_ko.json | 2 +- javascript/black-teal-reimagined.css | 4 ++-- modules/ui_extra_networks.py | 16 ++++++++-------- modules/ui_extra_networks_checkpoints.py | 2 +- wiki | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b778dca21..1721e40d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2287,7 +2287,7 @@ Plus some nifty new modules such as **FaceID** automatic face guidance using emb can remove artifacts and hard edges of inpaint area but also remove some details from original - **chaiNNer** fix `NaN` issues due to autocast - **Upscale** increase limit from 4x to 8x given the quality of some upscalers - - **Extra Networks** fix sort + - **Networks** fix sort - reduced default **CFG scale** from 6 to 4 to be more out-of-the-box compatibile with LCM/Turbo models - disable google fonts check on server startup - fix torchvision/basicsr compatibility diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index 3f53ff719..f6f629dfb 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit 3f53ff719f8024003873dd98bb64f21e9401844c +Subproject commit f6f629dfbe63d8d6ed34f4ab2f9c7938914bf617 diff --git a/html/locale_ko.json b/html/locale_ko.json index 0ddf62afb..3d1dfd9df 100644 --- a/html/locale_ko.json +++ b/html/locale_ko.json @@ -182,7 +182,7 @@ {"id":"","label":"Training","localized":"학습(훈련)","hint":""}, {"id":"","label":"Interrogate","localized":"이미지➠텍스트","hint":""}, {"id":"","label":"Upscaling","localized":"업스케일링","hint":""}, - {"id":"","label":"Extra Networks","localized":"엑스트라 네트워크","hint":""}, + {"id":"","label":"Networks","localized":"엑스트라 네트워크","hint":""}, {"id":"","label":"Licenses","localized":"라이선스 정보","hint":""}, {"id":"","label":"Show all pages","localized":"모든 페이지 보기","hint":""}, {"id":"","label":"Request browser notifications","localized":"브라우저 알림 요청","hint":""} diff --git a/javascript/black-teal-reimagined.css b/javascript/black-teal-reimagined.css index 28176d247..c221d7e4e 100644 --- a/javascript/black-teal-reimagined.css +++ b/javascript/black-teal-reimagined.css @@ -783,7 +783,7 @@ svg.feather.feather-image, margin-top: var(--spacing-lg); } -/* Extra Networks Container */ +/* Networks Container */ #extra_networks_root { z-index: 100; background: var(--background-color); @@ -801,7 +801,7 @@ svg.feather.feather-image, } } -/* Extra Networks Styles */ +/* Networks Styles */ .extra-networks { border-left: 2px solid var(--highlight-color) !important; padding-left: 4px; diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py index 94664c5cb..e40a6177d 100644 --- a/modules/ui_extra_networks.py +++ b/modules/ui_extra_networks.py @@ -203,9 +203,9 @@ class ExtraNetworksPage: self.refresh_time = time.time() except Exception as e: self.items = [] - shared.log.error(f'Extra networks error listing items: class={self.__class__.__name__} tab={tabname} {e}') + shared.log.error(f'Networks: listing items class={self.__class__.__name__} tab={tabname} {e}') if os.environ.get('SD_EN_DEBUG', None): - errors.display(e, f'Extra networks error listing items: class={self.__class__.__name__} tab={tabname}') + errors.display(e, f'Networks: listing items: class={self.__class__.__name__} tab={tabname}') for item in self.items: if item is None: continue @@ -321,9 +321,9 @@ class ExtraNetworksPage: args['title'] += f'\nAlias: {alias}' return self.card.format(**args) except Exception as e: - shared.log.error(f'Extra networks item error: page={tabname} item={item["name"]} {e}') + shared.log.error(f'Networks: item error: page={tabname} item={item["name"]} {e}') if os.environ.get('SD_EN_DEBUG', None) is not None: - errors.display(e, 'Extra networks') + errors.display(e, 'Networks') return "" def find_preview_file(self, path): @@ -567,7 +567,7 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): nonlocal state state = SimpleNamespace(**json.loads(state_text)) except Exception as e: - shared.log.error(f'Extra networks state error: {e}') + shared.log.error(f'Networks: state error: {e}') return _page, _item = get_item(state) # shared.log.debug(f'Extra network: op={state.op} page={page.title if page is not None else None} item={item.filename if item is not None else None}') @@ -880,7 +880,7 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): page.refresh_time = 0 page.refresh() page.create_page(ui.tabname) - shared.log.debug(f"Refreshing Extra networks: page='{page.title}' items={len(page.items)} tab={ui.tabname}") + shared.log.debug(f"Networks: refresh page='{page.title}' items={len(page.items)} tab={ui.tabname}") pages.append(page.html) ui.search.update(title) return pages @@ -894,7 +894,7 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): page.card = card_full if page.view == 'gallery' else card_list page.html = '' page.create_page(ui.tabname) - shared.log.debug(f"Refreshing Extra networks: page='{page.title}' items={len(page.items)} tab={ui.tabname} view={page.view}") + shared.log.debug(f"Networks: refresh page='{page.title}' items={len(page.items)} tab={ui.tabname} view={page.view}") pages.append(page.html) ui.search.update(title) return pages @@ -946,7 +946,7 @@ def create_ui(container, button_parent, tabname, skip_indexing = False): if shared.opts.extra_networks_sort != sort_order: shared.opts.extra_networks_sort = sort_order shared.opts.save(shared.config_filename) - return f'Extra networks sort={sort_order}' + return f'Networks: sort={sort_order}' dummy = gr.State(value=False) # pylint: disable=abstract-class-instantiated button_parent.click(fn=toggle_visibility, inputs=[ui.visible], outputs=[ui.visible, container, button_parent]) diff --git a/modules/ui_extra_networks_checkpoints.py b/modules/ui_extra_networks_checkpoints.py index 9b66b754e..66dd21cb0 100644 --- a/modules/ui_extra_networks_checkpoints.py +++ b/modules/ui_extra_networks_checkpoints.py @@ -27,7 +27,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage): experimental = v.get('experimental', False) if experimental: if shared.cmd_opts.experimental: - shared.log.debug(f'Extra networks experimental: model="{k}"') + shared.log.debug(f'Networks: experimental model="{k}"') else: continue preview = v.get('preview', v['path']) diff --git a/wiki b/wiki index 56ba782f7..22951c981 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 56ba782f744bb8f6928f6c365d6ffc547d339548 +Subproject commit 22951c9818e44f3bfeecfd06b1c154230f711ea7