-
Notifications
You must be signed in to change notification settings - Fork 5k
fix(exceptions): support integer error codes in APIError validationfix(exceptions): support integer error codes in APIError validation #3554
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
Rajeev91691
wants to merge
1
commit into
openai:main
Choose a base branch
from
Rajeev91691:fix/error-code-type-validation
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.
+38
−5
Open
Changes from all commits
Commits
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
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
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import httpx | ||
| import pytest | ||
| import openai | ||
| from openai import OpenAI, BadRequestError | ||
| from respx import MockRouter | ||
|
|
||
| base_url = "https://api.openai.com/v1" | ||
|
|
||
| @pytest.mark.respx(base_url=base_url) | ||
| def test_error_code_integer_parsing(respx_mock: MockRouter) -> None: | ||
| respx_mock.post("/chat/completions").mock( | ||
| return_value=httpx.Response( | ||
| 400, | ||
| json={ | ||
| "error": { | ||
| "message": "The request is invalid.", | ||
| "type": "invalid_request_error", | ||
| "code": 400, | ||
| "param": "model" | ||
| } | ||
| } | ||
| ) | ||
| ) | ||
|
|
||
| client = OpenAI(base_url=base_url, api_key="test-api-key") | ||
|
|
||
| with pytest.raises(BadRequestError) as exc_info: | ||
| client.chat.completions.create(messages=[{"role": "user", "content": "hello"}], model="gpt-4") | ||
|
|
||
| assert exc_info.value.status_code == 400 | ||
| assert exc_info.value.code == 400 | ||
| assert "The request is invalid." in exc_info.value.message | ||
| assert exc_info.value.param == "model" |
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.
Because this package still allows
pydantic>=1.9.0,<3, environments pinned to pydantic 1.x will run this through v1 Union validation, which tries thestrbranch first and coerces a JSON integer like400to'400'instead of preserving it as anint. In those supported installs, integer API error codes still surface as strings, so callers comparingexc.code == 400and the new test scenario fail; handle primitive ints explicitly or avoid the str-first Union validation for this field.Useful? React with 👍 / 👎.