-
Notifications
You must be signed in to change notification settings - Fork 3k
fix: prevent compounding retries between SDK and framework retry layers #5335
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.
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
Shubhrakanti
wants to merge
13
commits into
main
Choose a base branch
from
shubhra/fix-retries
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
654b61b
Merge branches 'theo/v1.3' and 'main' of github.com:livekit/agents
Shubhrakanti f4f4aff
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti d31630f
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 0a9434e
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 2d5f4c1
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 25a831f
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 21c37fa
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 9e6e231
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 915a9ad
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 0d20926
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti 75025d4
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti f6e6424
Merge branch 'main' of github.com:livekit/agents
Shubhrakanti e17ec23
fix: prevent compounding retries between SDK and framework retry layers
Shubhrakanti File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -14,7 +14,9 @@ | |||
|
|
||||
| from __future__ import annotations | ||||
|
|
||||
| import logging | ||||
| import os | ||||
| import warnings | ||||
| from dataclasses import asdict, dataclass | ||||
| from typing import Any, Literal | ||||
| from urllib.parse import urlparse | ||||
|
|
@@ -57,6 +59,7 @@ | |||
| ) | ||||
| from .utils import AsyncAzureADTokenProvider | ||||
|
|
||||
| logger = logging.getLogger(__name__) | ||||
| lk_oai_debug = int(os.getenv("LK_OPENAI_DEBUG", 0)) | ||||
|
|
||||
| Verbosity = Literal["low", "medium", "high"] | ||||
|
|
@@ -155,13 +158,22 @@ def __init__( | |||
| " OPENAI_API_KEY environment variable" | ||||
| ) | ||||
|
|
||||
| if is_given(max_retries) and max_retries > 0: | ||||
| warnings.warn( | ||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We deprecate using the logger in other parts of the code:
|
||||
| "max_retries is deprecated for openai.LLM and will be ignored. " | ||||
| "Retries are handled by the framework via APIConnectOptions.max_retry. " | ||||
| "Setting max_retries on the SDK client causes compounding retries.", | ||||
| DeprecationWarning, | ||||
| stacklevel=2, | ||||
| ) | ||||
|
|
||||
| self._provider_fmt = _provider_fmt or "openai" | ||||
| self._strict_tool_schema = _strict_tool_schema | ||||
| self._owns_client = client is None | ||||
| self._client = client or openai.AsyncClient( | ||||
| api_key=api_key if is_given(api_key) else None, | ||||
| base_url=base_url if is_given(base_url) else None, | ||||
| max_retries=max_retries if is_given(max_retries) else 0, | ||||
| max_retries=0, | ||||
| http_client=httpx.AsyncClient( | ||||
| timeout=timeout | ||||
| if timeout | ||||
|
|
||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.