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

feat: implement automatic authorization and cache refresh for new tool creation

Browse Source
This commit is contained in:
CaptainB 2025-06-26 18:10:27 +08:00
parent 094386a613
commit 8b960b96a1
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
apps/tools/serializers/tool.py
View File

@ -7,6 +7,7 @@ import re
import uuid_utils.compat as uuid import uuid_utils.compat as uuid
from django.core import validators from django.core import validators
from django.core.cache import cache
from django.db import transaction from django.db import transaction
from django.db.models import QuerySet, Q from django.db.models import QuerySet, Q
from django.http import HttpResponse from django.http import HttpResponse
@ -15,6 +16,8 @@ from pylint.lint import Run
from pylint.reporters import JSON2Reporter from pylint.reporters import JSON2Reporter
from rest_framework import serializers, status from rest_framework import serializers, status
from common.constants.cache_version import Cache_Version
from common.constants.permission_constants import ResourceAuthType, ResourcePermissionGroup
from common.db.search import page_search, native_page_search from common.db.search import page_search, native_page_search
from common.exception.app_exception import AppApiException from common.exception.app_exception import AppApiException
from common.field.common import UploadedImageField from common.field.common import UploadedImageField
@ -24,6 +27,7 @@ from common.utils.rsa_util import rsa_long_decrypt, rsa_long_encrypt
from common.utils.tool_code import ToolExecutor from common.utils.tool_code import ToolExecutor
from knowledge.models import File, FileSourceType from knowledge.models import File, FileSourceType
from maxkb.const import CONFIG, PROJECT_DIR from maxkb.const import CONFIG, PROJECT_DIR
from system_manage.models import AuthTargetType, WorkspaceUserResourcePermission
from tools.models import Tool, ToolScope, ToolFolder, ToolType from tools.models import Tool, ToolScope, ToolFolder, ToolType
from tools.serializers.tool_folder import ToolFolderFlatSerializer from tools.serializers.tool_folder import ToolFolderFlatSerializer
@ -192,23 +196,44 @@ class ToolSerializer(serializers.Serializer):
user_id = serializers.UUIDField(required=True, label=_('user id')) user_id = serializers.UUIDField(required=True, label=_('user id'))
workspace_id = serializers.CharField(required=True, label=_('workspace id')) workspace_id = serializers.CharField(required=True, label=_('workspace id'))
@transaction.atomic
def insert(self, instance, with_valid=True): def insert(self, instance, with_valid=True):
if with_valid: if with_valid:
self.is_valid(raise_exception=True) self.is_valid(raise_exception=True)
ToolCreateRequest(data=instance).is_valid(raise_exception=True) ToolCreateRequest(data=instance).is_valid(raise_exception=True)
tool = Tool(id=uuid.uuid7(), tool_id = uuid.uuid7()
name=instance.get('name'), Tool(
desc=instance.get('desc'), id=tool_id,
code=instance.get('code'), name=instance.get('name'),
user_id=self.data.get('user_id'), desc=instance.get('desc'),
workspace_id=self.data.get('workspace_id'), code=instance.get('code'),
input_field_list=instance.get('input_field_list', []), user_id=self.data.get('user_id'),
init_field_list=instance.get('init_field_list', []), workspace_id=self.data.get('workspace_id'),
scope=instance.get('scope', ToolScope.WORKSPACE), input_field_list=instance.get('input_field_list', []),
folder_id=instance.get('folder_id', self.data.get('workspace_id')), init_field_list=instance.get('init_field_list', []),
is_active=False) scope=instance.get('scope', ToolScope.WORKSPACE),
tool.save() folder_id=instance.get('folder_id', self.data.get('workspace_id')),
return ToolModelSerializer(tool).data is_active=False
).save()
# 自动授权给创建者
WorkspaceUserResourcePermission(
target=tool_id,
auth_target_type=AuthTargetType.TOOL,
permission_list=[ResourcePermissionGroup.VIEW, ResourcePermissionGroup.MANAGE],
workspace_id=self.data.get('workspace_id'),
user_id=self.data.get('user_id'),
auth_type=ResourceAuthType.RESOURCE_PERMISSION_GROUP
).save()
# 刷新缓存
version = Cache_Version.PERMISSION_LIST.get_version()
key = Cache_Version.PERMISSION_LIST.get_key(user_id=self.data.get('user_id'))
cache.delete(key, version=version)
return ToolSerializer.Operate(data={
'id': tool_id, 'workspace_id': self.data.get('workspace_id')
}).one()
class Debug(serializers.Serializer): class Debug(serializers.Serializer):
user_id = serializers.UUIDField(required=True, label=_('user id')) user_id = serializers.UUIDField(required=True, label=_('user id'))