From fd2651f5aa99780c9763a7e60425024c3343850a Mon Sep 17 00:00:00 2001 From: Harry Date: Tue, 15 Jul 2025 23:16:02 +0800 Subject: [PATCH] refactor: simplify error handling by removing specific exceptions in tool management --- ...arameters_cache_when_sync_draft_workflow.py | 1 + .../tools/builtin_tools_manage_service.py | 18 +++--------------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py b/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py index 249bd14429..6c9fc0bf1d 100644 --- a/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py +++ b/api/events/event_handlers/delete_tool_parameters_cache_when_sync_draft_workflow.py @@ -20,6 +20,7 @@ def handle(sender, **kwargs): provider_id=tool_entity.provider_id, tool_name=tool_entity.tool_name, tenant_id=app.tenant_id, + credential_id=tool_entity.credential_id, ) manager = ToolParameterConfigurationManager( tenant_id=app.tenant_id, diff --git a/api/services/tools/builtin_tools_manage_service.py b/api/services/tools/builtin_tools_manage_service.py index 0f74981e8c..ced2118a6c 100644 --- a/api/services/tools/builtin_tools_manage_service.py +++ b/api/services/tools/builtin_tools_manage_service.py @@ -11,7 +11,6 @@ from constants import HIDDEN_VALUE, UNKNOWN_VALUE from core.helper.position_helper import is_filtered from core.helper.provider_cache import NoOpProviderCredentialCache, ToolProviderCredentialsCache from core.plugin.entities.plugin import ToolProviderID -from core.plugin.impl.exc import PluginDaemonClientSideError from core.tools.builtin_tool.provider import BuiltinToolProviderController from core.tools.builtin_tool.providers._positions import BuiltinToolProviderSort from core.tools.entities.api_entities import ( @@ -21,7 +20,7 @@ from core.tools.entities.api_entities import ( ToolProviderCredentialInfoApiEntity, ) from core.tools.entities.tool_entities import CredentialType -from core.tools.errors import ToolNotFoundError, ToolProviderCredentialValidationError, ToolProviderNotFoundError +from core.tools.errors import ToolProviderNotFoundError from core.tools.plugin_tool.provider import PluginToolProviderController from core.tools.tool_label_manager import ToolLabelManager from core.tools.tool_manager import ToolManager @@ -200,15 +199,9 @@ class BuiltinToolManageService: db_provider.name = name session.commit() - except ( - PluginDaemonClientSideError, - ToolProviderNotFoundError, - ToolNotFoundError, - ToolProviderCredentialValidationError, - ) as e: + except Exception as e: session.rollback() raise ValueError(str(e)) - return {"result": "success"} @staticmethod @@ -279,12 +272,7 @@ class BuiltinToolManageService: session.add(db_provider) session.commit() - except ( - PluginDaemonClientSideError, - ToolProviderNotFoundError, - ToolNotFoundError, - ToolProviderCredentialValidationError, - ) as e: + except Exception as e: session.rollback() raise ValueError(str(e)) return {"result": "success"}