Skip to content

Commit 89019e2

Browse files
feat(client): add follow_redirects request option
1 parent bd97370 commit 89019e2

4 files changed

Lines changed: 64 additions & 0 deletions

File tree

src/knockapi/_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/knockapi/_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/knockapi/_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
@@ -806,6 +806,33 @@ def retry_handler(_request: httpx.Request) -> httpx.Response:
806806

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

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

810837
class TestAsyncKnock:
811838
client = AsyncKnock(base_url=base_url, api_key=api_key, _strict_response_validation=True)
@@ -1623,3 +1650,30 @@ async def test_main() -> None:
16231650
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
16241651

16251652
time.sleep(0.1)
1653+
1654+
@pytest.mark.respx(base_url=base_url)
1655+
async def test_follow_redirects(self, respx_mock: MockRouter) -> None:
1656+
# Test that the default follow_redirects=True allows following redirects
1657+
respx_mock.post("/redirect").mock(
1658+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1659+
)
1660+
respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
1661+
1662+
response = await self.client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
1663+
assert response.status_code == 200
1664+
assert response.json() == {"status": "ok"}
1665+
1666+
@pytest.mark.respx(base_url=base_url)
1667+
async def test_follow_redirects_disabled(self, respx_mock: MockRouter) -> None:
1668+
# Test that follow_redirects=False prevents following redirects
1669+
respx_mock.post("/redirect").mock(
1670+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1671+
)
1672+
1673+
with pytest.raises(APIStatusError) as exc_info:
1674+
await self.client.post(
1675+
"/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
1676+
)
1677+
1678+
assert exc_info.value.response.status_code == 302
1679+
assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"

0 commit comments

Comments
 (0)