Update app.py

app.py

@@ -2,97 +2,61 @@ import os, html
 import gradio as gr
 from openai import OpenAI
 
-# 读取 API Key：优先环境变量；没设置也允许传入文本框（更灵活）
-ENV_KEY = os.getenv("OPENAI_API_KEY", "").strip()
-DEFAULT_MODEL = os.getenv("MODEL_NAME", "gpt-4o-mini")
+# 直接读取环境变量里的 API Key
+API_KEY = os.getenv("OPENAI_API_KEY")
+MODEL_NAME = "gpt-4o-mini"
+
+client = OpenAI(api_key=API_KEY)
 
 SYSTEM_PROMPT = """You are a creative pet name generator.
 Given species, appearance and personality, propose concise, pronounceable names.
 Rules:
-- Return diverse styles; avoid offensive, brand, or trademarked terms.
-- Prefer 2–3 syllables; mix cute, cool, elegant, funny styles depending on user choice.
+- Return diverse styles; avoid offensive or trademarked terms.
+- Prefer 2–3 syllables; mix cute, cool, elegant, funny styles depending on input.
 - Provide a short meaning/explanation (≤12 words).
-- If language is Chinese/Japanese/Spanish, output in that language; add romanization when helpful.
-- Respect forbidden terms; avoid near-homophones of them.
+- If language is Chinese/Japanese/Spanish, output in that language, with romanization if helpful.
 - No numbers, no long phrases, no public-figure names.
 Output strictly as a clean Markdown list.
 """
 
-def build_user_prompt(species, look, personality, style, language, count, gender, length_pref, forbid):
-    species = (species or "").strip()
-    look = (look or "").strip()
-    personality = (personality or "").strip()
-    style = style or "mixed"
-    language = language or "English"
-    gender = gender or "any"
-    length_pref = length_pref or "medium"
-    forbid = (forbid or "").strip()
-
-    lines = [
-        f"Target language: {language}",
-        f"Species: {species}",
-        f"Appearance: {look}",
-        f"Personality: {personality}",
-        f"Style preference: {style}",
-        f"Desired length: {length_pref}",
-        f"Gender vibe: {gender}",
-        f"Forbidden terms (avoid, including near-homophones): {forbid or 'None'}",
-        f"Count: {count}",
-        "Format example:",
-        "- Nala — warm, agile; evokes amber fur (pinyin/romaji if non-Latin).",
-        "- Kumo（くも）— playful 'cloud'; soft & fluffy vibe.",
-    ]
-    return "\n".join(lines)
+def build_prompt(species, look, personality, language):
+    return f"""
+Target language: {language}
+Species: {species}
+Appearance: {look}
+Personality: {personality}
+Generate 10 creative pet names.
+Each line: "- Name — short meaning"
+"""
 
-def generate_names(api_key, model_name, species, look, personality, style, language, count, gender, length_pref, forbid):
-    key = (api_key or ENV_KEY).strip()
-    if not key:
-        return "❗请先填写 API Key（或在环境变量设置 OPENAI_API_KEY）。"
-    client = OpenAI(api_key=key)
+def generate_names(species, look, personality, language):
     try:
-        prompt = build_user_prompt(species, look, personality, style, language, count, gender, length_pref, forbid)
+        prompt = build_prompt(species, look, personality, language)
         resp = client.chat.completions.create(
-            model=(model_name or DEFAULT_MODEL),
-            temperature=0.75,
-            max_tokens=900,
+            model=MODEL_NAME,
+            temperature=0.7,
+            max_tokens=500,
             messages=[
                 {"role": "system", "content": SYSTEM_PROMPT},
                 {"role": "user", "content": prompt}
             ]
         )
-        content = resp.choices[0].message.content
-        # 轻度清洗，防止 Markdown 注入或空输出
-        return content or "（没有生成内容，请尝试调整参数）"
+        return resp.choices[0].message.content
     except Exception as e:
         return f"⚠️ 出错：{html.escape(str(e))}"
 
 with gr.Blocks(title="PetName Genie") as demo:
     gr.Markdown("## 🐾 PetName Genie｜宠物起名机\n输入宠物信息，一键生成名字 + 简短含义。")
 
-    with gr.Accordion("Advanced (可选) — API & 模型", open=False):
-        api_key = gr.Textbox(label="API Key（留空则用环境变量 OPENAI_API_KEY）", type="password", placeholder="sk-...")
-        model_name = gr.Textbox(label="模型名", value=DEFAULT_MODEL)
-
-    with gr.Row():
-        species = gr.Textbox(label="宠物种类", placeholder="例：金毛 / 英短 / 布偶猫 / 仓鼠 / 柯基")
-        gender = gr.Radio(["any","male-ish","female-ish"], value="any", label="性别气质")
-        style = gr.Radio(["mixed","cute","cool","elegant","funny","mythic"], value="mixed", label="风格")
-    look = gr.Textbox(label="外表特征", placeholder="例：橘色短毛，圆脸，大眼睛，白爪")
-    personality = gr.Textbox(label="性格特点", placeholder="例：粘人、爱玩、胆小、聪明")
-    with gr.Row():
-        language = gr.Radio(["English","中文","日本語","Español"], value="English", label="输出语言")
-        length_pref = gr.Radio(["short","medium","long"], value="medium", label="名字长度偏好")
-        count = gr.Slider(5, 20, value=12, step=1, label="生成数量")
-    forbid = gr.Textbox(label="需要避开的词（可选）", placeholder="例：小白, 旺财, Mimi")
+    species = gr.Textbox(label="宠物种类", placeholder="例：金毛 / 英短 / 仓鼠 / 鹦鹉")
+    look = gr.Textbox(label="外表特征", placeholder="例：橘色短毛，大眼睛，白爪")
+    personality = gr.Textbox(label="性格特点", placeholder="例：粘人、活泼、聪明")
+    language = gr.Radio(["English","中文","日本語","Español"], value="English", label="输出语言")
 
     btn = gr.Button("✨ 起名！")
     out = gr.Markdown()
 
-    btn.click(
-        generate_names,
-        inputs=[api_key, model_name, species, look, personality, style, language, count, gender, length_pref, forbid],
-        outputs=out
-    )
+    btn.click(generate_names, inputs=[species, look, personality, language], outputs=out)
 
 if __name__ == "__main__":
     demo.launch()