youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-30 07:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/chore-fix' into dev/plugin-deploy

Browse Source
This commit is contained in:
Yeuoly
2024-11-28 20:44:58 +08:00
parent d409d30ee5 8c5928da2f
commit df67200e18
5 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
api/core/plugin/manager/exc.py
View File

@ -9,33 +9,41 @@ class PluginDaemonError(Exception):
return f"{self.__class__.__name__}: {self.description}"
class PluginDaemonInternalServerError(PluginDaemonError):
class PluginDaemonInternalError(PluginDaemonError):
pass
class PluginDaemonClientSideError(PluginDaemonError):
pass
class PluginDaemonInternalServerError(PluginDaemonInternalError):
description: str = "Internal Server Error"
class PluginDaemonBadRequestError(PluginDaemonError):
description: str = "Bad Request"
class PluginDaemonNotFoundError(PluginDaemonError):
description: str = "Not Found"
class PluginInvokeError(PluginDaemonError):
description: str = "Invoke Error"
class PluginUniqueIdentifierError(PluginDaemonError):
description: str = "Unique Identifier Error"
class PluginNotFoundError(PluginDaemonError):
description: str = "Plugin Not Found"
class PluginDaemonUnauthorizedError(PluginDaemonError):
class PluginDaemonUnauthorizedError(PluginDaemonInternalError):
description: str = "Unauthorized"
class PluginPermissionDeniedError(PluginDaemonError):
class PluginDaemonNotFoundError(PluginDaemonInternalError):
description: str = "Not Found"
class PluginDaemonBadRequestError(PluginDaemonClientSideError):
description: str = "Bad Request"
class PluginInvokeError(PluginDaemonClientSideError):
description: str = "Invoke Error"
class PluginUniqueIdentifierError(PluginDaemonClientSideError):
description: str = "Unique Identifier Error"
class PluginNotFoundError(PluginDaemonClientSideError):
description: str = "Plugin Not Found"
class PluginPermissionDeniedError(PluginDaemonClientSideError):
description: str = "Permission Denied"

4
api/core/workflow/nodes/tool/tool_node.py
View File

@ -7,7 +7,7 @@ from sqlalchemy.orm import Session
from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
from core.file import File, FileTransferMethod, FileType
from core.plugin.manager.exc import PluginInvokeError
from core.plugin.manager.exc import PluginDaemonClientSideError
from core.tools.entities.tool_entities import ToolInvokeMessage, ToolParameter
from core.tools.tool_engine import ToolEngine
from core.tools.tool_manager import ToolManager
@ -105,7 +105,7 @@ class ToolNode(BaseNode[ToolNodeData]):
try:
# convert tool messages
yield from self._transform_message(message_stream, tool_info, parameters_for_log)
except PluginInvokeError as e:
except PluginDaemonClientSideError as e:
yield RunCompletedEvent(
run_result=NodeRunResult(
status=WorkflowNodeExecutionStatus.FAILED,