Skip to content

fix: prevent needless retry of TokenLimitExceeded and fix search engine fallback #1348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ricardo-M-L wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent needless retry of TokenLimitExceeded and fix search engine fallback #1348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/llm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def format_messages(
wait=wait_random_exponential(min=1, max=60),
stop=stop_after_attempt(6),
retry=retry_if_exception_type(
(OpenAIError, Exception, ValueError)
(OpenAIError, ValueError)
), # Don't retry TokenLimitExceeded
)
async def ask(
Expand Down Expand Up @@ -482,7 +482,7 @@ async def ask(
wait=wait_random_exponential(min=1, max=60),
stop=stop_after_attempt(6),
retry=retry_if_exception_type(
(OpenAIError, Exception, ValueError)
(OpenAIError, ValueError)
), # Don't retry TokenLimitExceeded
)
async def ask_with_images(
Expand Down Expand Up @@ -638,7 +638,7 @@ async def ask_with_images(
wait=wait_random_exponential(min=1, max=60),
stop=stop_after_attempt(6),
retry=retry_if_exception_type(
(OpenAIError, Exception, ValueError)
(OpenAIError, ValueError)
), # Don't retry TokenLimitExceeded
)
async def ask_tool(
Expand Down
14 changes: 11 additions & 3 deletions app/tool/web_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,19 @@ async def _try_all_engines(
for engine_name in engine_order:
engine = self._search_engine[engine_name]
logger.info(f"🔎 Attempting search with {engine_name.capitalize()}...")
search_items = await self._perform_search_with_engine(
engine, query, num_results, search_params
)
try:
search_items = await self._perform_search_with_engine(
engine, query, num_results, search_params
)
except Exception as e:
logger.warning(
f"Search engine {engine_name.capitalize()} raised an exception: {e}"
)
failed_engines.append(engine_name)
continue

if not search_items:
failed_engines.append(engine_name)
continue

if failed_engines:
Expand Down