Skip to content

Commit ffcc579

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

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Homepage = "https://github.com/writer/writer-python"
4141
Repository = "https://github.com/writer/writer-python"
4242

4343
[project.optional-dependencies]
44-
aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.6"]
44+
aiohttp = ["aiohttp", "httpx_aiohttp>=0.1.8"]
4545

4646
[tool.rye]
4747
managed = true

src/writerai/_base_client.py

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

534+
is_body_allowed = options.method.lower() != "get"
535+
536+
if is_body_allowed:
537+
kwargs["json"] = json_data if is_given(json_data) else None
538+
kwargs["files"] = files
539+
else:
540+
headers.pop("Content-Type", None)
541+
kwargs.pop("data", None)
542+
534543
# TODO: report this error to httpx
535544
return self._client.build_request( # pyright: ignore[reportUnknownMemberType]
536545
headers=headers,
@@ -543,8 +552,6 @@ def _build_request(
543552
# https://github.com/microsoft/pyright/issues/3526#event-6715453066
544553
params=self.qs.stringify(cast(Mapping[str, Any], params)) if params else None,
545554
content=content,
546-
json=json_data if is_given(json_data) else None,
547-
files=files,
548555
**kwargs,
549556
)
550557

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: Writer) -> 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"]},
@@ -1279,7 +1279,7 @@ def test_request_extra_query(self) -> None:
12791279
def test_multipart_repeating_array(self, async_client: AsyncWriter) -> None:
12801280
request = async_client._build_request(
12811281
FinalRequestOptions.construct(
1282-
method="get",
1282+
method="post",
12831283
url="/foo",
12841284
headers={"Content-Type": "multipart/form-data; boundary=6b7ba517decee4a450543ea6ae821c82"},
12851285
json_data={"array": ["foo", "bar"]},

0 commit comments

Comments
 (0)