Update app.py

app.py

@@ -90,6 +90,13 @@ def forced_replace(prompt, direction):
     for old, new in replacements.items():
         pattern = r"(?i)\b" + re.escape(old) + r"\b"
         prompt = re.sub(pattern, new, prompt)
+
+    # 针对复杂句子的补充替换
+    if direction == "female_to_male":
+        prompt = re.sub(r"\bshe\b", "he", prompt, flags=re.IGNORECASE)
+        prompt = re.sub(r"\bher\b", "his", prompt, flags=re.IGNORECASE)
+        prompt = re.sub(r"\bherself\b", "himself", prompt, flags=re.IGNORECASE)
+
     return prompt
 
 ##############################################################################
@@ -129,15 +136,14 @@ def generate_transformed_output(prompt, gender_option, top_cat, sub_cat, species
     system_prompt = f"""
 You are a creative assistant that transforms the user's base prompt 
 to reflect correct gender/furry/genderless/intersex transformations. Follow these references:
-
 1) Detailed Transform Rules (transform_rules.json):
 {RULES_TEXT_FULL}
-
 2) Additional short gender rules (gender_rules.json):
 {gender_specific_rule}
-
 {extra_line}
 Instructions:
+- Remove any female-specific terms if the target is male.
+- Ensure all gender-specific terms are replaced correctly based on the rules.
 - Original prompt tags: {prompt}
 - Convert them into NEW combined tags, removing or replacing conflicting ones.
 - Only output two parts:
@@ -313,18 +319,24 @@ def build_interface():
         # 生成
         ######################################################################
         def on_generate(prompt, gender, tc, sc, spc, mode, key, lang):
-            # 1) 找到 override_conflicting_descriptors 的方向
+            # Step 1: 强制替换用户输入
             direction = transform_map.get(gender, None)
             if direction:
-                # 强制替换用户输入文本
-                prompt = forced_replace(prompt, direction)
+                prompt = forced_replace(prompt, direction)  # 替换必须在生成之前
+
+            # Debug 替换后的 Prompt
+            print(f"Debug Prompt After Replacement: {prompt}")
 
-            # 2) 提交到 GPT/DeepSeek 进行生成
+            # Step 2: 提交到生成器
             merged_output = generate_transformed_output(prompt, gender, tc, sc, spc, mode, key)
 
-            # 3) 翻译生成的结果
+            # Debug 生成器输出
+            print(f"Debug Merged Output: {merged_output}")
+
+            # Step 3: 翻译生成的结果
             translated_output = translate_text(merged_output, lang, mode, key)
 
+            # Step 4: 返回结果
             return merged_output, translated_output
 
         user_prompt.submit(