zhuchaowe/maxkb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: model

Browse Source
This commit is contained in:
wxg0103 2025-06-26 14:14:52 +08:00
parent b08a1088a2
commit ac7e39fb18
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/models_provider/serializers/model_serializer.py
View File

@ -8,7 +8,7 @@ import uuid_utils.compat as uuid
from django.db.models import QuerySet from django.db.models import QuerySet
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from rest_framework import serializers from rest_framework import serializers
from django.db.models.query_utils import Q
from common.config.embedding_config import ModelManage from common.config.embedding_config import ModelManage
from common.database_model_manage.database_model_manage import DatabaseModelManage from common.database_model_manage.database_model_manage import DatabaseModelManage
from common.exception.app_exception import AppApiException from common.exception.app_exception import AppApiException
@ -413,16 +413,26 @@ class ModelSerializer(serializers.Serializer):
def get_authorized_tool(tool_query_set, workspace_id, model_workspace_authorization): def get_authorized_tool(tool_query_set, workspace_id, model_workspace_authorization):
# 对所有工作空间拉黑的工具
non_auths = QuerySet(model_workspace_authorization).filter(
Q(workspace_id='None') & Q(authentication_type='WHITE_LIST')
).values_list('model_id', flat=True)
# 授权给所有工作空间的工具
all_auths = QuerySet(model_workspace_authorization).filter(
Q(workspace_id='None') & Q(authentication_type='BLACK_LIST')
).values_list('model_id', flat=True)
# 查询白名单授权的工具
white_authorized_tool_ids = QuerySet(model_workspace_authorization).filter( white_authorized_tool_ids = QuerySet(model_workspace_authorization).filter(
workspace_id=workspace_id, authentication_type='WHITE_LIST' workspace_id=workspace_id, authentication_type='WHITE_LIST'
).values_list('model_id', flat=True) ).values_list('model_id', flat=True)
# 查询黑名单授权的工具
black_authorized_tool_ids = QuerySet(model_workspace_authorization).filter( black_authorized_tool_ids = QuerySet(model_workspace_authorization).filter(
workspace_id=workspace_id, authentication_type='BLACK_LIST' workspace_id=workspace_id, authentication_type='BLACK_LIST'
).values_list('model_id', flat=True) ).values_list('model_id', flat=True)
tool_query_set = tool_query_set.filter( tool_query_set = tool_query_set.filter(
id__in=white_authorized_tool_ids id__in=list(white_authorized_tool_ids) + list(all_auths)
).exclude( ).exclude(
id__in=black_authorized_tool_ids id__in=list(black_authorized_tool_ids) + list(non_auths)
) )
return tool_query_set return tool_query_set