outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: agent error handling

Browse Source
This commit is contained in:
Yeuoly 2024-12-27 12:09:39 +08:00
parent 8102cee8df
commit 598d208e54
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/core/plugin/manager/base.py
View File

@ -24,6 +24,7 @@ from core.plugin.manager.exc import (
PluginDaemonNotFoundError, PluginDaemonNotFoundError,
PluginDaemonUnauthorizedError, PluginDaemonUnauthorizedError,
PluginInvokeError, PluginInvokeError,
PluginNotFoundError,
PluginPermissionDeniedError, PluginPermissionDeniedError,
PluginUniqueIdentifierError, PluginUniqueIdentifierError,
) )
@ -143,7 +144,7 @@ class BasePluginManager:
if rep.code != 0: if rep.code != 0:
try: try:
error = PluginDaemonError(**json.loads(rep.message)) error = PluginDaemonError(**json.loads(rep.message))
except Exception as e: except Exception:
raise ValueError(f"{rep.message}, code: {rep.code}") raise ValueError(f"{rep.message}, code: {rep.code}")
self._handle_plugin_daemon_error(error.error_type, error.message) self._handle_plugin_daemon_error(error.error_type, error.message)
@ -171,7 +172,7 @@ class BasePluginManager:
try: try:
line_data = json.loads(line) line_data = json.loads(line)
rep = PluginDaemonBasicResponse[type](**line_data) rep = PluginDaemonBasicResponse[type](**line_data)
except Exception as e: except Exception:
# TODO modify this when line_data has code and message # TODO modify this when line_data has code and message
if line_data and "error" in line_data: if line_data and "error" in line_data:
raise ValueError(line_data["error"]) raise ValueError(line_data["error"])
@ -182,7 +183,7 @@ class BasePluginManager:
if rep.code == -500: if rep.code == -500:
try: try:
error = PluginDaemonError(**json.loads(rep.message)) error = PluginDaemonError(**json.loads(rep.message))
except Exception as e: except Exception:
raise PluginDaemonInnerError(code=rep.code, message=rep.message) raise PluginDaemonInnerError(code=rep.code, message=rep.message)
self._handle_plugin_daemon_error(error.error_type, error.message) self._handle_plugin_daemon_error(error.error_type, error.message)
@ -226,6 +227,8 @@ class BasePluginManager:
raise PluginDaemonNotFoundError(description=message) raise PluginDaemonNotFoundError(description=message)
case PluginUniqueIdentifierError.__name__: case PluginUniqueIdentifierError.__name__:
raise PluginUniqueIdentifierError(description=message) raise PluginUniqueIdentifierError(description=message)
case PluginNotFoundError.__name__:
raise PluginNotFoundError(description=message)
case PluginDaemonUnauthorizedError.__name__: case PluginDaemonUnauthorizedError.__name__:
raise PluginDaemonUnauthorizedError(description=message) raise PluginDaemonUnauthorizedError(description=message)
case PluginPermissionDeniedError.__name__: case PluginPermissionDeniedError.__name__:

4
api/services/agent_service.py
View File

@ -7,6 +7,7 @@ from flask_login import current_user # type: ignore
import contexts import contexts
from core.app.app_config.easy_ui_based_app.agent.manager import AgentConfigManager from core.app.app_config.easy_ui_based_app.agent.manager import AgentConfigManager
from core.plugin.manager.agent import PluginAgentManager from core.plugin.manager.agent import PluginAgentManager
from core.plugin.manager.exc import PluginDaemonClientSideError
from core.tools.tool_manager import ToolManager from core.tools.tool_manager import ToolManager
from extensions.ext_database import db from extensions.ext_database import db
from models.account import Account from models.account import Account
@ -169,4 +170,7 @@ class AgentService:
Get agent provider Get agent provider
""" """
manager = PluginAgentManager() manager = PluginAgentManager()
try:
return manager.fetch_agent_strategy_provider(tenant_id, provider_name) return manager.fetch_agent_strategy_provider(tenant_id, provider_name)
except PluginDaemonClientSideError as e:
raise ValueError(str(e)) from e