Skip to content

Commit 322f791

Browse files
fix(client): don't send Content-Type header on GET requests
1 parent 4649363 commit 322f791

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Homepage = "https://github.com/openai/openai-python"
3939
Repository = "https://github.com/openai/openai-python"
4040

4141
[project.optional-dependencies]
42-
aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.6"]
42+
aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.8"]
4343
realtime = ["websockets >= 13, < 16"]
4444

4545
[tool.rye]

src/openai/_base_client.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,15 @@ def _build_request(
530530
# work around https://github.com/encode/httpx/discussions/2880
531531
kwargs["extensions"] = {"sni_hostname": prepared_url.host.replace("_", "-")}
532532

533+
is_body_allowed = options.method.lower() != "get"
534+
535+
if is_body_allowed:
536+
kwargs["json"] = json_data if is_given(json_data) else None
537+
kwargs["files"] = files
538+
else:
539+
headers.pop("Content-Type", None)
540+
kwargs.pop("data", None)
541+
533542
# TODO: report this error to httpx
534543
return self._client.build_request( # pyright: ignore[reportUnknownMemberType]
535544
headers=headers,
@@ -541,8 +550,6 @@ def _build_request(
541550
# so that passing a `TypedDict` doesn't cause an error.
542551
# https://github.com/microsoft/pyright/issues/3526#event-6715453066
543552
params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
544-
json=json_data if is_given(json_data) else None,
545-
files=files,
546553
**kwargs,
547554
)
548555

tests/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ def test_request_extra_query(self) -> None:
463463
def test_multipart_repeating_array(self, client: OpenAI) -> None:
464464
request = client._build_request(
465465
FinalRequestOptions.construct(
466-
method="get",
466+
method="post",
467467
url="/foo",
468468
headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
469469
json_data={"array": ["foo", "bar"]},
@@ -1348,7 +1348,7 @@ def test_request_extra_query(self) -> None:
13481348
def test_multipart_repeating_array(self, async_client: AsyncOpenAI) -> None:
13491349
request = async_client._build_request(
13501350
FinalRequestOptions.construct(
1351-
method="get",
1351+
method="post",
13521352
url="/foo",
13531353
headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
13541354
json_data={"array": ["foo", "bar"]},

0 commit comments

Comments
 (0)