Update app.py

app.py

@@ -45,10 +45,6 @@ def get_species_list(furry_data, top_category, sub_category):
 # 3. 合并规则文本
 ##############################################################################
 def merge_transform_rules_into_prompt(rules_json):
-    """
-    将 transform_rules.json 中的相关字段转为统一文本，
-    供 system_prompt 里参考。
-    """
     if not rules_json:
         return "(No transform rules loaded)"
     
@@ -74,7 +70,6 @@ RULES_TEXT_FULL = merge_transform_rules_into_prompt(TRANSFORM_DICT)
 # 4. 强制替换：根据 override_conflicting_descriptors
 ##############################################################################
 
-# 前端选项 -> transform_rules.json 里的 override_conflicting_descriptors key
 transform_map = {
     "Trans_to_Male": "female_to_male",
     "Trans_to_Female": "male_to_female",
@@ -84,20 +79,15 @@ transform_map = {
 }
 
 def forced_replace(prompt, direction):
-    """
-    读取 transform_rules.json["override_conflicting_descriptors"][direction] 的键值，
-    用正则整词替换 prompt 中出现的 old->new。
-    """
     if not TRANSFORM_DICT:
         return prompt
 
     override_section = TRANSFORM_DICT.get("override_conflicting_descriptors", {})
     replacements = override_section.get(direction, {})
     if not replacements:
-        return prompt  # 该方向没有映射表，直接返回
+        return prompt
 
     for old, new in replacements.items():
-        # (?i)不分大小写, \b表示单词边界
         pattern = r"(?i)\b" + re.escape(old) + r"\b"
         prompt = re.sub(pattern, new, prompt)
     return prompt
@@ -106,15 +96,12 @@ def forced_replace(prompt, direction):
 # 5. 核心 GPT/DeepSeek 调用
 ##############################################################################
 def generate_transformed_output(prompt, gender_option, top_cat, sub_cat, species_item, api_mode, api_key):
-    """
-    最终在 GPT/DeepSeek 中生成 (tags)\n\n(description)。
-    """
     if not api_key:
         return "Error: No API Key provided."
 
     if api_mode == "GPT":
         base_url = None
-        model_name = "gpt-3.5-turbo"
+        model_name = "gpt-4o"
     else:
         base_url = "https://api.deepseek.com"
         model_name = "deepseek-chat"
@@ -123,14 +110,12 @@ def generate_transformed_output(prompt, gender_option, top_cat, sub_cat, species
     if base_url:
         client.base_url = base_url
 
-    # 如果用户选 Furry, 记录一下当前选到的物种路径
     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}\n"
     else:
         extra_line = ""
 
-    # 根据 user 选择加载 gender_rules.json 里的东西
     gender_specific_rule = ""
     if gender_option == "Trans_to_Male":
         gender_specific_rule = GENDER_RULES.get("male", "")
@@ -141,10 +126,9 @@ def generate_transformed_output(prompt, gender_option, top_cat, sub_cat, species
     elif gender_option == "Trans_to_Intersex":
         gender_specific_rule = GENDER_RULES.get("intersex", "")
 
-    # 组装 System Prompt
     system_prompt = f"""
 You are a creative assistant that transforms the user's base prompt 
-to reflect correct gender/furry transformations. Follow these references:
+to reflect correct gender/furry/genderless/intersex transformations. Follow these references:
 
 1) Detailed Transform Rules (transform_rules.json):
 {RULES_TEXT_FULL}
@@ -180,9 +164,6 @@ Instructions:
 # 6. 翻译函数
 ##############################################################################
 def translate_text(content, lang, api_mode, api_key):
-    """
-    后期翻译, 不更改上方生成逻辑.
-    """
     if not api_key:
         return "Error: No API Key provided."
     if not content.strip():
@@ -335,14 +316,16 @@ def build_interface():
             # 1) 找到 override_conflicting_descriptors 的方向
             direction = transform_map.get(gender, None)
             if direction:
-                # 先做强制替换
+                # 强制替换用户输入文本
                 prompt = forced_replace(prompt, direction)
 
-            # 2) 再执行原先逻辑
-            merged = generate_transformed_output(prompt, gender, tc, sc, spc, mode, key)
-            # 3) 翻译
-            trans = translate_text(merged, lang, mode, key)
-            return merged, trans
+            # 2) 提交到 GPT/DeepSeek 进行生成
+            merged_output = generate_transformed_output(prompt, gender, tc, sc, spc, mode, key)
+
+            # 3) 翻译生成的结果
+            translated_output = translate_text(merged_output, lang, mode, key)
+
+            return merged_output, translated_output
 
         user_prompt.submit(
             fn=on_generate,