From 00cf5f3841dcd21e3445eca206d2a9c1e03875dd Mon Sep 17 00:00:00 2001 From: Yeuoly Date: Wed, 25 Dec 2024 15:18:29 +0800 Subject: [PATCH 1/3] fix: linters --- api/controllers/console/workspace/tool_providers.py | 2 -- api/services/tools/builtin_tools_manage_service.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py index 4b21afb8b6..39ab454922 100644 --- a/api/controllers/console/workspace/tool_providers.py +++ b/api/controllers/console/workspace/tool_providers.py @@ -51,12 +51,10 @@ class ToolBuiltinProviderListToolsApi(Resource): def get(self, provider): user = current_user - user_id = user.id tenant_id = user.current_tenant_id return jsonable_encoder( BuiltinToolManageService.list_builtin_tool_provider_tools( - user_id, tenant_id, provider, ) diff --git a/api/services/tools/builtin_tools_manage_service.py b/api/services/tools/builtin_tools_manage_service.py index c40d05d2cc..6e344d7b41 100644 --- a/api/services/tools/builtin_tools_manage_service.py +++ b/api/services/tools/builtin_tools_manage_service.py @@ -261,8 +261,6 @@ class BuiltinToolManageService: name_func=lambda x: x.identity.name, ): continue - if provider_controller.identity is None: - continue # convert provider controller to user provider user_builtin_provider = ToolTransformService.builtin_provider_to_user_provider( From fee4dd7d7a751ab137f0b3ba9d882c82e13b23c9 Mon Sep 17 00:00:00 2001 From: Yeuoly Date: Wed, 25 Dec 2024 15:32:59 +0800 Subject: [PATCH 2/3] fix: unused stream variable --- api/core/helper/ssrf_proxy.py | 1 - 1 file changed, 1 deletion(-) diff --git a/api/core/helper/ssrf_proxy.py b/api/core/helper/ssrf_proxy.py index 424983a819..2e422cf444 100644 --- a/api/core/helper/ssrf_proxy.py +++ b/api/core/helper/ssrf_proxy.py @@ -45,7 +45,6 @@ def make_request(method, url, max_retries=SSRF_DEFAULT_MAX_RETRIES, **kwargs): ) retries = 0 - stream = kwargs.pop("stream", False) while retries <= max_retries: try: if dify_config.SSRF_PROXY_ALL_URL: From 80d8e47e420bfdda080dbae0ef6562aa506665a4 Mon Sep 17 00:00:00 2001 From: Yeuoly Date: Wed, 25 Dec 2024 18:23:31 +0800 Subject: [PATCH 3/3] fix: skip json transforming if error occurs --- api/core/plugin/manager/agent.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/core/plugin/manager/agent.py b/api/core/plugin/manager/agent.py index 0a2fb0e2d6..10db8b5581 100644 --- a/api/core/plugin/manager/agent.py +++ b/api/core/plugin/manager/agent.py @@ -48,6 +48,10 @@ class PluginAgentManager(BasePluginManager): agent_provider_id = GenericProviderID(provider) def transformer(json_response: dict[str, Any]) -> dict: + # skip if error occurs + if json_response.get("data") is None or json_response.get("data", {}).get("declaration") is None: + return json_response + for strategy in json_response.get("data", {}).get("declaration", {}).get("strategies", []): strategy["identity"]["provider"] = agent_provider_id.provider_name