diff --git a/html/extra-networks-card-minimal.html b/html/extra-networks-card-minimal.html
new file mode 100644
index 000000000..a6a54d9f4
--- /dev/null
+++ b/html/extra-networks-card-minimal.html
@@ -0,0 +1,3 @@
+
{background_image}
+ {copy_path_button}
{metadata_button}
{edit_button}
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 98a7abb74..40309d557 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -337,6 +337,11 @@ function requestGet(url, data, handler, errorHandler) {
xhr.send(js);
}
+function extraNetworksCopyCardPath(event, path) {
+ navigator.clipboard.writeText(path);
+ event.stopPropagation();
+}
+
function extraNetworksRequestMetadata(event, extraPage, cardName) {
var showError = function() {
extraNetworksShowMetadata("there was an error getting metadata");
diff --git a/modules/shared_options.py b/modules/shared_options.py
index d2e86ff10..e698c2649 100644
--- a/modules/shared_options.py
+++ b/modules/shared_options.py
@@ -238,6 +238,7 @@ options_templates.update(options_section(('extra_networks', "Extra Networks", "s
"extra_networks_dir_button_function": OptionInfo(False, "Add a '/' to the beginning of directory buttons").info("Buttons will display the contents of the selected directory without acting as a search filter."),
"extra_networks_hidden_models": OptionInfo("When searched", "Show cards for models in hidden directories", gr.Radio, {"choices": ["Always", "When searched", "Never"]}).info('"When searched" option will only show the item when the search string has 4 characters or more'),
"extra_networks_default_multiplier": OptionInfo(1.0, "Default multiplier for extra networks", gr.Slider, {"minimum": 0.0, "maximum": 2.0, "step": 0.01}),
+ "extra_networks_tree_view": OptionInfo(False, "Show extra networks using a directory tree view.").needs_reload_ui(),
"extra_networks_card_width": OptionInfo(0, "Card width for Extra Networks").info("in pixels"),
"extra_networks_card_height": OptionInfo(0, "Card height for Extra Networks").info("in pixels"),
"extra_networks_card_text_scale": OptionInfo(1.0, "Card text scale", gr.Slider, {"minimum": 0.0, "maximum": 2.0, "step": 0.01}).info("1 = original size"),
diff --git a/modules/ui_extra_networks.py b/modules/ui_extra_networks.py
index fe5d3ba33..8667617b9 100644
--- a/modules/ui_extra_networks.py
+++ b/modules/ui_extra_networks.py
@@ -2,6 +2,8 @@ import functools
import os.path
import urllib.parse
from pathlib import Path
+from typing import Optional, Union
+from dataclasses import dataclass
from modules import shared, ui_extra_networks_user_metadata, errors, extra_networks
from modules.images import read_info_from_image, save_image_with_geninfo
@@ -15,10 +17,8 @@ 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 [])
@@ -28,6 +28,58 @@ def allowed_preview_extensions():
return allowed_preview_extensions_with_extra((shared.opts.samples_format, ))
+@dataclass
+class ExtraNetworksItem:
+ """Wrapper for dictionaries representing ExtraNetworks items."""
+ item: dict
+
+
+def get_tree(paths: Union[str, list[str]], items: dict[str, ExtraNetworksItem]) -> dict:
+ """Recursively builds a directory tree.
+
+ Args:
+ paths: Path or list of paths to directories. These paths are treated as roots from which
+ the tree will be built.
+ items: A dictionary associating filepaths to an ExtraNetworksItem instance.
+
+ Returns:
+ The result directory tree.
+ """
+ if isinstance(paths, (str,)):
+ paths = [paths]
+
+ def _get_tree(_paths: list[str]):
+ _res = {}
+ for path in _paths:
+ if os.path.isdir(path):
+ dir_items = os.listdir(path)
+ # Ignore empty directories.
+ if not dir_items:
+ continue
+ dir_tree = _get_tree([os.path.join(path, x) for x in dir_items])
+ # We only want to store non-empty folders in the tree.
+ if dir_tree:
+ _res[os.path.basename(path)] = dir_tree
+ else:
+ if path not in items:
+ continue
+ # Add the ExtraNetworksItem to the result.
+ _res[os.path.basename(path)] = items[path]
+ return _res
+
+ res = {}
+ # Handle each root directory separately.
+ # Each root WILL have a key/value at the root of the result dict though
+ # the value can be an empty dict if the directory is empty. We want these
+ # placeholders for empty dirs so we can inform the user later.
+ for path in paths:
+ # Wrap the path in a list since that is what the `_get_tree` expects.
+ res[path] = _get_tree([path])
+ if res[path]:
+ res[path] = res[path][os.path.basename(path)]
+
+ return res
+
def register_page(page):
"""registers extra networks page for the UI; recommend doing it in on_before_ui() callback for extensions"""
@@ -80,7 +132,7 @@ def get_single_card(page: str = "", tabname: str = "", name: str = ""):
item = page.items.get(name)
page.read_user_metadata(item)
- item_html = page.create_html_for_item(item, tabname)
+ item_html = page.create_item_html(tabname, item)
return JSONResponse({"html": item_html})
@@ -96,13 +148,15 @@ def quote_js(s):
s = s.replace('"', '\\"')
return f'"{s}"'
-
class ExtraNetworksPage:
def __init__(self, title):
self.title = title
self.name = title.lower()
self.id_page = self.name.replace(" ", "_")
- self.card_page = shared.html("extra-networks-card.html")
+ if shared.opts.extra_networks_tree_view:
+ self.card_page = shared.html("extra-networks-card-minimal.html")
+ else:
+ self.card_page = shared.html("extra-networks-card.html")
self.allow_prompt = True
self.allow_negative_prompt = False
self.metadata = {}
@@ -136,12 +190,141 @@ class ExtraNetworksPage:
return ""
- def create_html(self, tabname):
- items_html = ''
+ def create_item_html(self, tabname: str, item: dict) -> str:
+ """Generates HTML for a single ExtraNetworks Item
+
+ Args:
+ tabname: The name of the active tab.
+ item: Dictionary containing item information.
+
+ Returns:
+ HTML string generated for this item.
+ Can be empty if the item is not meant to be shown.
+ """
+ metadata = item.get("metadata")
+ if metadata:
+ self.metadata[item["name"]] = metadata
+
+ if "user_metadata" not in item:
+ self.read_user_metadata(item)
+
+ preview = item.get("preview", None)
+ 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'
})
' if preview else ''
+
+ onclick = item.get("onclick", None)
+ if onclick is None:
+ onclick = '"' + html.escape(f"""return cardClicked({quote_js(tabname)}, {item["prompt"]}, {"true" if self.allow_negative_prompt else "false"})""") + '"'
+
+ copy_path_button = f"
"
+
+ metadata_button = ""
+ metadata = item.get("metadata")
+ if metadata:
+ metadata_button = f"
"
+
+ edit_button = f"
"
+
+ local_path = ""
+ filename = item.get("filename", "")
+ for reldir in self.allowed_directories_for_previews():
+ absdir = os.path.abspath(reldir)
+
+ if filename.startswith(absdir):
+ local_path = filename[len(absdir):]
+
+ # if this is true, the item must not be shown in the default view, and must instead only be
+ # shown when searching for it
+ 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([f'data-sort-{k}="{html.escape(str(v))}"' for k, v in item.get("sort_keys", {}).items()]).strip()
+
+ # Some items here might not be used depending on HTML template used.
+ args = {
+ "background_image": background_image,
+ "card_clicked": onclick,
+ "copy_path_button": copy_path_button,
+ "description": (item.get("description") or "" if shared.opts.extra_networks_card_show_desc else ""),
+ "edit_button": edit_button,
+ "local_preview": quote_js(item["local_preview"]),
+ "metadata_button": metadata_button,
+ "name": html.escape(item["name"]),
+ "prompt": item.get("prompt", None),
+ "save_card_preview": '"' + html.escape(f"""return saveCardPreview(event, {quote_js(tabname)}, {quote_js(item["local_preview"])})""") + '"',
+ "search_only": " search_only" if search_only else "",
+ "search_term": item.get("search_term", ""),
+ "sort_keys": sort_keys,
+ "style": f"'display: none; {height}{width}; font-size: {shared.opts.extra_networks_card_text_scale*100}%'",
+ "tabname": quote_js(tabname),
+ }
+
+ return self.card_page.format(**args)
+
+ def create_tree_view_html(self, tabname: str) -> str:
+ """Generates HTML for displaying folders in a tree view.
+
+ Args:
+ tabname: The name of the active tab.
+
+ Returns:
+ HTML string generated for this tree view.
+ """
+ self_name_id = self.name.replace(" ", "_")
+ res = f""
+
+ file_template = "
{}"
+ dir_template = (
+ "
"
+ "{}
"
+ "{}"
+ " "
+ )
+
+ def _build_tree(data: Optional[dict[str, ExtraNetworksItem]] = None) -> str:
+ """Recursively builds HTML for a tree."""
+ _res = "
"
+ if not data:
+ return ""
+
+ for k, v in sorted(data.items(), key=lambda x: shared.natural_sort_key(x[0])):
+ if isinstance(v, (ExtraNetworksItem,)):
+ _res += file_template.format(self.create_item_html(tabname, v.item))
+ else:
+ _res += dir_template.format("", k, _build_tree(v))
+ return _res
+
+ res += ""
+ # Add each root directory to the tree.
+ for k, v in sorted(tree.items(), key=lambda x: shared.natural_sort_key(x[0])):
+ # If root is empty, append the "disabled" attribute to the template details tag.
+ res += dir_template.format("open" if v else "open disabled", k, _build_tree(v))
+ res += "
"
+ res += "
"
+
+ return res
+
+ def create_card_view_html(self, tabname):
+ items_html = ""
+ self.metadata = {}
subdirs = {}
+
for parentdir in [os.path.abspath(x) for x in self.allowed_directories_for_previews()]:
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):
@@ -171,40 +354,45 @@ class ExtraNetworksPage:
if subdirs:
subdirs = {"": 1, **subdirs}
- subdirs_html = "".join([f"""
-