Merge pull request #3652 from vladmandic/dev

refresh master

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  

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":""}

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;

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])

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'])