This commit is contained in:
yumoqing 2026-05-22 11:48:25 +08:00
parent 66ed700261
commit 2661ebbc77
2 changed files with 13 additions and 12 deletions

View File

@ -304,12 +304,13 @@ lc.name as catelogname
from llm a from llm a
,llm_api_map m ,llm_api_map m
,llmcatelog lc ,llmcatelog lc
,upapp c on a.upappid = c.id ,upapp c
,uapi e on c.apisetid = e.apisetid and m.apiname = e.name ,uapi e
,uapiio f on e.ioid = f.id ,uapiio f on e.ioid = f.id
where a.id = m.llmid where a.id = m.llmid
and a.upappid = c.id and a.upappid = c.id
and c.apisetid = e.apisetid and m.apiname = e.name and c.id = e.upappid
and m.apiname = e.name
and e.ioid = f.id and e.ioid = f.id
and a.id = ${llmid}$ and a.id = ${llmid}$
and a.expired_date > ${today}$ and a.expired_date > ${today}$
@ -320,7 +321,7 @@ and a.enabled_date <= ${today}$
sql += ' and m.llmcatelogid = ${catelogid}$ ' sql += ' and m.llmcatelogid = ${catelogid}$ '
ns['catelogid'] = catelogid ns['catelogid'] = catelogid
else: else:
sql += ' and a.llmcatelogid = lc.id ' sql += ' and m.isdefaultcatelog = lc.id '
recs = await sor.sqlExe(sql, ns.copy()) recs = await sor.sqlExe(sql, ns.copy())
if len(recs) > 0: if len(recs) > 0:
r = recs[0] r = recs[0]

View File

@ -13,47 +13,47 @@
"name": "id", "name": "id",
"type": "varchar(32)", "type": "varchar(32)",
"not_null": true, "not_null": true,
"comment": "主键ID" "title": "主键ID"
}, },
{ {
"name": "llmid", "name": "llmid",
"type": "varchar(32)", "type": "varchar(32)",
"not_null": true, "not_null": true,
"comment": "模型ID关联llm表" "title": "模型ID"
}, },
{ {
"name": "llmcatelogid", "name": "llmcatelogid",
"type": "varchar(32)", "type": "varchar(32)",
"not_null": true, "not_null": true,
"comment": "模型分类ID关联llmcatelog表" "title": "模型分类ID"
}, },
{ {
"name": "apiname", "name": "apiname",
"type": "varchar(100)", "type": "varchar(100)",
"not_null": true, "not_null": true,
"comment": "推理接口名称关联uapi表name字段" "title": "接口名称"
}, },
{ {
"name": "query_apiname", "name": "query_apiname",
"type": "varchar(100)", "type": "varchar(100)",
"comment": "异步任务结果查询接口名称,可逗号分隔多个" "title": "任务结果查询接口名称"
}, },
{ {
"name": "query_period", "name": "query_period",
"type": "bigint", "type": "bigint",
"default": 30, "default": 30,
"comment": "异步任务查询轮询间隔默认30" "title": "任务查询间隔(秒)"
}, },
{ {
"name": "ppid", "name": "ppid",
"type": "varchar(32)", "type": "varchar(32)",
"comment": "计费程序ID关联pricing_program表" "title": "定价ID"
}, },
{ {
"name": "isdefaultcatelog", "name": "isdefaultcatelog",
"type": "varchar(1)", "type": "varchar(1)",
"not_null": true, "not_null": true,
"comment": "缺省分类" "title": "缺省分类"
} }
], ],
"indexes": [ "indexes": [