Merge branch 'release_candidate'

1 files changed, 46 insertions, 19 deletions

diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index 063bd7b8..fe5d3ba3 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -1,3 +1,4 @@
+import functools

 import os.path

 import urllib.parse

 from pathlib import Path

@@ -15,6 +16,17 @@ from modules.ui_components import ToolButton
 extra_pages = []

 allowed_dirs = set()

 

+default_allowed_preview_extensions = ["png", "jpg", "jpeg", "webp", "gif"]

+

+

+@functools.cache

+def allowed_preview_extensions_with_extra(extra_extensions=None):

+    return set(default_allowed_preview_extensions) | set(extra_extensions or [])

+

+

+def allowed_preview_extensions():

+    return allowed_preview_extensions_with_extra((shared.opts.samples_format, ))

+

 

 def register_page(page):

     """registers extra networks page for the UI; recommend doing it in on_before_ui() callback for extensions"""

@@ -33,9 +45,9 @@ def fetch_file(filename: str = ""):
     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", ".jpeg", ".webp", ".gif"):

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

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

+    if ext not in allowed_preview_extensions():

+        raise ValueError(f"File cannot be fetched: {filename}. Extensions allowed: {allowed_preview_extensions()}.")

 

     # would profit from returning 304

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

@@ -91,6 +103,7 @@ class ExtraNetworksPage:
         self.name = title.lower()

         self.id_page = self.name.replace(" ", "_")

         self.card_page = shared.html("extra-networks-card.html")

+        self.allow_prompt = True

         self.allow_negative_prompt = False

         self.metadata = {}

         self.items = {}

@@ -138,8 +151,13 @@ class ExtraNetworksPage:
                         continue

 

                     subdir = os.path.abspath(x)[len(parentdir):].replace("\\", "/")

-                    while subdir.startswith("/"):

-                        subdir = subdir[1:]

+

+                    if shared.opts.extra_networks_dir_button_function:

+                        if not subdir.startswith("/"):

+                            subdir = "/" + subdir

+                    else:

+                        while subdir.startswith("/"):

+                            subdir = subdir[1:]

 

                     is_empty = len(os.listdir(x)) == 0

                     if not is_empty and not subdir.endswith("/"):

@@ -213,9 +231,9 @@ class ExtraNetworksPage:
         metadata_button = ""

         metadata = item.get("metadata")

         if metadata:

-            metadata_button = f"<div class='metadata-button card-button' title='Show internal metadata' onclick='extraNetworksRequestMetadata(event, {quote_js(self.name)}, {quote_js(item['name'])})'></div>"

+            metadata_button = f"<div class='metadata-button card-button' title='Show internal metadata' onclick='extraNetworksRequestMetadata(event, {quote_js(self.name)}, {quote_js(html.escape(item['name']))})'></div>"

 

-        edit_button = f"<div class='edit-button card-button' title='Edit metadata' onclick='extraNetworksEditUserMetadata(event, {quote_js(tabname)}, {quote_js(self.id_page)}, {quote_js(item['name'])})'></div>"

+        edit_button = f"<div class='edit-button card-button' title='Edit metadata' onclick='extraNetworksEditUserMetadata(event, {quote_js(tabname)}, {quote_js(self.id_page)}, {quote_js(html.escape(item['name']))})'></div>"

 

         local_path = ""

         filename = item.get("filename", "")

@@ -235,7 +253,7 @@ class ExtraNetworksPage:
         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()

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

 

         args = {

             "background_image": background_image,

@@ -266,6 +284,7 @@ class ExtraNetworksPage:
             "date_created": int(stat.st_ctime or 0),

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

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

+            "path": str(pth.parent).lower(),

         }

 

     def find_preview(self, path):

@@ -273,11 +292,7 @@ class ExtraNetworksPage:
         Find a preview PNG for a given path (without extension) and call link_preview on it.

         """

 

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

-        if shared.opts.samples_format not in preview_extensions:

-            preview_extensions.append(shared.opts.samples_format)

-

-        potential_files = sum([[path + "." + ext, path + ".preview." + ext] for ext in preview_extensions], [])

+        potential_files = sum([[path + "." + ext, path + ".preview." + ext] for ext in allowed_preview_extensions()], [])

 

         for file in potential_files:

             if os.path.isfile(file):

@@ -359,7 +374,10 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname):
     related_tabs = []

 

     for page in ui.stored_extra_pages:

-        with gr.Tab(page.title, id=page.id_page) as tab:

+        with gr.Tab(page.title, elem_id=f"{tabname}_{page.id_page}", elem_classes=["extra-page"]) as tab:

+            with gr.Column(elem_id=f"{tabname}_{page.id_page}_prompts", elem_classes=["extra-page-prompts"]):

+                pass

+

             elem_id = f"{tabname}_{page.id_page}_cards_html"

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

             ui.pages.append(page_elem)

@@ -373,19 +391,28 @@ def create_ui(interface: gr.Blocks, unrelated_tabs, tabname):
             related_tabs.append(tab)

 

     edit_search = gr.Textbox('', show_label=False, elem_id=tabname+"_extra_search", elem_classes="search", placeholder="Search...", visible=False, interactive=True)

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

-    button_sortorder = ToolButton(switch_values_symbol, elem_id=tabname+"_extra_sortorder", elem_classes="sortorder", visible=False)

+    dropdown_sort = gr.Dropdown(choices=['Path', 'Name', 'Date Created', 'Date Modified', ], value=shared.opts.extra_networks_card_order_field, elem_id=tabname+"_extra_sort", elem_classes="sort", multiselect=False, visible=False, show_label=False, interactive=True, label=tabname+"_extra_sort_order")

+    button_sortorder = ToolButton(switch_values_symbol, elem_id=tabname+"_extra_sortorder", elem_classes=["sortorder"] + ([] if shared.opts.extra_networks_card_order == "Ascending" else ["sortReverse"]), visible=False, tooltip="Invert sort order")

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

     checkbox_show_dirs = gr.Checkbox(True, label='Show dirs', elem_id=tabname+"_extra_show_dirs", elem_classes="show-dirs", visible=False)

 

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

     ui.preview_target_filename = gr.Textbox('Preview save filename', elem_id=tabname+"_preview_filename", visible=False)

 

+    tab_controls = [edit_search, dropdown_sort, button_sortorder, button_refresh, checkbox_show_dirs]

+

     for tab in unrelated_tabs:

-        tab.select(fn=lambda: [gr.update(visible=False) for _ in range(5)], inputs=[], outputs=[edit_search, dropdown_sort, button_sortorder, button_refresh, checkbox_show_dirs], show_progress=False)

+        tab.select(fn=lambda: [gr.update(visible=False) for _ in tab_controls], _js='function(){ extraNetworksUrelatedTabSelected("' + tabname + '"); }', inputs=[], outputs=tab_controls, show_progress=False)

+

+    for page, tab in zip(ui.stored_extra_pages, related_tabs):

+        allow_prompt = "true" if page.allow_prompt else "false"

+        allow_negative_prompt = "true" if page.allow_negative_prompt else "false"

+

+        jscode = 'extraNetworksTabSelected("' + tabname + '", "' + f"{tabname}_{page.id_page}_prompts" + '", ' + allow_prompt + ', ' + allow_negative_prompt + ');'

+

+        tab.select(fn=lambda: [gr.update(visible=True) for _ in tab_controls],  _js='function(){ ' + jscode + ' }', inputs=[], outputs=tab_controls, show_progress=False)

 

-    for tab in related_tabs:

-        tab.select(fn=lambda: [gr.update(visible=True) for _ in range(5)], inputs=[], outputs=[edit_search, dropdown_sort, button_sortorder, button_refresh, checkbox_show_dirs], show_progress=False)

+    dropdown_sort.change(fn=lambda: None, _js="function(){ applyExtraNetworkSort('" + tabname + "'); }")

 

     def pages_html():

         if not ui.pages_contents: