feat: 修改模型提示词

server/services/generator.py

@@ -16,8 +16,8 @@ import httpx
 
 from config import get_settings
 from services import storage
-from services.prompt import build_prompt, build_context, type_name, wrap_prompt_for_gpt_edits
-from services.tasks import Task, TaskImage, TASK_FAILED, TASK_RUNNING, TASK_DONE, TASK_PARTIAL, IMG_OK
+from services.prompts import build_prompt, build_context, type_name
+from services.tasks import Task, TaskImage, TASK_FAILED, TASK_RUNNING, TASK_DONE, TASK_PARTIAL, IMG_FAILED, IMG_OK
 
 log = logging.getLogger("suite.generator")
 
@@ -396,13 +396,11 @@ async def run_suite(task: Task) -> None:
             image = TaskImage(type_id=type_id, name=job.get("title") or type_name(type_id))
             task.images.append(image)
             try:
+                # 提示词按模型家族分发：国产主体参考 / gpt edits 保真 / google 主体保持
                 prompt = build_prompt(
-                    type_id, ctx, task.style_set, task.lang,
+                    provider_name, model, type_id, ctx, task.style_set, task.lang,
                     extra=job, style_prompt=task.style_prompt, requirements=task.requirements,
                 )
-                # gpt-image edits 语义：商品冻结契约前置（含商品文字锚定），防止风格词改商品
-                if provider_name == "rightapi":
-                    prompt = wrap_prompt_for_gpt_edits(prompt, ctx)
                 refs = _refs_for_job(list(task.ref_images or []), job)
                 data = await generator(prompt, refs, size=size, model=model)
                 # 部分中转不遵守 output_format（要 jpeg 回 PNG），按魔数定扩展名
@@ -413,6 +411,7 @@ async def run_suite(task: Task) -> None:
                 ok += 1
             except Exception as exc:  # noqa: BLE001
                 log.exception("套图 %s 类型 %s 生成失败", task.id, type_id)
+                image.status = IMG_FAILED  # 默认 pending，失败显式置 failed
                 image.error = str(exc)[:500]
                 failures.append(f"{job.get('title') or type_name(type_id)}：{str(exc)[:200]}")
                 failed += 1