Skip to content

Commit 7a9a565

Browse files
feat(client): add follow_redirects request option
1 parent 93f2f3f commit 7a9a565

4 files changed

Lines changed: 64 additions & 0 deletions

File tree

src/brand/dev/_base_client.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,9 @@ def request(
960960
if self.custom_auth is not None:
961961
kwargs["auth"] = self.custom_auth
962962

963+
if options.follow_redirects is not None:
964+
kwargs["follow_redirects"] = options.follow_redirects
965+
963966
log.debug("Sending HTTP Request: %s %s", request.method, request.url)
964967

965968
response = None
@@ -1460,6 +1463,9 @@ async def request(
14601463
if self.custom_auth is not None:
14611464
kwargs["auth"] = self.custom_auth
14621465

1466+
if options.follow_redirects is not None:
1467+
kwargs["follow_redirects"] = options.follow_redirects
1468+
14631469
log.debug("Sending HTTP Request: %s %s", request.method, request.url)
14641470

14651471
response = None

src/brand/dev/_models.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -737,6 +737,7 @@ class FinalRequestOptionsInput(TypedDict, total=False):
737737
idempotency_key: str
738738
json_data: Body
739739
extra_json: AnyMapping
740+
follow_redirects: bool
740741

741742

742743
@final
@@ -750,6 +751,7 @@ class FinalRequestOptions(pydantic.BaseModel):
750751
files: Union[HttpxRequestFiles, None] = None
751752
idempotency_key: Union[str, None] = None
752753
post_parser: Union[Callable[[Any], Any], NotGiven] = NotGiven()
754+
follow_redirects: Union[bool, None] = None
753755

754756
# It should be noted that we cannot use `json` here as that would override
755757
# a BaseModel method in an incompatible fashion.

src/brand/dev/_types.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class RequestOptions(TypedDict, total=False):
100100
params: Query
101101
extra_json: AnyMapping
102102
idempotency_key: str
103+
follow_redirects: bool
103104

104105

105106
# Sentinel class used until PEP 0661 is accepted
@@ -215,3 +216,4 @@ class _GenericAlias(Protocol):
215216

216217
class HttpxSendArgs(TypedDict, total=False):
217218
auth: httpx.Auth
219+
follow_redirects: bool

tests/test_client.py

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,33 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
814814

815815
assert response.http_request.headers.get("x-stainless-retry-count") == "42"
816816

817+
@pytest.mark.respx(base_url=base_url)
818+
def test_follow_redirects(self, respx_mock: MockRouter) -> None:
819+
# Test that the default follow_redirects=True allows following redirects
820+
respx_mock.post("/redirect").mock(
821+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
822+
)
823+
respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
824+
825+
response = self.client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
826+
assert response.status_code == 200
827+
assert response.json() == {"status": "ok"}
828+
829+
@pytest.mark.respx(base_url=base_url)
830+
def test_follow_redirects_disabled(self, respx_mock: MockRouter) -> None:
831+
# Test that follow_redirects=False prevents following redirects
832+
respx_mock.post("/redirect").mock(
833+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
834+
)
835+
836+
with pytest.raises(APIStatusError) as exc_info:
837+
self.client.post(
838+
"/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
839+
)
840+
841+
assert exc_info.value.response.status_code == 302
842+
assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"
843+
817844

818845
class TestAsyncBrandDev:
819846
client = AsyncBrandDev(base_url=base_url, api_key=api_key, _strict_response_validation=True)
@@ -1635,3 +1662,30 @@ async def test_main() -> None:
16351662
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
16361663

16371664
time.sleep(0.1)
1665+
1666+
@pytest.mark.respx(base_url=base_url)
1667+
async def test_follow_redirects(self, respx_mock: MockRouter) -> None:
1668+
# Test that the default follow_redirects=True allows following redirects
1669+
respx_mock.post("/redirect").mock(
1670+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1671+
)
1672+
respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
1673+
1674+
response = await self.client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
1675+
assert response.status_code == 200
1676+
assert response.json() == {"status": "ok"}
1677+
1678+
@pytest.mark.respx(base_url=base_url)
1679+
async def test_follow_redirects_disabled(self, respx_mock: MockRouter) -> None:
1680+
# Test that follow_redirects=False prevents following redirects
1681+
respx_mock.post("/redirect").mock(
1682+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1683+
)
1684+
1685+
with pytest.raises(APIStatusError) as exc_info:
1686+
await self.client.post(
1687+
"/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
1688+
)
1689+
1690+
assert exc_info.value.response.status_code == 302
1691+
assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"

0 commit comments

Comments
 (0)