chore: 精简生发提示词，去掉磨皮/美颜要求

统一改为「填充遮罩区域的头发」，涉及后端默认值、ComfyUI 工作流 JSON、测试页、benchmark 脚本、local_test。 Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 15:57:57 +08:00
parent c536e4ccb1
commit 87ff2c15d0
22 changed files with 31 additions and 31 deletions
@@ -29,7 +29,7 @@
  "60": {
    "class_type": "JjkText",
    "inputs": {
-      "text": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"
+      "text": "填充遮罩区域的头发"
    }
  },
  "22": {
@@ -410,7 +410,7 @@
  },
  "60": {
    "inputs": {
-      "text": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"
+      "text": "填充遮罩区域的头发"
    },
    "class_type": "JjkText",
    "_meta": {
@@ -381,7 +381,7 @@
  },
  "60": {
    "inputs": {
-      "text": "补充遮罩内区域的头发，区域内填充满头发，不要保留皮肤，发际线下移填充头发。自然的头发生长方向，逼真的头发质感，自然发质。"
+      "text": "填充遮罩区域的头发"
    },
    "class_type": "JjkText",
    "_meta": {
@@ -684,7 +684,7 @@
  },
  "87": {
    "inputs": {
-      "text": "去掉头发接缝的黄色痕迹，头发完美融合，保持发型不变，发色不变。其他不变。",
+      "text": "填充遮罩区域的头发",
      "clip": [
        "78",
        0
@@ -736,7 +736,7 @@ async def hair_grow(
    hair_style: Optional[str] = Form(default=None, description="发型序号逗号分隔（必填），如 1,2,3。female:1-5 male:1-4"),
    beauty_enabled: bool = Form(default=False, description="是否开启美颜（本期不生效）"),
    use_mask: bool = Form(default=True, description="是否启用 inpaint 遮罩（测试对比用）。false 时用干净原图生成（空遮罩，不烧模板线）"),
-    prompt: str = Form(default="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜", description="ComfyUI 提示词，会替换工作流节点60的文本"),
+    prompt: str = Form(default="填充遮罩区域的头发", description="ComfyUI 提示词，会替换工作流节点60的文本"),
 ):
    # 1. gender 必填校验（非法/缺失 → 1004）
    if gender not in ("male", "female"):
@@ -848,7 +848,7 @@ async def hair_grow_b(
    marked_image_url: Optional[str] = Form(default=None, description="划线图片 URL"),
    marked_image_base64: Optional[str] = Form(default=None, description="划线图片 base64"),
    use_mask: bool = Form(default=True, description="是否画发际线（测试对比用）。false 时跳过划线检测、直接送划线图"),
-    prompt: str = Form(default="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜", description="ComfyUI 提示词，会替换工作流节点60的文本"),
+    prompt: str = Form(default="填充遮罩区域的头发", description="ComfyUI 提示词，会替换工作流节点60的文本"),
 ):
    """接口3 已屏蔽：调用直接返回错误，不再执行生发/ComfyUI 逻辑。
    保留路由（含原参数签名）避免老客户端裸 404，multipart 入参仍被接受但不处理。"""
@@ -1001,7 +1001,7 @@ async def hairline_generate(
    gender: Optional[str] = Form(default=None, description="性别 male/female（必填）"),
    hair_style: Optional[str] = Form(default=None, description="发型序号逗号分隔（必填，如 1,2,3）。female:1-5 male:1-4"),
    use_mask: bool = Form(default=True, description="生发是否启用 inpaint 遮罩（同接口2，测试对比用）"),
-    prompt: str = Form(default="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜", description="ComfyUI 提示词（同接口2），会替换工作流节点60的文本"),
+    prompt: str = Form(default="填充遮罩区域的头发", description="ComfyUI 提示词（同接口2），会替换工作流节点60的文本"),
    generate_grow_image: bool = Form(default=True, description="是否生成生发效果图（ComfyUI 生发，最耗时）。默认 true 出图；false 时跳过生发，各发型 grown_image 恒为 null，仅返回三档发际线叠图与中心点"),
 ):
    if gender not in ("male", "female"):
@@ -1395,7 +1395,7 @@ async def hairline_grow_v2(
    inpainting_fill: int = Form(default=1, description="change_hair服务端重绘填充：0=保留原图 | 1=噪声 | 2=纯色 | 3=潜变量。默认 1"),
    mask_blur: int = Form(default=11, description="change_hair服务端遮罩边缘模糊像素，默认 11"),
    mask_dilate_scale: float = Form(default=1.0, description="change_hair服务端遮罩膨胀缩放，默认 1.0"),
-    comfyui_prompt: Optional[str] = Form(default=None, description="Flux-2 重绘提示词，None 用默认「填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜」"),
+    comfyui_prompt: Optional[str] = Form(default=None, description="Flux-2 重绘提示词，None 用默认「填充遮罩区域的头发」"),
    beauty_alpha: float = Form(default=0.6, description="redraw_band 版 band 外的全脸美颜融入强度（0=band外无美颜纯用final，1≈整帧版），默认 0.6"),
    band_lo_mult: float = Form(default=0.5, description="重绘带外推倍率下限（相对 hairline_push_cm，内轮廓=0×、原外推线=1.0×），默认 0.5"),
    band_hi_mult: float = Form(default=1.5, description="重绘带外推倍率上限（相对 hairline_push_cm），默认 1.5"),
@@ -1561,7 +1561,7 @@ async def hairline_grow_v2_final_v2(
 async def api_redraw(
    image_file: UploadFile = File(..., description="人物图片（JPG/PNG）"),
    mask_file: UploadFile = File(..., description="遮罩图片（PNG，支持红/白/alpha 格式）"),
-    prompt: str = Form(default="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜",
+    prompt: str = Form(default="填充遮罩区域的头发",
                       description="ComfyUI 提示词"),
 ):
    image_bytes = await image_file.read()
@@ -58,7 +58,7 @@ def call_iface2(image_path, hair_style):
    with open(image_path, "rb") as f:
        img_data = f.read()
    fields = {"gender": "female", "hair_style": str(hair_style),
-              "prompt": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"}
+              "prompt": "填充遮罩区域的头发"}
    body, boundary = _multipart(
        fields, {"image_file": (os.path.basename(image_path), img_data, "image/jpeg")})
    req = urllib.request.Request(f"{API_BASE}/api/v1/hair/grow", data=body, method="POST")
@@ -56,7 +56,7 @@ def call_iface2_female(image_path, hair_style):
    with open(image_path, "rb") as f:
        img_data = f.read()
    fields = {"gender": "female", "hair_style": str(hair_style),
-              "prompt": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"}
+              "prompt": "填充遮罩区域的头发"}
    body, boundary = _multipart(
        fields, {"image_file": (os.path.basename(image_path), img_data, "image/jpeg")})
    req = urllib.request.Request(f"{API_BASE}/api/v1/hair/grow", data=body, method="POST")
@@ -89,7 +89,7 @@ def call_api2(image_path, gender, hair_style="1"):
    with open(image_path, "rb") as f:
        img_data = f.read()
    fields = {"gender": gender, "hair_style": hair_style, "use_mask": "0",
-              "prompt": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"}
+              "prompt": "填充遮罩区域的头发"}
    body, boundary = _multipart(fields, {"image_file": (os.path.basename(image_path), img_data, "image/jpeg")})
    req = urllib.request.Request(f"{API_BASE}/api/v1/hair/grow", data=body, method="POST")
    req.add_header("Content-Type", f"multipart/form-data; boundary={boundary}")
@@ -107,7 +107,7 @@ def call_api3(image_path):
    """接口3：B端生发（use_mask=False，直接送图）"""
    with open(image_path, "rb") as f:
        img_data = f.read()
-    fields = {"use_mask": "true", "prompt": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"}
+    fields = {"use_mask": "true", "prompt": "填充遮罩区域的头发"}
    body, boundary = _multipart(fields, {"marked_image_file": (os.path.basename(image_path), img_data, "image/jpeg")})
    req = urllib.request.Request(f"{API_BASE}/api/v1/hair/grow-b", data=body, method="POST")
    req.add_header("Content-Type", f"multipart/form-data; boundary={boundary}")
@@ -1107,7 +1107,7 @@ def generate_hairline_redraw(image_bgr, hairline_id, is_hr=False, seg_model="seg
        "hairline_id": hairline_id,
        "blend_method": blend_method,
        "hairline_push_cm": round(float(hairline_push_cm), 2),
-        "comfyui_prompt": comfyui_prompt or "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜",
+        "comfyui_prompt": comfyui_prompt or "填充遮罩区域的头发",
        "beauty_alpha": beauty_alpha,
        "px_per_cm": round(float(px_per_cm), 4),
        "mask_pixels": mask_viz["mask_pixels"],
@@ -410,7 +410,7 @@
  },
  "60": {
    "inputs": {
-      "text": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"
+      "text": "填充遮罩区域的头发"
    },
    "class_type": "JjkText",
    "_meta": {
@@ -16,7 +16,7 @@ from . import comfyui

 logger = logging.getLogger("hair.worker")

-_DEFAULT_PROMPT = "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"
+_DEFAULT_PROMPT = "填充遮罩区域的头发"
 _REPO = os.path.dirname(os.path.dirname(__file__))
 _REPAINT_WORKFLOW = os.path.join(_REPO, "0716add-hair-api.json")

@@ -62,7 +62,7 @@ def run_redraw(image_bytes: bytes, mask_bytes: bytes,
    Args:
        image_bytes: 人物图片字节（JPG/PNG）
        mask_bytes: 遮罩图片字节（支持红/白/alpha 遮罩格式）
-        prompt: 提示词，None 用默认 "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"
+        prompt: 提示词，None 用默认 "填充遮罩区域的头发"
        timeout: ComfyUI 超时秒数
        front: True 时任务插到 ComfyUI 队列最前（接口2 时延敏感路径用）

@@ -206,7 +206,7 @@ def generate():
            return jsonify({"error": msg}), 400
        image_file = request.files["image"]
        mask_file = request.files["mask"]
-        prompt_text = request.form.get("prompt", "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜")
+        prompt_text = request.form.get("prompt", "填充遮罩区域的头发")
        log.info(
            "收到请求: image=%s mask=%s prompt=%r",
            image_file.filename, mask_file.filename, prompt_text,
@@ -27,7 +27,7 @@ def prep_and_upload():


 def run_once(fname, model, dtype, steps):
-    wf = A.build_workflow(fname, "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜")
+    wf = A.build_workflow(fname, "填充遮罩区域的头发")
    wf["16"]["inputs"]["unet_name"] = model
    wf["16"]["inputs"]["weight_dtype"] = dtype
    wf["1"]["inputs"]["steps"] = steps
@@ -33,7 +33,7 @@ def upload(scale=1.0):


 def run(fname, steps):
-    wf = A.build_workflow(fname, "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜")
+    wf = A.build_workflow(fname, "填充遮罩区域的头发")
    wf["16"]["inputs"]["unet_name"] = MODEL
    wf["16"]["inputs"]["weight_dtype"] = DTYPE
    wf["1"]["inputs"]["steps"] = steps
@@ -30,7 +30,7 @@ SEED = 123456789
 imgs = []
 labels = []
 for steps in [2, 3, 4, 6]:
-    wf = A.build_workflow(fname, "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜", seed=SEED)
+    wf = A.build_workflow(fname, "填充遮罩区域的头发", seed=SEED)
    wf["16"]["inputs"]["unet_name"] = MODEL
    wf["16"]["inputs"]["weight_dtype"] = DTYPE
    wf["1"]["inputs"]["steps"] = steps
@@ -55,7 +55,7 @@ button { padding: 10px 24px; border: none; border-radius: 6px; cursor: pointer;
        </div>
        <div class="controls" style="margin-top:16px">
            <label>提示词:</label>
-            <input type="text" id="promptInput" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜">
+            <input type="text" id="promptInput" value="填充遮罩区域的头发">
        </div>
        <div style="text-align:center; margin-top:16px">
            <button class="btn-generate" id="generateBtn" disabled>🚀 生成</button>
@@ -25,7 +25,7 @@ resp = requests.post(
        "image": ("original.jpg", img_data, "image/jpeg"),
        "mask": ("mask.png", mask_data, "image/png"),
    },
-    data={"prompt": "填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜"},
+    data={"prompt": "填充遮罩区域的头发"},
    timeout=600,
 )

@@ -69,7 +69,7 @@
    </div>
    <div class="upload-row" style="margin-top:10px">
      <label style="font-size:13px;font-weight:600;white-space:nowrap">重绘提示词</label>
-      <input type="text" id="localTestPrompt" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜" style="flex:1;min-width:200px;padding:8px;border:1px solid #ddd;border-radius:8px">
+      <input type="text" id="localTestPrompt" value="填充遮罩区域的头发" style="flex:1;min-width:200px;padding:8px;border:1px solid #ddd;border-radius:8px">
    </div>
    <div class="upload-row" style="margin-top:10px">
      <label style="font-size:13px;font-weight:600;white-space:nowrap">X-Internal-Token</label>
@@ -354,7 +354,7 @@ function dataUriToBlob(dataUri) {

 async function runLocalRedraw() {
  if (!_finalDataUri || !_maskDataUri) { setStatus('缺少 final 或遮罩，请先生成', 'error'); return; }
-  const prompt = $('localTestPrompt').value.trim() || '填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜';
+  const prompt = $('localTestPrompt').value.trim() || '填充遮罩区域的头发';
  const btn = $('redrawBtn');
  btn.disabled = true; btn.textContent = '⏳ 重绘中...';
  flog('===== 调后端重绘 =====', 'info');
@@ -56,7 +56,7 @@
    </div>
    <div class="upload-row" style="margin-top:10px">
      <label style="font-size:13px;font-weight:600;white-space:nowrap">重绘提示词</label>
-      <input type="text" id="localTestPrompt" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜" style="flex:1;min-width:200px;padding:8px;border:1px solid #ddd;border-radius:8px">
+      <input type="text" id="localTestPrompt" value="填充遮罩区域的头发" style="flex:1;min-width:200px;padding:8px;border:1px solid #ddd;border-radius:8px">
    </div>
    <div class="params">
      <div class="pf">
@@ -169,7 +169,7 @@ async function submitTest() {

 async function runLocalRedraw() {
  if (!_finalDataUri || !_maskDataUri) { setStatus('缺少 final 或遮罩，请先生成', 'error'); return; }
-  const prompt = $('localTestPrompt').value.trim() || '填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜';
+  const prompt = $('localTestPrompt').value.trim() || '填充遮罩区域的头发';
  const btn = $('redrawBtn');
  btn.disabled = true; btn.textContent = '⏳ 重绘中...';

@@ -107,7 +107,7 @@
      <div class="hint">JPG/PNG &nbsp;|&nbsp; 生发图生成较慢（数十秒~数分钟），请耐心等待</div>
      <div style="margin-top:10px;display:flex;align-items:center;gap:8px">
        <label style="font-size:13px;font-weight:600;color:#374151;white-space:nowrap">💬 提示词</label>
-        <input type="text" id="promptInput" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜" style="flex:1;padding:8px 12px;border:1px solid #d1d5db;border-radius:6px;font-size:13px;max-width:500px">
+        <input type="text" id="promptInput" value="填充遮罩区域的头发" style="flex:1;padding:8px 12px;border:1px solid #d1d5db;border-radius:6px;font-size:13px;max-width:500px">
      </div>
      <div id="statusBar" class="status hidden"></div>
    </div>
@@ -94,7 +94,7 @@
      </div>
      <div class="upload-group" style="margin-top:14px">
        <div class="label">💬 提示词（prompt）</div>
-        <input type="text" id="promptInput" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜" style="width:100%;padding:8px 12px;border:1px solid #d1d5db;border-radius:8px;font-size:14px;max-width:500px">
+        <input type="text" id="promptInput" value="填充遮罩区域的头发" style="width:100%;padding:8px 12px;border:1px solid #d1d5db;border-radius:8px;font-size:14px;max-width:500px">
      </div>
      <div style="margin-top:14px;display:flex;gap:12px;align-items:center">
        <button class="btn btn-primary" id="submitBtn" onclick="submitTest()">🚀 提交</button>
@@ -104,7 +104,7 @@
      <div class="hint">JPG/PNG &nbsp;|&nbsp; 生发图生成较慢（数十秒~数分钟），请耐心等待 &nbsp;|&nbsp; 工作流: add_hair2.json</div>
      <div style="margin-top:10px;display:flex;align-items:center;gap:8px">
        <label style="font-size:13px;font-weight:600;color:#374151;white-space:nowrap">💬 提示词</label>
-        <input type="text" id="promptInput" value="填充遮罩区域的头发，皮肤加一点磨皮，再加一点美颜" style="flex:1;padding:8px 12px;border:1px solid #d1d5db;border-radius:6px;font-size:13px;max-width:500px">
+        <input type="text" id="promptInput" value="填充遮罩区域的头发" style="flex:1;padding:8px 12px;border:1px solid #d1d5db;border-radius:6px;font-size:13px;max-width:500px">
      </div>
      <div id="statusBar" class="status hidden"></div>
    </div>