1580158
/
stable-diffusion-webui-dataset-tag-editor
mirror of https://github.com/toshiaki1729/stable-diffusion-webui-dataset-tag-editor.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial support for gradio 3.23.0 (#64) 

This commit will make it incompatible with old webUI.
pull/70/head
toshiaki1729 2023-03-26 18:40:20 +09:00 committed by GitHub
parent 2b3bd4a724
commit a9b30a94ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
javascript/00_modified_gallery.js
View File

@ -8,8 +8,10 @@ class DTEModifiedGallery{
setElement(elem){
this.#elem = elem;
this.#items_grid = this.#elem.querySelectorAll('div.grid button.gallery-item')
this.#items_selector = this.#elem.querySelectorAll('div.absolute.overflow-x-scroll button.gallery-item')
this.#items_grid = this.#elem.querySelectorAll('div.grid-wrap > div.grid-container > button.thumbnail-item')
this.#items_selector = this.#elem.querySelectorAll('div.preview > div.thumbnails > button.thumbnail-item')
console.log(this.#items_grid)
console.log(this.#items_selector)
}
updateFilter(){
@ -51,7 +53,7 @@ class DTEModifiedGallery{
getVisibleSelectedIndex(){
if (!this.#elem || !this.#items_selector) return -1;
let button = this.#elem.querySelector('.gallery-item.\\!ring-2')
let button = this.#elem.querySelector('.gradio-gallery .thumbnail-item.selected')
for (let i = 0; i < this.#items_selector.length; ++i){
if (this.#items_selector[i] == button){
@ -108,7 +110,7 @@ class DTEModifiedGallery{
}
case 'Escape':
{
let imgPreview_close = this.#elem.querySelector('div.modify-upload button')
let imgPreview_close = this.#elem.querySelector('div.preview > div > button[class^="svelte"]')
if (imgPreview_close != null) {
imgPreview_close.click()
}
@ -184,10 +186,10 @@ class DTEModifiedGallery{
addClickNextHandler(callback_clicked){
if (!this.#elem) return;
let fullImg_preview = this.#elem.querySelectorAll('img.w-full.object-contain')
let fullImg_preview = this.#elem.querySelectorAll('div.preview > img')
if (fullImg_preview != null) {
fullImg_preview.forEach(function (e) {
if (e && e.parentElement.tagName == 'DIV') {
if (e) {
e.addEventListener('click', callback_clicked, false);
}
});
@ -198,10 +200,10 @@ class DTEModifiedGallery{
addClickCloseHandler(callback_clicked){
if (!this.#elem) return;
let imgPreview_close = this.#elem.querySelectorAll('div.modify-upload button')
let imgPreview_close = this.#elem.querySelectorAll('div.preview > div > button[class^="svelte"]')
if (imgPreview_close != null) {
imgPreview_close.forEach(function (e) {
if (e && e.parentElement.tagName == 'DIV') {
if (e) {
e.addEventListener('click', callback_clicked, false);
}
});
@ -212,10 +214,10 @@ class DTEModifiedGallery{
clickClose(){
if (!this.#elem) return;
let imgPreview_close = this.#elem.querySelectorAll('div.modify-upload button')
let imgPreview_close = this.#elem.querySelectorAll('div.preview > div > button[class^="svelte"]')
if (imgPreview_close != null) {
imgPreview_close.forEach(function (e) {
if (e && e.parentElement.tagName == 'DIV') {
if (e) {
e.click()
}
});

1
javascript/99_main.js
View File

@ -148,7 +148,6 @@ document.addEventListener("DOMContentLoaded", function () {
}
prompt.parentElement.insertBefore(counter, prompt)
counter.classList.add("token-counter-dte")
prompt.parentElement.style.position = "relative"
counter.style.width = "auto"
}

4
scripts/ui/block_tag_filter.py
View File

@ -108,7 +108,9 @@ class TagFilterUI():
return self.cbg_tags_update()
def cbg_tags_changed(self, cbg_tags: List[str]):
def cbg_tags_changed(self,
cbg_tags#: List[str]
):
self.selected_tags = dte_instance.cleanup_tagset(set(dte_instance.read_tags(cbg_tags)))
return self.cbg_tags_update()

4
scripts/ui/block_tag_select.py
View File

@ -85,7 +85,9 @@ class TagSelectUI():
return self.cbg_tags_update()
def cbg_tags_changed(self, cbg_tags: List[str]):
def cbg_tags_changed(self,
cbg_tags#: List[str]
):
self.selected_tags = set(dte_instance.read_tags(cbg_tags))
return self.cbg_tags_update()

4
scripts/ui/tab_edit_caption_of_selected_image.py
View File

@ -27,7 +27,7 @@ class EditCaptionOfSelectedImageUI(UIBase):
self.btn_hidden_save_caption = gr.Button(elem_id="dataset_tag_editor_btn_hidden_save_caption")
with gr.Tab(label='Read Caption from Selected Image'):
self.tb_caption = gr.Textbox(label='Caption of Selected Image', interactive=False, lines=6, elem_id='dte_caption')
self.token_counter_caption = gr.HTML(value='<span></span>', elem_id='dte_caption_counter')
self.token_counter_caption = gr.HTML(value='<span>0/75</span>', elem_id='dte_caption_counter', elem_classes=["token-counter-dte"])
with gr.Row():
self.btn_copy_caption = gr.Button(value='Copy and Overwrite')
self.btn_prepend_caption = gr.Button(value='Prepend')
@ -53,7 +53,7 @@ class EditCaptionOfSelectedImageUI(UIBase):
self.cb_ask_save_when_caption_changed = gr.Checkbox(value=cfg_edit_selected.warn_change_not_saved, label='Warn if changes in caption is not saved')
with gr.Column():
self.tb_edit_caption = gr.Textbox(label='Edit Caption', interactive=True, lines=6, elem_id= 'dte_edit_caption')
self.token_counter_edit_caption = gr.HTML(value='<span></span>', elem_id='dte_edit_caption_counter')
self.token_counter_edit_caption = gr.HTML(value='<span>0/75</span>', elem_id='dte_edit_caption_counter', elem_classes=["token-counter-dte"])
self.btn_apply_changes_selected_image = gr.Button(value='Apply changes to selected image', variant='primary')
self.btn_apply_changes_all_images = gr.Button(value='Apply changes to ALL displayed images', variant='primary')

7
style.css
View File

@ -13,4 +13,11 @@
.token-counter-dte span{
padding: 0.1em 0.75em;
}
.token-counter-dte span{
background: var(--input-background-fill) !important;
box-shadow: 0 0 0.0 0.3em rgba(192,192,192,0.15), inset 0 0 0.6em rgba(192,192,192,0.075);
border: 2px solid rgba(192,192,192,0.4) !important;
border-radius: 0.4em;
}