Update app.py

app.py

@@ -171,7 +171,9 @@ def generate_transformed_output(prompt, gender_option, top_cat, sub_cat, species
 
     if gender_option == "Trans_to_Furry":
         furry_path = f"{top_cat} > {sub_cat} > {species_item}" if (top_cat and sub_cat and species_item) else "unknown"
-        extra_line = f"\nFurry chosen: {furry_path} anthro furry\n"
+        gender_desc = ", ".join([g.lower() for g in furry_gender]) if furry_gender else "neutral"
+        species_details = FURRY_DATA.get(top_cat, {}).get(sub_cat, {}).get(species_item, {}).get("Details", "")
+        extra_line = f"\nfurry {gender_desc} {furry_path} {species_details} anthro character\n"
     else:
         extra_line = ""
 
@@ -201,8 +203,9 @@ Instructions:
 - Only output two parts:
   1) One line of final tags in parentheses, e.g. (male, short hair, dynamic pose, ...)
   2) A blank line.
-  3) Then 3~6 sentences of imaginative scene description in English.
+  3) Then 2~5 sentences of imaginative scene description in English.
 - No extra lines, no headings, no 'gender:' or 'base_prompt:'.
+- No more than 990 tokens.
 - End of instructions.
 """.strip()
 
@@ -307,20 +310,28 @@ def build_interface():
                     visible=False
                 )
 
+                gender_selection_furry = gr.CheckboxGroup(
+                    label="Furry Gender Selection (选择Furry性别)",
+                    choices=["Male", "Female"],
+                    value=["Male"],  # 默认公
+                    visible=False  # 默认隐藏，仅在 Furry 选项时显示
+                )
                 def show_furry_options(opt):
                     if opt == "Trans_to_Furry":
                         return (gr.update(visible=True),
+                                gr.update(visible=True),
                                 gr.update(visible=True),
                                 gr.update(visible=True))
                     else:
                         return (gr.update(visible=False),
+                                gr.update(visible=False),
                                 gr.update(visible=False),
                                 gr.update(visible=False))
 
                 gender_option.change(
                     fn=show_furry_options,
                     inputs=[gender_option],
-                    outputs=[top_cat_dd, sub_cat_dd, species_dd]
+                    outputs=[gender_selection_furry, top_cat_dd, sub_cat_dd, species_dd]
                 )
 
                 def on_top_cat_select(selected):
@@ -370,7 +381,7 @@ def build_interface():
         ######################################################################
         # 生成
         ######################################################################
-        def on_generate(prompt, gender, tc, sc, spc, mode, key, lang):
+        def on_generate(prompt, gender, furry_gender, tc, sc, spc, mode, key, lang):
             # Step 1: 强制替换用户输入
             direction = transform_map.get(gender, None)
             if direction:
@@ -379,28 +390,43 @@ def build_interface():
             # Debug 替换后的 Prompt
             print(f"Debug Prompt After Replacement: {prompt}")
 
-            # Step 2: 提交到生成器
+            # Step 2: 如果是 Furry 类目，处理性别描述
+            if gender == "Trans_to_Furry":
+                furry_path = f"{tc} > {sc} > {spc}" if (tc and sc and spc) else "unknown"
+                species_details = FURRY_DATA.get(tc, {}).get(sc, {}).get(spc, {}).get("Details", "")
+                gender_description = ", ".join([g.lower() for g in furry_gender]) if furry_gender else "neutral"
+                prompt += f", Furry: {furry_path}, {gender_description}, {species_details}"  # 添加 Furry 类目路径
+
+                # 添加性别描述（如果选择了性别）
+                if furry_gender:
+                    gender_description = ", ".join([g.lower() for g in furry_gender])  # 转换为小写
+                    prompt += f", {gender_description}"  # 将性别描述附加到提示词
+            
+            # Debug 添加性别后的 Prompt
+            print(f"Debug Prompt with Furry Gender: {prompt}")
+
+            # Step 3: 提交到生成器
             merged_output = generate_transformed_output(prompt, gender, tc, sc, spc, mode, key)
 
             # Debug 生成器输出
             print(f"Debug Merged Output: {merged_output}")
 
-            # Step 3: 翻译生成的结果
+            # Step 4: 翻译生成的结果
             translated_output = translate_text(merged_output, lang, mode, key)
 
-            # Step 4: 返回结果
+            # Step 5: 返回结果
             return merged_output, translated_output
 
         user_prompt.submit(
             fn=on_generate,
-            inputs=[user_prompt, gender_option, top_cat_dd, sub_cat_dd, species_dd, api_mode, api_key, translate_lang],
+            inputs=[user_prompt, gender_option, gender_selection_furry, top_cat_dd, sub_cat_dd, species_dd, api_mode, api_key, translate_lang],
             outputs=[final_output, translated_text]
         )
 
         gen_btn = gr.Button("Generate")
         gen_btn.click(
             fn=on_generate,
-            inputs=[user_prompt, gender_option, top_cat_dd, sub_cat_dd, species_dd, api_mode, api_key, translate_lang],
+            inputs=[user_prompt, gender_option, gender_selection_furry, top_cat_dd, sub_cat_dd, species_dd, api_mode, api_key, translate_lang],
             outputs=[final_output, translated_text]
         )