Update app.py

app.py

@@ -9,7 +9,7 @@ from translator import translate_texts
 # ------------------------------------------------------------------
 # 模型配置
 # ------------------------------------------------------------------
-MODEL_REPO      = "SmilingWolf/wd-swinv2-tagger-v3"
+MODEL_REPO      = "SmilingWolf/wd-eva02-large-tagger-v3"
 MODEL_FILENAME  = "model.onnx"
 LABEL_FILENAME  = "selected_tags.csv"
 
@@ -101,65 +101,21 @@ custom_css = """
     padding: 2px 5px;
     border-radius: 3px;
     background-color: #fff;
-    cursor: pointer;
-    transition: background-color 0.2s;
 }
-.tag-item:hover {
-    background-color: #e8f4ff;
-}
-.tag-item:active {
-    background-color: #bde0ff;
-}
-.tag-content {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-    flex: 1;
-}
-.tag-text {
+.tag-en {
     font-weight: bold;
     color: #333;
 }
+.tag-zh {
+    color: #666;
+    margin-left: 10px;
+}
 .tag-score {
     color: #999;
     font-size: 0.9em;
 }
-.copy-container {
-    position: relative;
-    margin-bottom: 5px;
-}
-.copy-button {
-    position: absolute;
-    top: 5px;
-    right: 5px;
-    padding: 4px 8px;
-    font-size: 12px;
-    background-color: #f0f0f0;
-    border: 1px solid #ddd;
-    border-radius: 4px;
-    cursor: pointer;
-    transition: all 0.2s;
-}
-.copy-button:hover {
-    background-color: #e0e0e0;
-}
-.copy-button:active {
-    background-color: #d0d0d0;
-}
-.toast {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    padding: 10px 20px;
-    background-color: #4CAF50;
-    color: white;
-    border-radius: 4px;
-    opacity: 0;
-    transition: opacity 0.3s;
-    z-index: 1000;
-}
-.toast.show {
-    opacity: 1;
+.btn-container {
+    margin-top: 20px;
 }
 """
 
@@ -175,6 +131,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                                         label="通用标签阈值", info="越高→标签更少更准")
                 char_slider = gr.Slider(0, 1, 0.85,
                                         label="角色标签阈值", info="推荐保持较高阈值")
+                show_zh = gr.Checkbox(True, label="显示中文翻译")
                 
                 gr.Markdown("### 汇总设置")
                 with gr.Row():
@@ -183,6 +140,9 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                     sum_rating = gr.Checkbox(False, label="评分标签")
                 sum_sep = gr.Dropdown(["逗号", "换行", "空格"], value="逗号", label="分隔符")
 
+            btn = gr.Button("开始分析", variant="primary", elem_classes=["btn-container"])
+            processing_info = gr.Markdown("", visible=False)
+
         with gr.Column(scale=2):
             with gr.Tabs():
                 with gr.TabItem("🏷️ 通用标签"):
@@ -193,77 +153,35 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                     out_rating = gr.HTML(label="Rating Tags")
             
             gr.Markdown("### 标签汇总")
-            with gr.Row():
-                lang_btn = gr.Button("中/EN", variant="secondary", scale=0)
-                copy_btn = gr.Button("📋 复制", variant="secondary", scale=0)
-            
             out_summary = gr.Textbox(label="标签汇总", 
                                      placeholder="选择需要汇总的标签类别...",
-                                     lines=3,
-                                     interactive=False)
-            
-            with gr.Row():
-                processing_info = gr.Markdown("", visible=False)
-                btn = gr.Button("开始分析", variant="primary", scale=0)
-
-    # 存储状态的隐藏组件
-    lang_state = gr.State("en")  # 默认显示英文
-    tags_data = gr.State({})     # 存储标签数据
-    translations_data = gr.State({})  # 存储翻译数据
+                                     lines=3)
 
     # ----------------- 处理回调 -----------------
-    def format_tags_html(tags_dict, translations, category_key, current_lang):
+    def format_tags_html(tags_dict, translations, show_translation=True):
         """格式化标签为HTML格式"""
         if not tags_dict:
             return "<p>暂无标签</p>"
         
         html = '<div class="label-container">'
         for i, (tag, score) in enumerate(tags_dict.items()):
-            display_text = translations[i] if current_lang == "zh" and i < len(translations) else tag
-            tag_html = f'''
-            <div class="tag-item" onclick="copyToClipboard('{tag}', '{category_key}_{i}')">
-                <div class="tag-content">
-                    <span class="tag-text">{display_text}</span>
-                </div>
-                <span class="tag-score">{score:.3f}</span>
-            </div>
-            '''
+            tag_html = f'<div class="tag-item">'
+            tag_html += f'<div><span class="tag-en">{tag}</span>'
+            if show_translation and i < len(translations):
+                tag_html += f'<span class="tag-zh">({translations[i]})</span>'
+            tag_html += '</div>'
+            tag_html += f'<span class="tag-score">{score:.3f}</span>'
+            tag_html += '</div>'
             html += tag_html
         html += '</div>'
-        
-        # 添加复制函数的JavaScript
-        copy_script = '''
-        <script>
-        function copyToClipboard(text, itemId) {
-            navigator.clipboard.writeText(text).then(function() {
-                showToast('已复制: ' + text);
-            });
-        }
-        
-        function showToast(message) {
-            var toast = document.createElement('div');
-            toast.className = 'toast show';
-            toast.textContent = message;
-            document.body.appendChild(toast);
-            
-            setTimeout(function() {
-                toast.classList.remove('show');
-                setTimeout(function() {
-                    document.body.removeChild(toast);
-                }, 300);
-            }, 1500);
-        }
-        </script>
-        '''
-        
-        return html + copy_script
+        return html
 
-    def process(img, g_th, c_th, sum_gen, sum_char, sum_rat, sep_type, current_lang, prev_tags, prev_translations):
-        # 开始处理
+    def process(img, g_th, c_th, show_zh, sum_gen, sum_char, sum_rat, sep_type):
+        # 开始处理，返回更新
         yield (
             gr.update(interactive=False, value="处理中..."),
             gr.update(visible=True, value="🔄 正在分析图像..."),
-            "", "", "", "", current_lang, {}, {}
+            "", "", "", ""
         )
         
         try:
@@ -278,12 +196,15 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                 "ratings": list(res["ratings"].keys())
             }
             
-            for tags in tag_categories.values():
-                all_tags.extend(tags)
-            
-            # 批量翻译
-            if all_tags:
-                translations = translate_texts(all_tags, src_lang="auto", tgt_lang="zh")
+            if show_zh:
+                for tags in tag_categories.values():
+                    all_tags.extend(tags)
+                
+                # 批量翻译
+                if all_tags:
+                    translations = translate_texts(all_tags, src_lang="auto", tgt_lang="zh")
+                else:
+                    translations = []
             else:
                 translations = []
 
@@ -291,151 +212,70 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
             translations_dict = {}
             offset = 0
             for category, tags in tag_categories.items():
-                if tags:
+                if show_zh and tags:
                     translations_dict[category] = translations[offset:offset+len(tags)]
                     offset += len(tags)
                 else:
                     translations_dict[category] = []
 
             # 生成HTML输出
-            general_html = format_tags_html(res["general"], translations_dict["general"], "general", current_lang)
-            char_html = format_tags_html(res["characters"], translations_dict["characters"], "characters", current_lang)
-            rating_html = format_tags_html(res["ratings"], translations_dict["ratings"], "ratings", current_lang)
+            general_html = format_tags_html(res["general"], translations_dict["general"], show_zh)
+            char_html = format_tags_html(res["characters"], translations_dict["characters"], show_zh)
+            rating_html = format_tags_html(res["ratings"], translations_dict["ratings"], show_zh)
 
             # 生成汇总文本
-            summary_tags = []
+            summary_parts = []
             separators = {"逗号": ", ", "换行": "\n", "空格": " "}
             separator = separators[sep_type]
             
-            # 按顺序：角色、通用、评分
-            if sum_char and res["characters"]:
-                if current_lang == "zh" and translations_dict["characters"]:
-                    summary_tags.extend(translations_dict["characters"])
+            if sum_gen and res["general"]:
+                if show_zh and translations_dict["general"]:
+                    gen_tags = [f"{en}({zh})" for en, zh in zip(res["general"].keys(), translations_dict["general"])]
                 else:
-                    summary_tags.extend(list(res["characters"].keys()))
+                    gen_tags = list(res["general"].keys())
+                summary_parts.append("通用标签: " + separator.join(gen_tags))
             
-            if sum_gen and res["general"]:
-                if current_lang == "zh" and translations_dict["general"]:
-                    summary_tags.extend(translations_dict["general"])
+            if sum_char and res["characters"]:
+                if show_zh and translations_dict["characters"]:
+                    char_tags = [f"{en}({zh})" for en, zh in zip(res["characters"].keys(), translations_dict["characters"])]
                 else:
-                    summary_tags.extend(list(res["general"].keys()))
+                    char_tags = list(res["characters"].keys())
+                summary_parts.append("角色标签: " + separator.join(char_tags))
             
             if sum_rat and res["ratings"]:
-                if current_lang == "zh" and translations_dict["ratings"]:
-                    summary_tags.extend(translations_dict["ratings"])
+                if show_zh and translations_dict["ratings"]:
+                    rat_tags = [f"{en}({zh})" for en, zh in zip(res["ratings"].keys(), translations_dict["ratings"])]
                 else:
-                    summary_tags.extend(list(res["ratings"].keys()))
+                    rat_tags = list(res["ratings"].keys())
+                summary_parts.append("评分标签: " + separator.join(rat_tags))
             
-            summary_text = separator.join(summary_tags) if summary_tags else "请选择要汇总的标签类别"
+            summary_text = "\n\n".join(summary_parts) if summary_parts else "请选择要汇总的标签类别"
 
-            # 完成处理
+            # 完成处理，返回最终结果
             yield (
                 gr.update(interactive=True, value="开始分析"),
                 gr.update(visible=False),
                 general_html,
                 char_html,
                 rating_html,
-                summary_text,
-                current_lang,
-                res,
-                translations_dict
+                summary_text
             )
             
         except Exception as e:
-            # 出错处理
+            # 出错时的处理
             yield (
                 gr.update(interactive=True, value="开始分析"),
                 gr.update(visible=True, value=f"❌ 处理失败: {str(e)}"),
-                "", "", "", "", current_lang, {}, {}
+                "", "", "", ""
             )
 
-    def toggle_language(current_lang, tags, translations):
-        """切换语言显示"""
-        new_lang = "zh" if current_lang == "en" else "en"
-        
-        # 重新生成HTML
-        general_html = format_tags_html(tags.get("general", {}), translations.get("general", []), "general", new_lang)
-        char_html = format_tags_html(tags.get("characters", {}), translations.get("characters", []), "characters", new_lang)
-        rating_html = format_tags_html(tags.get("ratings", {}), translations.get("ratings", []), "ratings", new_lang)
-        
-        # 更新汇总文本
-        current_summary = out_summary.value if hasattr(out_summary, 'value') else ""
-        if current_summary and current_summary != "请选择要汇总的标签类别":
-            # 需要重新生成汇总文本
-            summary_tags = []
-            separator = ", "  # 这里简化，实际应该记住用户选择的分隔符
-            
-            # 检查选择的类别并生成汇总
-            # 注意：这里只是示例，实际需要传入选择状态
-            for category, category_tags in tags.items():
-                if category_tags:
-                    if new_lang == "zh" and translations.get(category):
-                        summary_tags.extend(translations[category])
-                    else:
-                        summary_tags.extend(list(category_tags.keys()))
-            
-            summary_text = separator.join(summary_tags) if summary_tags else current_summary
-        else:
-            summary_text = current_summary
-        
-        return (
-            new_lang,
-            general_html,
-            char_html,
-            rating_html,
-            summary_text
-        )
-
-    def copy_summary(text):
-        """提示复制汇总文本"""
-        # 使用JavaScript来复制文本
-        copy_js = f'''
-        <script>
-        navigator.clipboard.writeText(`{text}`).then(function() {{
-            showCopyToast('标签已复制到剪贴板');
-        }});
-        
-        function showCopyToast(message) {{
-            var toast = document.createElement('div');
-            toast.className = 'toast show';
-            toast.textContent = message;
-            toast.style.position = 'fixed';
-            toast.style.top = '20px';
-            toast.style.right = '20px';
-            toast.style.padding = '10px 20px';
-            toast.style.backgroundColor = '#4CAF50';
-            toast.style.color = 'white';
-            toast.style.borderRadius = '4px';
-            toast.style.zIndex = '1000';
-            document.body.appendChild(toast);
-            
-            setTimeout(function() {{
-                toast.remove();
-            }}, 1500);
-        }}
-        </script>
-        '''
-        return gr.update(value=copy_js)
-
     # 绑定事件
     btn.click(
         process,
-        inputs=[img_in, gen_slider, char_slider, sum_general, sum_char, sum_rating, sum_sep, lang_state, tags_data, translations_data],
-        outputs=[btn, processing_info, out_general, out_char, out_rating, out_summary, lang_state, tags_data, translations_data],
+        inputs=[img_in, gen_slider, char_slider, show_zh, sum_general, sum_char, sum_rating, sum_sep],
+        outputs=[btn, processing_info, out_general, out_char, out_rating, out_summary],
         show_progress=True
     )
-    
-    lang_btn.click(
-        toggle_language,
-        inputs=[lang_state, tags_data, translations_data],
-        outputs=[lang_state, out_general, out_char, out_rating, out_summary]
-    )
-    
-    copy_btn.click(
-        copy_summary,
-        inputs=[out_summary],
-        outputs=[gr.HTML(visible=False)]
-    )
 
 # ------------------------------------------------------------------
 # 启动