Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/apps/system/api/aimodel.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,4 +359,4 @@ async def get_model_by_ws(
session: SessionDep,
current_user: CurrentUser
):
return get_ai_model_list_by_workspace(session, current_user.oid)
return get_ai_model_list_by_workspace(session, current_user.oid, False)
14 changes: 7 additions & 7 deletions backend/apps/system/crud/aimodel_manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@ async def async_model_info():
SQLBotLogUtil.info("✅ 异步加密已有模型的密钥和地址完成")


def get_ai_model_list_by_workspace(session: Session, workspace_id: int):
def get_ai_model_list_by_workspace(session: Session, workspace_id: int, with_default: bool = True):
sub_stmt = (
select(AiModelWorkspaceMapping.ai_model_id)
.where(AiModelWorkspaceMapping.workspace_id == workspace_id)
.distinct()
)

# 查询:关联的模型 + default_model 为 True 的模型,默认模型排第一
base_condition = AiModelDetail.id.in_(sub_stmt)
if with_default:
where_condition = or_(base_condition, AiModelDetail.default_model == True)
else:
where_condition = base_condition
stmt = (
select(
AiModelDetail.id,
AiModelDetail.name,
AiModelDetail.default_model,
AiModelDetail.supplier,
)
.where(
or_(
AiModelDetail.id.in_(sub_stmt),
AiModelDetail.default_model == True,
)
)
.where(where_condition)
.order_by(AiModelDetail.default_model.desc())
)
rows = session.exec(stmt).all()
Expand Down
Loading