Commit e5d3ae2b authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

user metadata system for custom networks

parent c58cf73c

extensions-builtin/Lora/ui_extra_networks_lora.py

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ class ExtraNetworksPageLora(ui_extra_networks.ExtraNetworksPage): 


            yield {

                "name": name,

                "filename": path,

                "filename": lora_on_disk.filename,

                "preview": self.find_preview(path),

                "description": self.find_description(path),

                "search_term": self.search_terms_from_path(lora_on_disk.filename),

html/extra-networks-card.html

+4 −4
Original line number Diff line number Diff line 
<div class='card' style={style} onclick={card_clicked} {sort_keys}>

	{background_image}

	<div class="button-row">

		{edit_button}

		{metadata_button}

	</div>

	<div class='actions'>

		<div class='additional'>

			<ul>

				<a href="#" title="replace preview image with currently selected in gallery" onclick={save_card_preview}>replace preview</a>

			</ul>

			<span style="display:none" class='search_term{search_only}'>{search_term}</span>

		</div>

		<span class='name'>{name}</span>

javascript/extraNetworks.js

+31 −6
Original line number Diff line number Diff line
@@ -182,19 +182,20 @@ function extraNetworksSearchButton(tabs_id, event) { 


var globalPopup = null;

var globalPopupInner = null;

function closePopup(){

    if (!globalPopup) return;



    globalPopup.style.display = "none";

}

function popup(contents) {

    if (!globalPopup) {

        globalPopup = document.createElement('div');

        globalPopup.onclick = function() {

            globalPopup.style.display = "none";

        };

        globalPopup.onclick = closePopup;

        globalPopup.classList.add('global-popup');



        var close = document.createElement('div');

        close.classList.add('global-popup-close');

        close.onclick = function() {

            globalPopup.style.display = "none";

        };

        close.onclick = closePopup;

        close.title = "Close";

        globalPopup.appendChild(close);
@@ -263,3 +264,27 @@ function extraNetworksRequestMetadata(event, extraPage, cardName) { 


    event.stopPropagation();

}



extraPageUserMetadataEditors = {}



function extraNetworksEditUserMetadata(event, tabname, extraPage, cardName) {

    var id = tabname + '_' + extraPage + '_edit_user_metadata';



    editor = extraPageUserMetadataEditors[id]

    if(! editor){

        editor = {};

        editor.page = gradioApp().getElementById(id);

        editor.nameTextarea = gradioApp().querySelector("#" + id + "_name" + ' textarea');

        editor.button = gradioApp().querySelector("#" + id + "_button");

        extraPageUserMetadataEditors[id] = editor;

    }



    editor.nameTextarea.value = cardName;

    updateInput(editor.nameTextarea);



    editor.button.click();



    popup(editor.page);



    event.stopPropagation();

}

modules/ui_extra_networks.py

+47 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ import os.path 
import urllib.parse

from pathlib import Path



from modules import shared

from modules import shared, ui_extra_networks_user_metadata, errors

from modules.images import read_info_from_image, save_image_with_geninfo

from modules.ui import up_down_symbol

import gradio as gr
@@ -60,13 +60,34 @@ 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")

        self.allow_negative_prompt = False

        self.metadata = {}

        self.items = {}



    def refresh(self):

        pass



    def read_user_metadata(self, item):

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

        basename, ext = os.path.splitext(filename)

        metadata_filename = basename + '.json'



        metadata = {}

        try:

            if os.path.isfile(metadata_filename):

                with open(metadata_filename, "r", encoding="utf8") as file:

                    metadata = json.load(file)

        except Exception as e:

            errors.display(e, f"reading extra network user metadata from {metadata_filename}")



        desc = metadata.get("description", None)

        if desc is not None:

            item["description"] = desc



        item["user_metadata"] = metadata



    def link_preview(self, filename):

        quoted_filename = urllib.parse.quote(filename.replace('\\', '/'))

        mtime = os.path.getmtime(filename)
@@ -119,11 +140,15 @@ class ExtraNetworksPage: 
</button>

""" for subdir in subdirs])



        for item in self.list_items():

        self.items = {x["name"]: x for x in self.list_items()}

        for item in self.items.values():

            metadata = item.get("metadata")

            if metadata:

                self.metadata[item["name"]] = metadata



            if "user_metadata" not in item:

                self.read_user_metadata(item)



            items_html += self.create_html_for_item(item, tabname)



        if items_html == '':
@@ -166,7 +191,9 @@ class ExtraNetworksPage: 
        metadata_button = ""

        metadata = item.get("metadata")

        if metadata:

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

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



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



        local_path = ""

        filename = item.get("filename", "")
@@ -200,6 +227,7 @@ 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,

            "edit_button": edit_button,

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

            "sort_keys": sort_keys,

        }
@@ -247,6 +275,9 @@ class ExtraNetworksPage: 
                pass

        return None



    def create_user_metadata_editor(self, ui, tabname):

        return ui_extra_networks_user_metadata.UserMetadataEditor(ui, tabname, self)





def initialize():

    extra_pages.clear()
@@ -297,20 +328,23 @@ def create_ui(container, button, tabname): 
    ui = ExtraNetworksUi()

    ui.pages = []

    ui.pages_contents = []

    ui.user_metadata_editors = []

    ui.stored_extra_pages = pages_in_preferred_order(extra_pages.copy())

    ui.tabname = tabname



    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"

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

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

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



                editor = page.create_user_metadata_editor(ui, tabname)

                editor.create_ui()

                ui.user_metadata_editors.append(editor)



    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")
@@ -363,6 +397,8 @@ def path_is_parent(parent_path, child_path): 


def setup_ui(ui, gallery):

    def save_preview(index, images, filename):

        # this function is here for backwards compatibility and likely will be removed soon



        if len(images) == 0:

            print("There is no image in gallery to save as a preview.")

            return [page.create_html(ui.tabname) for page in ui.stored_extra_pages]
@@ -394,3 +430,7 @@ def setup_ui(ui, gallery): 
        outputs=[*ui.pages]

    )



    for editor in ui.user_metadata_editors:

        editor.setup_ui(gallery)

modules/ui_extra_networks_checkpoints.py

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class ExtraNetworksPageCheckpoints(ui_extra_networks.ExtraNetworksPage): 
            path, ext = os.path.splitext(checkpoint.filename)

            yield {

                "name": checkpoint.name_for_extra,

                "filename": path,

                "filename": checkpoint.filename,

                "preview": self.find_preview(path),

                "description": self.find_description(path),

                "search_term": self.search_terms_from_path(checkpoint.filename) + " " + (checkpoint.sha256 or ""),

CRA Git | Maintained and supported by SUSTech CRA and CCSE