feat(接口4): 精简输出为固定6个英文字段,缩短提示词
- face_features.py:_PROMPT 只问6项特征(+有无人脸),analyze_features 只返回6个英文字段;无人脸返回 None(不再依赖 has_face 在外部判定) - gateway/app.py:无脸判定改为 feats is None,去掉 has_face import - app.py / docs / test_interface4.html:Swagger/文档/示例/测试页同步 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
+17
-30
@@ -18,7 +18,7 @@ logger = logging.getLogger("hair.worker")
|
||||
ARK_BASE_URL = os.getenv("ARK_BASE_URL", "https://ark.cn-beijing.volces.com/api/v3")
|
||||
ARK_MODEL = os.getenv("ARK_MODEL", "doubao-seed-1-6-vision-250815")
|
||||
|
||||
# doubao 中文键 → 接口4 英文优先字段
|
||||
# doubao 中文键 → 接口4 英文优先字段(仅保留这 6 项)
|
||||
_KEY_MAP = {
|
||||
"脸型": "face_shape",
|
||||
"眉形": "eyebrow_shape",
|
||||
@@ -28,27 +28,13 @@ _KEY_MAP = {
|
||||
"基因风格": "gene_style",
|
||||
}
|
||||
|
||||
# 移植自 fuyan FaceArk.GetPicDesc 的特征枚举(去掉身高体重前缀)
|
||||
# 仅请求接口4 需要的 6 个字段(+「图片是否有人脸」用于 1001 判定,不进最终输出)
|
||||
_PROMPT = (
|
||||
"分析一下图片告诉我以下特征,只要答案,格式为json字符串,"
|
||||
"图片是否有人脸(有人/没人) 三庭五眼特征(答案要有三庭五眼四个字,9个字以内) "
|
||||
"面部年龄(给出区间年龄)鼻长(鼻长适中/长鼻/短鼻) "
|
||||
"脸型(圆形脸/心形脸/菱形脸/鹅蛋脸/方形脸/长形脸/瓜子脸) 嘴型 "
|
||||
"眼袋(答案要有眼袋两个个字) 眼型 鼻型 眼皮(双眼皮/单眼皮) "
|
||||
"法令纹(有法令纹/无法令纹) 人中(人中适中/人中长/人中短) 眉形 "
|
||||
"瞳色(答案要有瞳色两个字) 脖长(脖长适中/脖子短/脖子长) "
|
||||
"肤色(粉一白/粉二白/粉三白/黄一白/黄二白/黄黑皮)"
|
||||
"直得分 曲得分 直曲总分(直得分-曲得分) 大量感得分 小量感得分 量感总分(大量感得分-小量感得) "
|
||||
"面部立体度(总分十分)瞳距(毫米)对比度(对比度较强/对比度适中/对比度较弱)"
|
||||
"鼻子立体度(立体度高/立体度适中/立体度低)"
|
||||
"色相(中间表示0,最大值分别是-5和5,负数表示偏冷,正数表示偏暖)"
|
||||
"亮度(中间表示0,最大值分别是-5和5;负数表示暗沉,正数表示白皙)"
|
||||
"色度(中间表示0,最大值分别是-5和5;负数表示饱和度低,正数表示鲜艳)"
|
||||
"面部颜色对比度(10分制)"
|
||||
"四季色彩季型(净春型/暖春型/浅春型/浅夏型/冷夏型/柔夏型/柔秋型/暖秋型/深秋型/净冬型/冷冬型/深冬型)"
|
||||
"图片是否有人脸(有人/没人) "
|
||||
"脸型(圆形脸/心形脸/菱形脸/鹅蛋脸/方形脸/长形脸/瓜子脸) 眉形 "
|
||||
"面部年龄(给出区间年龄) 动静类型(静态型/动态型) 性别(男/女) "
|
||||
"基因风格(戏剧型/睿智型/自然型/古典型/优雅型/浪漫型/前卫型/少女型/少年型)"
|
||||
"量感类型(大量感/中量感/小量感)轮廓类型(轮廓偏曲/轮廓适中/轮廓偏直)"
|
||||
"动静类型(静态型/动态型)性别(男/女)"
|
||||
)
|
||||
|
||||
_client = None
|
||||
@@ -102,11 +88,11 @@ def _image_to_url(image_bytes: bytes = None, image_url: str = None) -> str:
|
||||
return f"data:image/{fmt};base64," + base64.b64encode(image_bytes).decode()
|
||||
|
||||
|
||||
def analyze_features(image_bytes: bytes = None, image_url: str = None) -> dict:
|
||||
def analyze_features(image_bytes: bytes = None, image_url: str = None):
|
||||
"""调 doubao 视觉模型分析人脸特征。
|
||||
|
||||
Returns: dict —— 含接口4 英文优先字段(face_shape 等) + doubao 全部中文字段。
|
||||
无人脸时 doubao 的「图片是否有人脸」= 没人,调用方据此可判 1001。
|
||||
Returns: dict —— 仅含接口4 的 6 个英文字段(face_shape/eyebrow_shape/facial_age/
|
||||
dynamic_static_type/gender/gene_style);**无人脸返回 None**(调用方据此判 1001)。
|
||||
"""
|
||||
url = _image_to_url(image_bytes, image_url)
|
||||
resp = get_client().chat.completions.create(
|
||||
@@ -120,12 +106,11 @@ def analyze_features(image_bytes: bytes = None, image_url: str = None) -> dict:
|
||||
}],
|
||||
)
|
||||
text = resp.choices[0].message.content
|
||||
data = _parse_json(text) # doubao 中文字段
|
||||
# 英文优先字段映射(doubao 缺某字段则跳过)
|
||||
for zh, en in _KEY_MAP.items():
|
||||
if zh in data and en not in data:
|
||||
data[en] = data[zh]
|
||||
return data
|
||||
raw = _parse_json(text) # doubao 原始中文字段
|
||||
if not has_face(raw):
|
||||
return None
|
||||
# 只保留 6 个英文字段(doubao 缺某字段则跳过)
|
||||
return {en: raw[zh] for zh, en in _KEY_MAP.items() if zh in raw}
|
||||
|
||||
|
||||
def has_face(features: dict) -> bool:
|
||||
@@ -139,5 +124,7 @@ if __name__ == "__main__":
|
||||
path = sys.argv[1] if len(sys.argv) > 1 else "tests/fixtures/frontal.jpg"
|
||||
with open(path, "rb") as f:
|
||||
feats = analyze_features(image_bytes=f.read())
|
||||
print("has_face:", has_face(feats))
|
||||
print(json.dumps(feats, ensure_ascii=False, indent=2))
|
||||
if feats is None:
|
||||
print("无人脸(1001)")
|
||||
else:
|
||||
print(json.dumps(feats, ensure_ascii=False, indent=2))
|
||||
|
||||
Reference in New Issue
Block a user