Update app.py

app.py

@@ -102,18 +102,14 @@ class Tagger:
                 tag_categories_for_translation["character"].append(tag_name)
 
 
-        # Sort general tags by score
         res["general"] = dict(sorted(res["general"].items(), key=lambda kv: kv[1], reverse=True))
-        # Sort character tags by score (optional, but good for consistency)
         res["characters"] = dict(sorted(res["characters"].items(), key=lambda kv: kv[1], reverse=True))
-        # Ratings are usually fixed, but sorting doesn't hurt if order matters for display
         res["ratings"] = dict(sorted(res["ratings"].items(), key=lambda kv: kv[1], reverse=True))
 
 
-        # Re-populate tag_categories_for_translation based on sorted and filtered results
         tag_categories_for_translation["general"] = list(res["general"].keys())
         tag_categories_for_translation["characters"] = list(res["characters"].keys())
-        tag_categories_for_translation["ratings"] = list(res["ratings"].keys()) # Order from sorted res
+        tag_categories_for_translation["ratings"] = list(res["ratings"].keys())
 
         return res, tag_categories_for_translation
 
@@ -202,7 +198,6 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
     gr.Markdown("# 🖼️ AI 图像标签分析器")
     gr.Markdown("上传图片自动识别标签，支持中英文显示和一键复制。")
 
-    # State variables to store results for re-processing summary without re-running model
     state_res = gr.State({})
     state_translations_dict = gr.State({})
     state_tag_categories_for_translation = gr.State({})
@@ -255,7 +250,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
         
         html = '<div class="label-container">'
         
-        if not isinstance(translations_list, list): # defensive check
+        if not isinstance(translations_list, list):
             translations_list = []
 
         tag_keys = list(tags_dict.keys())
@@ -320,15 +315,15 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
     # ----------------- 主要处理回调 -----------------
     def process_image_and_generate_outputs(
         img, g_th, c_th, s_scores, # Main inputs
-        s_gen, s_char, s_rat, s_sep, s_zh_in_sum # Summary controls from UI
+        s_gen, s_char, s_rat, s_sep, s_zh_in_sum
         ):
         if img is None:
             yield (
                 gr.update(interactive=True, value="🚀 开始分析"),
                 gr.update(visible=True, value="❌ 请先上传图片。"),
-                "", "", "", "", # HTML outputs
-                gr.update(placeholder="请先上传图片并开始分析..."), # Summary text
-                {}, {}, {} # States
+                "", "", "", "",
+                gr.update(placeholder="请先上传图片并开始分析..."),
+                {}, {}, {} 
             )
             return
         
@@ -354,7 +349,6 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
         
         try:
             # 1. Predict tags
-            # The predict method now returns res and tag_categories_for_translation
             res, tag_categories_original_order = tagger_instance.predict(img, g_th, c_th)
 
             all_tags_to_translate = []
@@ -362,7 +356,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
                 all_tags_to_translate.extend(tag_categories_original_order.get(cat_key, []))
             
             all_translations_flat = []
-            if all_tags_to_translate: # Only call translate if there's something to translate
+            if all_tags_to_translate:
                 all_translations_flat = translate_texts(all_tags_to_translate, src_lang="auto", tgt_lang="zh")
             
             current_translations_dict = {}
@@ -382,19 +376,19 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
 
             summary_text = generate_summary_text_content(
                 res, current_translations_dict,
-                s_gen, s_char, s_rat, s_sep, s_zh_in_sum # Use summary specific checkbox for zh
+                s_gen, s_char, s_rat, s_sep, s_zh_in_sum 
             )
 
             yield (
                 gr.update(interactive=True, value="🚀 开始分析"),
-                gr.update(visible=True, value="✅ 分析完成!"), # Success message
+                gr.update(visible=True, value="✅ 分析完成!"), 
                 general_html,
                 char_html,
                 rating_html,
                 gr.update(value=summary_text),
-                res, # Store full results in state
-                current_translations_dict, # Store translations in state
-                tag_categories_original_order # Store original order for consistency if needed
+                res,
+                current_translations_dict,
+                tag_categories_original_order
             )
             
         except Exception as e:
@@ -404,17 +398,17 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标���分析器", css=cus
             yield (
                 gr.update(interactive=True, value="🚀 开始分析"),
                 gr.update(visible=True, value=f"❌ 处理失败: {str(e)}"),
-                "<p>处理出错</p>", "<p>处理出错</p>", "<p>处理出错</p>", # Clear HTML
-                gr.update(value=f"错误: {str(e)}", placeholder="分析失败..."), # Update summary
-                {}, {}, {} # Clear states
+                "<p>处理出错</p>", "<p>处理出错</p>", "<p>处理出错</p>",
+                gr.update(value=f"错误: {str(e)}", placeholder="分析失败..."),
+                {}, {}, {}
             )
 
     # ----------------- 更新汇总文本的回调 -----------------
     def update_summary_display(
-        s_gen, s_char, s_rat, s_sep, s_zh_in_sum, # UI controls for summary
-        current_res_from_state, current_translations_from_state # Data from state
+        s_gen, s_char, s_rat, s_sep, s_zh_in_sum,
+        current_res_from_state, current_translations_from_state
     ):
-        if not current_res_from_state: # No analysis done yet
+        if not current_res_from_state:
             return gr.update(placeholder="请先完成一次图像分析以生成汇总。", value="")
 
         new_summary_text = generate_summary_text_content(
@@ -428,7 +422,7 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
         process_image_and_generate_outputs,
         inputs=[
             img_in, gen_slider, char_slider, show_tag_scores,
-            sum_general, sum_char, sum_rating, sum_sep, sum_show_zh # Pass summary controls directly
+            sum_general, sum_char, sum_rating, sum_sep, sum_show_zh
         ],
         outputs=[
             btn, processing_info,
@@ -439,12 +433,11 @@ with gr.Blocks(theme=gr.themes.Soft(), title="AI 图像标签分析器", css=cus
         # show_progress="full" # Gradio's built-in progress
     )
 
-    # Bind summary update controls to the update_summary_display function
     summary_controls = [sum_general, sum_char, sum_rating, sum_sep, sum_show_zh]
     for ctrl in summary_controls:
         ctrl.change(
             fn=update_summary_display,
-            inputs=summary_controls + [state_res, state_translations_dict], # All controls + state data
+            inputs=summary_controls + [state_res, state_translations_dict],
             outputs=[out_summary],
             # show_progress=False # Typically fast, no need for progress indicator
         )