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

just move variables

pull/59/head
toshiaki1729 2023-03-10 12:28:50 +09:00
parent a6cabece3c
commit b70eb4b18b
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/main.py
View File

@ -312,7 +312,7 @@ def on_ui_tabs():
outputs=configurable_components
)
o_update_gallery = [ui.filter_by_tags.cbg_hidden_dataset_filter, ui.filter_by_tags.nb_hidden_dataset_filter_apply, ui.dataset_gallery.nb_hidden_image_index, ui.dataset_gallery.nb_hidden_image_index_prev, ui.edit_caption_of_selected_image.nb_hidden_image_index_save_or_not, ui.gallery_state.txt_gallery]
o_update_gallery = [ui.dataset_gallery.cbg_hidden_dataset_filter, ui.dataset_gallery.nb_hidden_dataset_filter_apply, ui.dataset_gallery.nb_hidden_image_index, ui.dataset_gallery.nb_hidden_image_index_prev, ui.edit_caption_of_selected_image.nb_hidden_image_index_save_or_not, ui.gallery_state.txt_gallery]
o_update_filter_and_gallery = \
[ui.filter_by_tags.tag_filter_ui.cbg_tags, ui.filter_by_tags.tag_filter_ui_neg.cbg_tags] + \

12
scripts/ui/block_dataset_gallery.py
View File

@ -17,6 +17,8 @@ class DatasetGalleryUI(UIBase):
def create_ui(self, image_columns):
with gr.Row(visible=False):
self.cbg_hidden_dataset_filter = gr.State(value=[])
self.nb_hidden_dataset_filter_apply = gr.Number(label='Filter Apply', value=-1)
self.btn_hidden_set_index = gr.Button(elem_id="dataset_tag_editor_btn_hidden_set_index")
self.nb_hidden_image_index = gr.Number(value=None, label='hidden_idx_next')
self.nb_hidden_image_index_prev = gr.Number(value=None, label='hidden_idx_prev')
@ -61,6 +63,10 @@ class DatasetGalleryUI(UIBase):
fn=self.func_to_set_value('selected_index_prev', int),
inputs=self.nb_hidden_image_index_prev
)
self.nb_hidden_dataset_filter_apply.change(
fn=lambda a, b: [a, b],
_js='(x, y) => [y>=0 ? dataset_tag_editor_gl_dataset_images_filter(x) : x, -1]',
inputs=[self.cbg_hidden_dataset_filter, self.nb_hidden_dataset_filter_apply],
outputs=[self.cbg_hidden_dataset_filter, self.nb_hidden_dataset_filter_apply]
)

4
scripts/ui/block_load_dataset.py
View File

@ -81,7 +81,7 @@ class LoadDatasetUI(UIBase):
imgs,
[]
] +\
[gr.CheckboxGroup.update(value=[str(i) for i in img_indices], choices=[str(i) for i in img_indices]), True] +\
[gr.CheckboxGroup.update(value=[str(i) for i in img_indices], choices=[str(i) for i in img_indices]), 1] +\
filter_by_tags.clear_filters(update_filter_and_gallery) +\
[batch_edit_captions.tag_select_ui_remove.cbg_tags_update()]
@ -90,7 +90,7 @@ class LoadDatasetUI(UIBase):
inputs=[self.tb_img_directory, self.tb_caption_file_ext, self.cb_load_recursive, self.cb_load_caption_from_filename, self.rb_use_interrogator, self.dd_intterogator_names, self.cb_use_custom_threshold_booru, self.sl_custom_threshold_booru, self.cb_use_custom_threshold_waifu, self.sl_custom_threshold_waifu, toprow.cb_save_kohya_metadata, toprow.tb_metadata_output],
outputs=
[dataset_gallery.gl_dataset_images, filter_by_selection.gl_filter_images] +
[filter_by_tags.cbg_hidden_dataset_filter, filter_by_tags.nb_hidden_dataset_filter_apply] +
[dataset_gallery.cbg_hidden_dataset_filter, dataset_gallery.nb_hidden_dataset_filter_apply] +
o_update_filter_and_gallery
)

10
scripts/ui/tab_filter_by_tags.py
View File

@ -17,9 +17,6 @@ class FilterByTagsUI(UIBase):
self.tag_filter_ui_neg = TagFilterUI(tag_filter_mode=filters.TagFilter.Mode.EXCLUSIVE)
def create_ui(self, cfg_filter_p, cfg_filter_n, get_filters):
self.cbg_hidden_dataset_filter = gr.CheckboxGroup(label='Dataset Filter', visible=False)
self.nb_hidden_dataset_filter_apply = gr.Number(label='Filter Apply', value=-1, visible=False)
with gr.Row():
self.btn_clear_tag_filters = gr.Button(value='Clear tag filters')
self.btn_clear_all_filters = gr.Button(value='Clear ALL filters')
@ -78,13 +75,6 @@ class FilterByTagsUI(UIBase):
fn=lambda:self.clear_filters(update_filter_and_gallery),
outputs=o_update_filter_and_gallery
)
self.nb_hidden_dataset_filter_apply.change(
fn=lambda a, b: [a, b],
_js='(x, y) => [y>=0 ? dataset_tag_editor_gl_dataset_images_filter(x) : x, -1]',
inputs=[self.cbg_hidden_dataset_filter, self.nb_hidden_dataset_filter_apply],
outputs=[self.cbg_hidden_dataset_filter, self.nb_hidden_dataset_filter_apply]
)
def clear_filters(self, update_filter_and_gallery):
self.tag_filter_ui.clear_filter()