From 5ff08e241a906c7adcedc62c0ac80210ec3d4f66 Mon Sep 17 00:00:00 2001 From: rayshaw001 <396301947@163.com> Date: Tue, 21 Jan 2025 09:38:56 +0800 Subject: [PATCH] fix: serply credential check query might return empty records (#12784) --- api/core/tools/provider/builtin/websearch/tools/job_search.py | 2 +- api/core/tools/provider/builtin/websearch/tools/news_search.py | 2 +- .../tools/provider/builtin/websearch/tools/scholar_search.py | 2 +- api/core/tools/provider/builtin/websearch/tools/web_search.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/core/tools/provider/builtin/websearch/tools/job_search.py b/api/core/tools/provider/builtin/websearch/tools/job_search.py index 293f4f6329..13eb403391 100644 --- a/api/core/tools/provider/builtin/websearch/tools/job_search.py +++ b/api/core/tools/provider/builtin/websearch/tools/job_search.py @@ -43,7 +43,7 @@ class SerplyApi: def parse_results(res: dict) -> str: """Process response from Serply Job Search.""" jobs = res.get("jobs", []) - if not jobs: + if not res or "jobs" not in res: raise ValueError(f"Got error from Serply: {res}") string = [] diff --git a/api/core/tools/provider/builtin/websearch/tools/news_search.py b/api/core/tools/provider/builtin/websearch/tools/news_search.py index 9b5482fe18..7a8a732ff3 100644 --- a/api/core/tools/provider/builtin/websearch/tools/news_search.py +++ b/api/core/tools/provider/builtin/websearch/tools/news_search.py @@ -43,7 +43,7 @@ class SerplyApi: def parse_results(res: dict) -> str: """Process response from Serply News Search.""" news = res.get("entries", []) - if not news: + if not res or "entries" not in res: raise ValueError(f"Got error from Serply: {res}") string = [] diff --git a/api/core/tools/provider/builtin/websearch/tools/scholar_search.py b/api/core/tools/provider/builtin/websearch/tools/scholar_search.py index 798d059b51..32c5d39e5b 100644 --- a/api/core/tools/provider/builtin/websearch/tools/scholar_search.py +++ b/api/core/tools/provider/builtin/websearch/tools/scholar_search.py @@ -43,7 +43,7 @@ class SerplyApi: def parse_results(res: dict) -> str: """Process response from Serply News Search.""" articles = res.get("articles", []) - if not articles: + if not res or "articles" not in res: raise ValueError(f"Got error from Serply: {res}") string = [] diff --git a/api/core/tools/provider/builtin/websearch/tools/web_search.py b/api/core/tools/provider/builtin/websearch/tools/web_search.py index fe363ac7a4..d0e93cb0fa 100644 --- a/api/core/tools/provider/builtin/websearch/tools/web_search.py +++ b/api/core/tools/provider/builtin/websearch/tools/web_search.py @@ -42,7 +42,7 @@ class SerplyApi: def parse_results(res: dict) -> str: """Process response from Serply Web Search.""" results = res.get("results", []) - if not results: + if not res or "results" not in res: raise ValueError(f"Got error from Serply: {res}") string = []