Skip to content

Commit 355fb3d

Browse files
committed
refactor: remove workflow tool import logic from tool.py and shared_tool.py for cleaner code
1 parent 88675b2 commit 355fb3d

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

apps/tools/serializers/tool.py

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from common.exception.app_exception import AppApiException
3434
from common.field.common import UploadedImageField
3535
from common.result import result
36-
from common.utils.common import get_file_content, generate_uuid, bytes_to_uploaded_file
36+
from common.utils.common import get_file_content, generate_uuid
3737
from common.utils.logger import maxkb_logger
3838
from common.utils.rsa_util import rsa_long_decrypt, rsa_long_encrypt
3939
from common.utils.tool_code import ToolExecutor
@@ -44,7 +44,7 @@
4444
from system_manage.models.resource_mapping import ResourceMapping
4545
from system_manage.serializers.resource_mapping_serializers import ResourceMappingSerializer
4646
from system_manage.serializers.user_resource_permission import UserResourcePermissionSerializer
47-
from tools.models import Tool, ToolScope, ToolFolder, ToolType, ToolRecord, ToolWorkflowVersion
47+
from tools.models import Tool, ToolScope, ToolFolder, ToolType, ToolRecord
4848
from tools.models.tool_workflow import ToolWorkflow
4949
from trigger.models import TriggerTask, Trigger
5050
from users.serializers.user import is_workspace_manage
@@ -1070,13 +1070,6 @@ def add(self, instance: Dict, with_valid=True):
10701070
)
10711071
tool.save()
10721072

1073-
if tool_data.get('tool_type') == ToolType.WORKFLOW:
1074-
tool_data['id'] = tool_id
1075-
ToolSerializer.Import(
1076-
data={'file': bytes_to_uploaded_file(b''), **self.data},
1077-
).import_workflow_tools(
1078-
tool_data, workspace_id=self.data.get('workspace_id'), user_id=self.data.get('user_id')
1079-
)
10801073
# 自动授权给创建者
10811074
UserResourcePermissionSerializer(data={
10821075
'workspace_id': self.data.get('workspace_id'),
@@ -1098,7 +1091,6 @@ class UpdateStoreTool(serializers.Serializer):
10981091
icon = serializers.CharField(required=True, label=_("icon"), allow_null=True, allow_blank=True)
10991092
versions = serializers.ListField(required=True, label=_("versions"), child=serializers.DictField())
11001093

1101-
@transaction.atomic
11021094
def update_tool(self, with_valid=True):
11031095
if with_valid:
11041096
self.is_valid(raise_exception=True)
@@ -1132,16 +1124,6 @@ def update_tool(self, with_valid=True):
11321124
tool.version = version_name
11331125
# tool.is_active = False
11341126
tool.save()
1135-
1136-
if tool_data.get('tool_type') == ToolType.WORKFLOW:
1137-
tool_data['id'] = tool.id
1138-
QuerySet(ToolWorkflow).filter(tool_id=tool_data['id']).delete()
1139-
QuerySet(ToolWorkflowVersion).filter(tool_id=tool_data['id']).delete()
1140-
ToolSerializer.Import(
1141-
data={'file': bytes_to_uploaded_file(b''), **self.data},
1142-
).import_workflow_tools(
1143-
tool_data, workspace_id=self.data.get('workspace_id'), user_id=self.data.get('user_id')
1144-
)
11451127
try:
11461128
requests.get(self.data.get('download_callback_url'), timeout=5)
11471129
except Exception as e:

0 commit comments

Comments
 (0)