Skip to content

Commit d5d5e87

Browse files
committed
feat(Application): Application can configure specified model
1 parent c53ac8f commit d5d5e87

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

backend/apps/system/api/aimodel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,4 +359,4 @@ async def get_model_by_ws(
359359
session: SessionDep,
360360
current_user: CurrentUser
361361
):
362-
return get_ai_model_list_by_workspace(session, current_user.oid)
362+
return get_ai_model_list_by_workspace(session, current_user.oid, False)

backend/apps/system/crud/aimodel_manage.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ async def async_model_info():
3131
SQLBotLogUtil.info("✅ 异步加密已有模型的密钥和地址完成")
3232

3333

34-
def get_ai_model_list_by_workspace(session: Session, workspace_id: int):
34+
def get_ai_model_list_by_workspace(session: Session, workspace_id: int, with_default: bool = True):
3535
sub_stmt = (
3636
select(AiModelWorkspaceMapping.ai_model_id)
3737
.where(AiModelWorkspaceMapping.workspace_id == workspace_id)
3838
.distinct()
3939
)
4040

4141
# 查询:关联的模型 + default_model 为 True 的模型,默认模型排第一
42+
base_condition = AiModelDetail.id.in_(sub_stmt)
43+
if with_default:
44+
where_condition = or_(base_condition, AiModelDetail.default_model == True)
45+
else:
46+
where_condition = base_condition
4247
stmt = (
4348
select(
4449
AiModelDetail.id,
4550
AiModelDetail.name,
4651
AiModelDetail.default_model,
4752
AiModelDetail.supplier,
4853
)
49-
.where(
50-
or_(
51-
AiModelDetail.id.in_(sub_stmt),
52-
AiModelDetail.default_model == True,
53-
)
54-
)
54+
.where(where_condition)
5555
.order_by(AiModelDetail.default_model.desc())
5656
)
5757
rows = session.exec(stmt).all()

0 commit comments

Comments
 (0)