update logic

app.py

@@ -6,18 +6,11 @@ import gradio as gr
 import PIL.Image
 import zipfile
 from genTag import genTag
-from checkIgnore import is_ignore
-from createTagDom import create_tag_dom
+from checkIgnore import is_ignore, ignore2
 
 def predict(image: PIL.Image.Image):
     result_threshold = genTag(image, 0.5)
-    result_html = ''
-    for label, prob in result_threshold.items():
-        result_html += create_tag_dom(label, is_ignore(label, 1), prob)
-    result_html = '<div>' + result_html + '</div>'
-    result_filter = {key: value for key, value in result_threshold.items() if not is_ignore(key, 1)}
-    result_text = '<div id="m5dd_result">' + ', '.join(result_filter.keys()) + '</div>'
-    return result_html, result_text
+    return result_threshold, ignore2, """<div></div>"""
 
 def predict_api(image: PIL.Image.Image):
     result_threshold = genTag(image, 0.5)
@@ -50,9 +43,12 @@ with gr.Blocks(head_paths="head.html") as demo:
                                  image_mode="RGBA",
                                  show_fullscreen_button=False,
                                  sources=["upload", "clipboard"])
-                result_text = gr.HTML(value="", elem_classes='m5dd_html', padding=False)
+                result_text = gr.HTML(value="""<div id="m5dd_result"></div>""", elem_classes='m5dd_html', padding=False)
+                result_hide = gr.JSON(visible=False)
+                result_hide2 = gr.JSON(visible=False)
             with gr.Column(scale=2):
-                result_html = gr.HTML(value="", elem_classes='m5dd_html', padding=False)
+                result_html = gr.HTML(value="""<div id="m5dd_list"></div>""", elem_classes='m5dd_html', padding=False)
+                result_loading = gr.HTML(value="""<div></div>""", elem_classes='m5dd_html', padding=False)
     with gr.Tab(label='Batch'):
         with gr.Row():
             with gr.Column(scale=1):
@@ -69,9 +65,25 @@ with gr.Blocks(head_paths="head.html") as demo:
     image.upload(
         fn=predict,
         inputs=[image],
-        outputs=[result_html, result_text],
+        outputs=[result_hide, result_hide2, result_loading],
         api_name=False,
+        js="""
+        (image) => {
+            window.m5Func.clear()
+            return image;
+        }
+        """,
+    ).success(
+        fn=None,
+        inputs=[result_hide, result_hide2],
+        js="""
+        (result, ignore) => {
+            window.m5Func.refresh(result, ignore)
+            return [result, ignore];
+        }
+        """,
     )
+
     run_button2.click(
         fn=predict_batch,
         inputs=[batch_file],
@@ -86,4 +98,4 @@ with gr.Blocks(head_paths="head.html") as demo:
     )
 
 if __name__ == "__main__":
-    demo.queue(max_size=20).launch()
+    demo.queue(max_size=20).launch()

checkIgnore.py

@@ -13,10 +13,12 @@ def load_ignore(file_path):
     return result_dict
 
 ignore1 = load_ignore('ignoreTag.txt')
-ignore2 = load_ignore('ignoreTag2.txt')
+ignore_extra = load_ignore('ignoreTag2.txt')
+ignore2 = ignore1.copy()
+ignore2.update(ignore_extra)
 
 def is_ignore(tag, ignore_type):
     if ignore_type == 1:
-        return tag in ignore1 or tag in ignore2
+        return tag in ignore2
     elif ignore_type == 2:
         return tag in ignore1

createTagDom.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import annotations
-
-def create_tag_dom(label, ignore, prob):
-    result_html = ''
-    if ignore:
-        result_html += '<div class="m5dd_list">'
-    else:
-        result_html += '<div class="m5dd_list use">'
-    result_html += '<span class="add action">➕</span>'
-    result_html += '<span class="dec action">➖</span>'
-    result_html += '<span class="label action">' + str(label) + '</span>'
-    result_html += '<span class="prob">' + str(round(prob, 3)) + '</span>'
-    result_html += '<span class="up action">🔼</span>'
-    result_html += '<span class="down action">🔽</span>'
-    result_html += '<a class="wiki action" href="https://danbooru.donmai.us/wiki_pages/' + label + '" target="_blank">📙</a>'
-    result_html += '</div>'
-
-    return result_html

head.html

@@ -1,2 +1,2 @@
 <link rel="stylesheet" href="https://cdn.miaowm5.com/neet/deepdanbooru/styles.css" />
-<script src="https://cdn.miaowm5.com/neet/deepdanbooru/scripts.js" defer></script>
+<script src="https://cdn.miaowm5.com/neet/deepdanbooru/scripts.js?2601211925"></script>

requirements.txt

@@ -1,4 +1,4 @@
-pillow==10.2.0
-tensorflow==2.15.0.post1
-onnxruntime>=1.12.0
+pillow
+tensorflow
+onnxruntime
 huggingface-hub