From 84b2e4a9db8a7cf582c1ba19cbface4a51ed469b Mon Sep 17 00:00:00 2001 From: hejl Date: Fri, 25 Oct 2024 09:34:29 +0800 Subject: [PATCH 1/2] fix ddgo image search not work --- .../provider/builtin/duckduckgo/tools/ddgo_img.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py b/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py index 3173fb9e13c58c..536baa7db1a0d1 100644 --- a/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py +++ b/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py @@ -20,11 +20,9 @@ def _invoke(self, user_id: str, tool_parameters: dict[str, Any]) -> list[ToolInv "max_results": tool_parameters.get("max_results"), } response = DDGS().images(**query_dict) - result = [] + markdown_result = "\n\n" + json_result = [] for res in response: - res["transfer_method"] = FileTransferMethod.REMOTE_URL - msg = ToolInvokeMessage( - type=ToolInvokeMessage.MessageType.IMAGE_LINK, message=res.get("image"), save_as="", meta=res - ) - result.append(msg) - return result + markdown_result += f"![{res.get('title') or ''}]({res.get('image') or ''})" + json_result.append(self.create_json_message(res)) + return [self.create_text_message(markdown_result)] + json_result From e036e03bb7a898bfaafd77110d014a85afe739fa Mon Sep 17 00:00:00 2001 From: hejl Date: Fri, 25 Oct 2024 09:34:41 +0800 Subject: [PATCH 2/2] fix ddgo image search not work --- api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py | 1 - 1 file changed, 1 deletion(-) diff --git a/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py b/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py index 536baa7db1a0d1..54bb38755a5b5c 100644 --- a/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py +++ b/api/core/tools/provider/builtin/duckduckgo/tools/ddgo_img.py @@ -2,7 +2,6 @@ from duckduckgo_search import DDGS -from core.file.models import FileTransferMethod from core.tools.entities.tool_entities import ToolInvokeMessage from core.tools.tool.builtin_tool import BuiltinTool