Update app.py

app.py

@@ -1,45 +1,82 @@
-##############################################
-# app.py
-##############################################
 import os
-import requests
 import gradio as gr
+import requests
 
-# 新版 openai>=1.0.0 引用方式
+# 从新版 openai>=1.0.0 库导入
 from openai import OpenAI
 
 ##############################################################################
-# 1. GPT 调用示例函数（新版 openai>=1.0.0）
+# 1. Furry 物种数据
 ##############################################################################
-def generate_natural_language_description_gpt(tags, api_key=None, base_url=None, model="gpt-4o"):
+furry_species_map = {
+    "CANIDS (Canines)": ["Dogs", "Wolves", "Foxes", "Jackals"],
+    "FELINES (Cats)": ["HouseCats", "Lions", "Tigers", "Cheetahs"],
+    "CUSTOM (Just An Example)": ["Dragons", "Werewolves", "Kitsune"],
+    # ... 这里你可以替换成更完整的物种分类，或保留最简
+}
+
+def flatten_species(map_dict):
     """
-    使用新版 openai>=1.0.0 库来调用 GPT。
-      1) from openai import OpenAI
-      2) client = OpenAI(api_key=...)
-      3) client.chat.completions.create(...)
+    将分门别类的物种字典展开成一个扁平列表，比如:
+    ["CANIDS (Canines) - Dogs", "CANIDS (Canines) - Wolves", ...]
     """
-    # 若没传入 api_key，就从环境变量获取
-    if not api_key:
-        api_key = os.getenv("OPENAI_API_KEY")
+    result = []
+    for category, species_list in map_dict.items():
+        for sp in species_list:
+            result.append(f"{category} - {sp}")
+    return sorted(result)
+
+ALL_FURRY_SPECIES = flatten_species(furry_species_map)
+
+##############################################################################
+# 2. 核心：调用 GPT 或 DeepSeek 生成描述 & 翻译
+##############################################################################
+def generate_transformed_prompt(prompt, gender_option, furry_species, api_mode, api_key):
+    """
+    1) 构造 tags（包括性别/物种）
+    2) 选择 GPT / DeepSeek 调用
+    3) 返回生成的描述
+    """
+    tags = {}
+    if gender_option == "Trans_to_Male":
+        tags["gender"] = "male"
+    elif gender_option == "Trans_to_Female":
+        tags["gender"] = "female"
+    elif gender_option == "Trans_to_Mannequin":
+        tags["gender"] = "genderless"
+    elif gender_option == "Trans_to_Intersex":
+        tags["gender"] = "intersex"
+    elif gender_option == "Trans_to_Furry":
+        tags["gender"] = "furry"
+        tags["furry_species"] = furry_species or "unknown"
+
+    tags["base_prompt"] = prompt
+
+    # 2. 根据选择调用 GPT / DeepSeek
+    if api_mode == "GPT":
+        # GPT
+        base_url = None
+        model_name = "gpt-3.5-turbo"  # 你可改成 "gpt-4" 等
+    else:
+        # DeepSeek
+        base_url = "https://api.deepseek.com"
+        model_name = "deepseek-chat"
+
+    # 创建客户端
     if not api_key:
-        return "Error: No GPT API Key provided."
+        return "Error: API Key not provided."
 
-    # 创建一个新的 OpenAI Client
     client = OpenAI(api_key=api_key)
-    
-    # 如果你有自定义 base_url（如代理/私有化部署），可在此设置
     if base_url:
         client.base_url = base_url
 
-    # 将 tags 拼出可读字符串
-    tag_descriptions = "\n".join([
-        f"{k}: {', '.join(v) if isinstance(v, list) else v}"
-        for k, v in tags.items() if v
-    ])
+    # 拼出文字供对话
+    tag_desc = "\n".join([f"{k}: {v}" for k, v in tags.items() if v])
 
     try:
-        chat_completion = client.chat.completions.create(
-            model=model,  # 例如 "gpt-4o", "gpt-4o-mini", "gpt-3.5-turbo" 等
+        # 发起 chat.completions.create()
+        response = client.chat.completions.create(
+            model=model_name,
             messages=[
                 {
                     "role": "system",
@@ -51,180 +88,70 @@ def generate_natural_language_description_gpt(tags, api_key=None, base_url=None,
                 },
                 {
                     "role": "user",
-                    "content": f"Here are the tags and details:\n{tag_descriptions}\nPlease generate a vivid, imaginative scene description.",
+                    "content": f"Here are the tags:\n{tag_desc}\nPlease generate a vivid, imaginative scene description.",
                 },
             ]
         )
-        # 新版库返回对象中，内容在 chat_completion.choices[0].message.content
-        return chat_completion.choices[0].message.content.strip()
+        return response.choices[0].message.content.strip()
     except Exception as e:
-        return f"GPT generation failed. Error: {e}"
+        return f"{api_mode} generation failed. Error: {e}"
 
-##############################################################################
-# 2. DeepSeek 调用示例函数（真实 HTTP 请求示例，需你修改）
-##############################################################################
-def generate_natural_language_description_deepseek(tags, api_key=None, base_url=None):
+
+def translate_prompt_text(text, target_language, api_mode, api_key):
     """
-    调用 DeepSeek API 获取描述。如果你不需要 DeepSeek，可删除此函数。
-    注意：此处示例的接口 URL、请求体和返回格式需要替换为真实 DeepSeek 文档内容。
+    调用 GPT / DeepSeek 做翻译，简化写法：同样只需改 model/base_url
     """
     if not api_key:
-        return "Error: No DeepSeek API Key provided."
+        return "Error: API Key not provided."
 
-    # 假设你的 DeepSeek 接口地址如下，请改为实际地址
-    url = base_url or "https://api.deepseek.com/v1/generate"
-
-    try:
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {api_key}"
-        }
-        payload = {
-            "tags": tags
-        }
-        resp = requests.post(url, json=payload, headers=headers, timeout=30)
-        if resp.status_code == 200:
-            data = resp.json()
-            # 根据你们的返回结构来取值
-            if data.get("success"):
-                return data["data"].get("description", "No description found.")
-            else:
-                return f"DeepSeek generation success=false. {data}"
-        else:
-            return f"DeepSeek generation failed. Status {resp.status_code}, {resp.text}"
-    except Exception as e:
-        return f"DeepSeek generation request error: {e}"
+    if not text.strip():
+        return ""
 
-##############################################################################
-# 3. GPT 翻译函数（新版 openai>=1.0.0）
-##############################################################################
-def translate_text_with_gpt(text, target_language, api_key=None, base_url=None, model="gpt-4o"):
-    if not api_key:
-        api_key = os.getenv("OPENAI_API_KEY")
-    if not api_key:
-        return "Error: No GPT Translation Key provided."
+    if api_mode == "GPT":
+        base_url = None
+        model_name = "gpt-3.5-turbo"
+    else:
+        base_url = "https://api.deepseek.com"
+        model_name = "deepseek-chat"
 
     client = OpenAI(api_key=api_key)
     if base_url:
         client.base_url = base_url
 
     try:
-        # Prompt: 让 GPT 扮演翻译
         system_prompt = f"You are a professional translator. Translate the following text to {target_language}:"
-        chat_completion = client.chat.completions.create(
-            model=model,
+        resp = client.chat.completions.create(
+            model=model_name,
             messages=[
                 {"role": "system", "content": system_prompt},
                 {"role": "user",   "content": text},
             ]
         )
-        return chat_completion.choices[0].message.content.strip()
-    except Exception as e:
-        return f"GPT translation failed. Error: {e}"
-
-##############################################################################
-# 4. DeepSeek 翻译函数（需你修改为真实接口）
-##############################################################################
-def translate_text_with_deepseek(text, target_language, api_key=None, base_url=None):
-    if not api_key:
-        return "Error: No DeepSeek Translation Key provided."
-
-    # 假设 DeepSeek 翻译接口如下，请改为实际
-    url = base_url or "https://api.deepseek.com/v1/translate"
-
-    try:
-        headers = {
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {api_key}"
-        }
-        payload = {
-            "text": text,
-            "target_language": target_language
-        }
-        resp = requests.post(url, json=payload, headers=headers, timeout=30)
-        if resp.status_code == 200:
-            data = resp.json()
-            if data.get("success"):
-                return data["data"].get("translated_text", "No translated_text found.")
-            else:
-                return f"DeepSeek translation success=false. {data}"
-        else:
-            return f"DeepSeek translation failed. Status {resp.status_code}, {resp.text}"
+        return resp.choices[0].message.content.strip()
     except Exception as e:
-        return f"DeepSeek translation request error: {e}"
-
-##############################################################################
-# 5. 根据用户选择进行提示词转换并调用 GPT/DeepSeek 生成描述
-##############################################################################
-def transform_prompt(prompt, gender_option, furry_species, api_mode, api_key):
-    """
-    示例转换逻辑：将 prompt 结合 gender/furry 信息组成 tags，然后调用指定 API。
-    你可以在此处扩充更复杂的处理逻辑。
-    """
-    tags = {}
-    
-    # 性别 / 物种 设定
-    if gender_option == "Trans_to_Male":
-        tags["gender"] = "male"
-    elif gender_option == "Trans_to_Female":
-        tags["gender"] = "female"
-    elif gender_option == "Trans_to_Mannequin":
-        tags["gender"] = "genderless"
-    elif gender_option == "Trans_to_Intersex":
-        tags["gender"] = "intersex"
-    elif gender_option == "Trans_to_Furry":
-        tags["gender"] = "furry"
-        tags["furry_species"] = furry_species or "unknown"
-    
-    # 原始 prompt
-    tags["base_prompt"] = prompt
-
-    # 调用对应 API
-    if api_mode == "GPT":
-        scene_description = generate_natural_language_description_gpt(tags, api_key)
-    else:  # DeepSeek
-        scene_description = generate_natural_language_description_deepseek(tags, api_key)
-    
-    return scene_description
+        return f"{api_mode} translation failed. Error: {e}"
 
 ##############################################################################
-# 6. 翻译逻辑：看用户选择，用 GPT 或 DeepSeek 做翻译
+# 3. Gradio 界面
 ##############################################################################
-def do_translation(scene_desc, translate_language, api_mode, api_key):
-    if not scene_desc.strip():
-        return ""
-    if api_mode == "GPT":
-        return translate_text_with_gpt(scene_desc, translate_language, api_key)
-    else:
-        return translate_text_with_deepseek(scene_desc, translate_language, api_key)
-
-##############################################################################
-# 7. 搭建 Gradio 界面
-##############################################################################
-def build_interface():
+def build_app():
     with gr.Blocks() as demo:
-
-        gr.Markdown("## Prompts_TransTool - 提示词一键性别物种转换器（openai>=1.0.0 版）")
+        gr.Markdown("## Prompt TransTool - GPT/DeepSeek 性别物种转换")
 
         with gr.Row():
             with gr.Column():
-                # 选择 API 服务（GPT / DeepSeek）
                 api_mode = gr.Radio(
-                    label="选择 API 服务 (Choose API Service)",
+                    label="选择 API（GPT / DeepSeek）",
                     choices=["GPT", "DeepSeek"],
-                    value="GPT"
+                    value="GPT",
                 )
-
-                # 输入 API Key
                 api_key = gr.Textbox(
                     label="API 密钥 (API Key)",
                     type="password",
-                    placeholder="在此输入 GPT 或 DeepSeek 的 API 密钥"
+                    placeholder="请输入 GPT 或 DeepSeek 的 API 密钥"
                 )
-
-                # 性别 / Furry 选项
                 gender_option = gr.Radio(
-                    label="性别 / Furry 选项",
+                    label="转换目标 (Gender / Furry)",
                     choices=[
                         "Trans_to_Male",
                         "Trans_to_Female",
@@ -234,94 +161,60 @@ def build_interface():
                     ],
                     value="Trans_to_Male",
                 )
-
-                # 如果是 Furry，显示可选物种
-                furry_species = gr.Dropdown(
+                furry_species_box = gr.Dropdown(
                     label="Furry 物种 (Furry Species)",
-                    choices=["Wolf", "Fox", "Tiger", "Lion"],
+                    choices=ALL_FURRY_SPECIES,
                     value=None,
                     visible=False
                 )
-
-                def show_furry_species(gender):
-                    return gr.update(visible=(gender == "Trans_to_Furry"))
-                gender_option.change(
-                    fn=show_furry_species,
-                    inputs=[gender_option],
-                    outputs=[furry_species]
-                )
+                def show_furry_spec(g):
+                    return gr.update(visible=(g == "Trans_to_Furry"))
+                gender_option.change(show_furry_spec, inputs=[gender_option], outputs=[furry_species_box])
 
             with gr.Column():
-                # 用户输入 prompt
-                user_prompt = gr.Textbox(
+                prompt_input = gr.Textbox(
                     label="提示词 (Prompt)",
                     lines=5,
-                    placeholder=(
-                        "示例：一位穿着红色连衣裙的少女，坐在落日余晖下的草地上..."
-                    )
+                    placeholder="示例：一位穿红色连衣裙的少女在花园中..."
                 )
-
-                # 转换后输出
-                generated_output = gr.Textbox(
-                    label="转换后的提示词 (Generated Trans-Description)",
-                    lines=7
+                gen_output = gr.Textbox(
+                    label="转换后 (Transformed Prompt)",
+                    lines=6
                 )
 
+        # 翻译
         with gr.Row():
-            # 翻译语言
             translate_language = gr.Dropdown(
                 label="翻译语言 (Translation Language)",
-                choices=[
-                    "English", "Chinese", "Japanese", "French", "German", 
-                    "Dutch", "Arabic", "Russian", "Persian", "Italian"
-                ],
+                choices=["English", "Chinese", "Japanese", "French", "German", "Spanish"],
                 value="English",
             )
-            # 翻译结果
-            translated_text = gr.Textbox(
-                label="翻译结果 (Translated Result)",
-                lines=7
+            translate_output = gr.Textbox(
+                label="翻译结果 (Translation Result)",
+                lines=6
             )
 
-        ############################################################################
-        # 事件逻辑
-        ############################################################################
-        # 1) 生成并翻译
         def on_generate(prompt, gender, furry, mode, key, lang):
-            trans_desc = transform_prompt(prompt, gender, furry, mode, key)
-            trans_result = do_translation(trans_desc, lang, mode, key)
-            return trans_desc, trans_result
+            # 1) 生成转换后提示词
+            transformed = generate_transformed_prompt(prompt, gender, furry, mode, key)
+            # 2) 翻译
+            translated = translate_prompt_text(transformed, lang, mode, key)
+            return transformed, translated
 
-        # 回车提交
-        user_prompt.submit(
+        prompt_input.submit(
             fn=on_generate,
-            inputs=[user_prompt, gender_option, furry_species, api_mode, api_key, translate_language],
-            outputs=[generated_output, translated_text],
+            inputs=[prompt_input, gender_option, furry_species_box, api_mode, api_key, translate_language],
+            outputs=[gen_output, translate_output],
         )
-
-        # 按钮点击
-        generate_button = gr.Button("生成 / Generate")
-        generate_button.click(
+        btn = gr.Button("生成 / Generate")
+        btn.click(
             fn=on_generate,
-            inputs=[user_prompt, gender_option, furry_species, api_mode, api_key, translate_language],
-            outputs=[generated_output, translated_text],
-        )
-
-        # 2) 语言切换再翻译
-        def on_translate(scene_desc, lang, mode, key):
-            return do_translation(scene_desc, lang, mode, key)
-
-        translate_language.change(
-            fn=on_translate,
-            inputs=[generated_output, translate_language, api_mode, api_key],
-            outputs=[translated_text]
+            inputs=[prompt_input, gender_option, furry_species_box, api_mode, api_key, translate_language],
+            outputs=[gen_output, translate_output],
         )
 
     return demo
 
-##############################################################################
-# 主入口
-##############################################################################
 if __name__ == "__main__":
-    demo = build_interface()
+    demo = build_app()
     demo.launch()