fix(gate): _gate_plan按(请求能力,模型能力)对规划门禁——显式t2i选中i2i或自动选型落到i2i且无媒体→t2i契约代码表判定;带媒体=真i2i走LLM层;修自动选型路径cap_req空不换算致LLM按i2i契约误拦(2026-09-08实测)

This commit is contained in:
ymq 2026-09-08 17:26:46 +08:00
parent 1fce2ceb03
commit 0702640aba

View File

@ -91,30 +91,45 @@ def _biz_media(biz, key):
return bool(str(v or "").strip())
def _degrade_gate_cap(cap, biz):
"""能力降级门禁换算2026-09-08i2i→t2i / r2v→t2v
def _gate_plan(cap_req, cap_model, biz):
"""能力降级门禁规划2026-09-08i2i→t2i / r2v→t2v
选中模型能力是降级源i2i/r2v但调用没带该能力必需的媒体输入时
说明任务实际是请求能力t2i/t2v形态门禁按请求能力契约校验
只要 task 描述否则 i2i 模型承接文生图任务会被缺输入图误拦
带了媒体输入 = i2i/r2v 用法契约不变
cap_req = 调用方显式指定的能力 = 自动选型请求能力未知
返回 (gate_cap, use_code_table)
- 显式请求且 CAP_DEGRADE[cap_req]==cap_model t2i 选中 i2i 模型且未带
模型能力必需媒体 契约=请求能力代码表判定LLM/模型技能层会按模型
自身 i2i 契约误判实测 2026-09-08 拦截合法文生图任务
- 自动选型cap_req 且模型是降级源i2i/r2v且未带媒体 任务实为
t2i/t2v 形态契约=降级目标能力代码表判定
- 带媒体输入 i2i/r2v 用法契约=模型能力LLM
- 其余 契约=显式请求能力空则模型能力LLM
"""
try:
from pipeline_llm.selection import CAP_DEGRADE_SOURCE
from pipeline_llm.selection import CAP_DEGRADE, CAP_DEGRADE_SOURCE
except ImportError:
return cap
src = CAP_DEGRADE_SOURCE.get((cap or "").strip().lower())
if not src:
return cap
for req in _CAP_REQUIRED.get(cap, ()):
if req == "task":
continue
if req == "any_media":
if not any(_biz_media(biz or {}, k) for k in _MEDIA_KEYS):
return src
elif not _biz_media(biz or {}, req):
return src
return cap
return (cap_req or cap_model or ''), False
cap_req = (cap_req or '').strip().lower()
cap_model = (cap_model or '').strip().lower()
def _no_media():
for req in _CAP_REQUIRED.get(cap_model, ()):
if req == 'task':
continue
if req == 'any_media':
if not any(_biz_media(biz or {}, k) for k in _MEDIA_KEYS):
return True
elif not _biz_media(biz or {}, req):
return True
return False
if cap_req:
if CAP_DEGRADE.get(cap_req) == cap_model and _no_media():
return cap_req, True
return cap_req, False
src = CAP_DEGRADE_SOURCE.get(cap_model)
if src and _no_media():
return src, True
return (cap_model or ''), False
def _check_completeness_code(capability, task, biz):
@ -381,12 +396,10 @@ async def tool_invoke_model(params, org_id, user_id=""):
# capability/description 未显式给出时按选中模型反查。
desc = ""
cap2, desc = await _resolve_capability(model, org_id)
cap = cap or cap2
# 能力降级门禁换算i2i/r2v 模型无媒体输入时按 t2i/t2v 契约校验
cap_gate = _degrade_gate_cap(cap, biz)
if cap_gate != (cap or "").strip().lower():
# 降级执行契约是确定性规则直接代码表判定——LLM/模型技能层会按
# 模型自身能力i2i 要源图)误判,实测 2026-09-08 拦截了合法文生图任务
cap_req = cap or cap2
# 能力降级门禁规划:(契约能力, 是否代码表判定)
cap_gate, use_code = _gate_plan(cap_req, cap2, biz)
if use_code:
gap = _check_completeness_code(cap_gate, task, biz)
else:
gap = await judge_completeness(model, cap_gate, task, biz,