From 12640f7092a7e193df802157feded48a40dfd91a Mon Sep 17 00:00:00 2001 From: Krzysztof Czerwinski <34861343+kcze@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:50:26 +0100 Subject: fix(agent, forge): Conform `web_search.py` to `duckduckgo_search` v5 (#7045) Update `web_search` command for both autogpt and forge to adjust for breaking change in v5 of `duckduckgo_search` --- autogpts/autogpt/autogpt/commands/web_search.py | 3 +-- autogpts/autogpt/pyproject.toml | 2 +- autogpts/forge/forge/actions/web/web_search.py | 3 +-- autogpts/forge/pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/autogpts/autogpt/autogpt/commands/web_search.py b/autogpts/autogpt/autogpt/commands/web_search.py index e39bfffc6..717d5295c 100644 --- a/autogpts/autogpt/autogpt/commands/web_search.py +++ b/autogpts/autogpt/autogpt/commands/web_search.py @@ -49,8 +49,7 @@ def web_search(query: str, agent: Agent, num_results: int = 8) -> str: if not query: return json.dumps(search_results) - results = DDGS().text(query) - search_results = list(islice(results, num_results)) + search_results = DDGS().text(query, max_results=num_results) if search_results: break diff --git a/autogpts/autogpt/pyproject.toml b/autogpts/autogpt/pyproject.toml index 73706967a..404bffaaa 100644 --- a/autogpts/autogpt/pyproject.toml +++ b/autogpts/autogpt/pyproject.toml @@ -33,7 +33,7 @@ colorama = "^0.4.6" demjson3 = "^3.0.0" distro = "^1.8.0" docker = "*" -duckduckgo-search = "^4.0.0" +duckduckgo-search = "^5.0.0" en-core-web-sm = {url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.5.0/en_core_web_sm-3.5.0-py3-none-any.whl"} fastapi = "^0.109.1" ftfy = "^6.1.1" diff --git a/autogpts/forge/forge/actions/web/web_search.py b/autogpts/forge/forge/actions/web/web_search.py index 2bcc0a32d..afd09563f 100644 --- a/autogpts/forge/forge/actions/web/web_search.py +++ b/autogpts/forge/forge/actions/web/web_search.py @@ -42,8 +42,7 @@ async def web_search(agent, task_id: str, query: str) -> str: if not query: return json.dumps(search_results) - results = DDGS().text(query) - search_results = list(islice(results, num_results)) + search_results = DDGS().text(query, max_results=num_results) if search_results: break diff --git a/autogpts/forge/pyproject.toml b/autogpts/forge/pyproject.toml index a85f275b1..bd5575304 100644 --- a/autogpts/forge/pyproject.toml +++ b/autogpts/forge/pyproject.toml @@ -21,7 +21,7 @@ toml = "^0.10.2" jinja2 = "^3.1.2" uvicorn = "^0.23.2" litellm = "^1.17.9" -duckduckgo-search = "^4.0.0" +duckduckgo-search = "^5.0.0" selenium = "^4.13.0" bs4 = "^0.0.1" agbenchmark = { path = "../../benchmark", optional = true } -- cgit v1.2.3