Merge branch 'dev' into patch-1

1 files changed, 72 insertions, 27 deletions

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 8c3dea56..693cafb6 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -1,11 +1,10 @@
-import glob

 import os.path

 import urllib.parse

 from pathlib import Path

-from PIL import PngImagePlugin

 

 from modules import shared

-from modules.images import read_info_from_image

+from modules.images import read_info_from_image, save_image_with_geninfo

+from modules.ui import up_down_symbol

 import gradio as gr

 import json

 import html

@@ -27,12 +26,12 @@ def register_page(page):
 def fetch_file(filename: str = ""):

     from starlette.responses import FileResponse

 

-    if not any([Path(x).absolute() in Path(filename).absolute().parents for x in allowed_dirs]):

+    if not any(Path(x).absolute() in Path(filename).absolute().parents for x in allowed_dirs):

         raise ValueError(f"File cannot be fetched: {filename}. Must be in one of directories registered by extra pages.")

 

     ext = os.path.splitext(filename)[1].lower()

-    if ext not in (".png", ".jpg", ".webp"):

-        raise ValueError(f"File cannot be fetched: {filename}. Only png and jpg and webp.")

+    if ext not in (".png", ".jpg", ".jpeg", ".webp", ".gif"):

+        raise ValueError(f"File cannot be fetched: {filename}. Only png, jpg, webp, and gif.")

 

     # would profit from returning 304

     return FileResponse(filename, headers={"Accept-Ranges": "bytes"})

@@ -91,8 +90,8 @@ class ExtraNetworksPage:
 

         subdirs = {}

         for parentdir in [os.path.abspath(x) for x in self.allowed_directories_for_previews()]:

-            for root, dirs, files in os.walk(parentdir):

-                for dirname in dirs:

+            for root, dirs, _ in sorted(os.walk(parentdir, followlinks=True), key=lambda x: shared.natural_sort_key(x[0])):

+                for dirname in sorted(dirs, key=shared.natural_sort_key):

                     x = os.path.join(root, dirname)

 

                     if not os.path.isdir(x):

@@ -106,6 +105,9 @@ class ExtraNetworksPage:
                     if not is_empty and not subdir.endswith("/"):

                         subdir = subdir + "/"

 

+                    if ("/." in subdir or subdir.startswith(".")) and not shared.opts.extra_networks_show_hidden_directories:

+                        continue

+

                     subdirs[subdir] = 1

 

         if subdirs:

@@ -148,6 +150,10 @@ class ExtraNetworksPage:
         return []

 

     def create_html_for_item(self, item, tabname):

+        """

+        Create HTML for card item in tab tabname; can return empty string if the item is not meant to be shown.

+        """

+

         preview = item.get("preview", None)

 

         onclick = item.get("onclick", None)

@@ -156,7 +162,7 @@ class ExtraNetworksPage:
 

         height = f"height: {shared.opts.extra_networks_card_height}px;" if shared.opts.extra_networks_card_height else ''

         width = f"width: {shared.opts.extra_networks_card_width}px;" if shared.opts.extra_networks_card_width else ''

-        background_image = f"background-image: url(\"{html.escape(preview)}\");" if preview else ''

+        background_image = f'<img src="{html.escape(preview)}" class="preview" loading="lazy">' if preview else ''

         metadata_button = ""

         metadata = item.get("metadata")

         if metadata:

@@ -170,12 +176,21 @@ class ExtraNetworksPage:
             if filename.startswith(absdir):

                 local_path = filename[len(absdir):]

 

-        # if this is true, the item must not be show in the default view, and must instead only be

+        # if this is true, the item must not be shown in the default view, and must instead only be

         # shown when searching for it

-        serach_only = "/." in local_path or "\\." in local_path

+        if shared.opts.extra_networks_hidden_models == "Always":

+            search_only = False

+        else:

+            search_only = "/." in local_path or "\\." in local_path

+

+        if search_only and shared.opts.extra_networks_hidden_models == "Never":

+            return ""

+

+        sort_keys = " ".join([html.escape(f'data-sort-{k}={v}') for k, v in item.get("sort_keys", {}).items()]).strip()

 

         args = {

-            "style": f"'display: none; {height}{width}{background_image}'",

+            "background_image": background_image,

+            "style": f"'display: none; {height}{width}'",

             "prompt": item.get("prompt", None),

             "tabname": json.dumps(tabname),

             "local_preview": json.dumps(item["local_preview"]),

@@ -185,17 +200,30 @@ class ExtraNetworksPage:
             "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {json.dumps(tabname)}, {json.dumps(item["local_preview"])})""") + '"',

             "search_term": item.get("search_term", ""),

             "metadata_button": metadata_button,

-            "serach_only": " search_only" if serach_only else "",

+            "search_only": " search_only" if search_only else "",

+            "sort_keys": sort_keys,

         }

 

         return self.card_page.format(**args)

 

+    def get_sort_keys(self, path):

+        """

+        List of default keys used for sorting in the UI.

+        """

+        pth = Path(path)

+        stat = pth.stat()

+        return {

+            "date_created": int(stat.st_ctime or 0),

+            "date_modified": int(stat.st_mtime or 0),

+            "name": pth.name.lower(),

+        }

+

     def find_preview(self, path):

         """

         Find a preview PNG for a given path (without extension) and call link_preview on it.

         """

 

-        preview_extensions = ["png", "jpg", "webp"]

+        preview_extensions = ["png", "jpg", "jpeg", "webp"]

         if shared.opts.samples_format not in preview_extensions:

             preview_extensions.append(shared.opts.samples_format)

 

@@ -220,10 +248,19 @@ class ExtraNetworksPage:
         return None

 

 

-def intialize():

+def initialize():

     extra_pages.clear()

 

 

+def register_default_pages():

+    from modules.ui_extra_networks_textual_inversion import ExtraNetworksPageTextualInversion

+    from modules.ui_extra_networks_hypernets import ExtraNetworksPageHypernetworks

+    from modules.ui_extra_networks_checkpoints import ExtraNetworksPageCheckpoints

+    register_page(ExtraNetworksPageTextualInversion())

+    register_page(ExtraNetworksPageHypernetworks())

+    register_page(ExtraNetworksPageCheckpoints())

+

+

 class ExtraNetworksUi:

     def __init__(self):

         self.pages = None

@@ -263,18 +300,20 @@ def create_ui(container, button, tabname):
     ui.stored_extra_pages = pages_in_preferred_order(extra_pages.copy())

     ui.tabname = tabname

 

-    with gr.Tabs(elem_id=tabname+"_extra_tabs") as tabs:

+    with gr.Tabs(elem_id=tabname+"_extra_tabs"):

         for page in ui.stored_extra_pages:

             page_id = page.title.lower().replace(" ", "_")

 

             with gr.Tab(page.title, id=page_id):

                 elem_id = f"{tabname}_{page_id}_cards_html"

-                page_elem = gr.HTML('', elem_id=elem_id)

+                page_elem = gr.HTML('Loading...', elem_id=elem_id)

                 ui.pages.append(page_elem)

 

                 page_elem.change(fn=lambda: None, _js='function(){applyExtraNetworkFilter(' + json.dumps(tabname) + '); return []}', inputs=[], outputs=[])

 

     gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", placeholder="Search...", visible=False)

+    gr.Dropdown(choices=['Default Sort', 'Date Created', 'Date Modified', 'Name'], value='Default Sort', elem_id=tabname+"_extra_sort", multiselect=False, visible=False, show_label=False, interactive=True)

+    gr.Button(up_down_symbol, elem_id=tabname+"_extra_sortorder")

     button_refresh = gr.Button('Refresh', elem_id=tabname+"_extra_refresh")

 

     ui.button_save_preview = gr.Button('Save preview', elem_id=tabname+"_save_preview", visible=False)

@@ -283,13 +322,24 @@ def create_ui(container, button, tabname):
     def toggle_visibility(is_visible):

         is_visible = not is_visible

 

-        if is_visible and not ui.pages_contents:

+        return is_visible, gr.update(visible=is_visible), gr.update(variant=("secondary-down" if is_visible else "secondary"))

+

+    def fill_tabs(is_empty):

+        """Creates HTML for extra networks' tabs when the extra networks button is clicked for the first time."""

+

+        if not ui.pages_contents:

             refresh()

 

-        return is_visible, gr.update(visible=is_visible), gr.update(variant=("secondary-down" if is_visible else "secondary")), *ui.pages_contents

+        if is_empty:

+            return True, *ui.pages_contents

+

+        return True, *[gr.update() for _ in ui.pages_contents]

 

     state_visible = gr.State(value=False)

-    button.click(fn=toggle_visibility, inputs=[state_visible], outputs=[state_visible, container, button, *ui.pages])

+    button.click(fn=toggle_visibility, inputs=[state_visible], outputs=[state_visible, container, button], show_progress=False)

+

+    state_empty = gr.State(value=True)

+    button.click(fn=fill_tabs, inputs=[state_empty], outputs=[state_empty, *ui.pages], show_progress=False)

 

     def refresh():

         for pg in ui.stored_extra_pages:

@@ -327,18 +377,13 @@ def setup_ui(ui, gallery):
 

         is_allowed = False

         for extra_page in ui.stored_extra_pages:

-            if any([path_is_parent(x, filename) for x in extra_page.allowed_directories_for_previews()]):

+            if any(path_is_parent(x, filename) for x in extra_page.allowed_directories_for_previews()):

                 is_allowed = True

                 break

 

         assert is_allowed, f'writing to {filename} is not allowed'

 

-        if geninfo:

-            pnginfo_data = PngImagePlugin.PngInfo()

-            pnginfo_data.add_text('parameters', geninfo)

-            image.save(filename, pnginfo=pnginfo_data)

-        else:

-            image.save(filename)

+        save_image_with_geninfo(image, geninfo, filename)

 

         return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]