Skip to content

Commit 2ee1435

Browse files
feat(client): add follow_redirects request option
1 parent 66e291e commit 2ee1435

File tree

4 files changed

+64
-0
lines changed

4 files changed

+64
-0
lines changed

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

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

840+
@pytest.mark.respx(base_url=base_url)
841+
def test_follow_redirects(self, respx_mock: MockRouter) -> None:
842+
# Test that the default follow_redirects=True allows following redirects
843+
respx_mock.post("/redirect").mock(
844+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
845+
)
846+
respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
847+
848+
response = self.client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
849+
assert response.status_code == 200
850+
assert response.json() == {"status": "ok"}
851+
852+
@pytest.mark.respx(base_url=base_url)
853+
def test_follow_redirects_disabled(self, respx_mock: MockRouter) -> None:
854+
# Test that follow_redirects=False prevents following redirects
855+
respx_mock.post("/redirect").mock(
856+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
857+
)
858+
859+
with pytest.raises(APIStatusError) as exc_info:
860+
self.client.post(
861+
"/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
862+
)
863+
864+
assert exc_info.value.response.status_code == 302
865+
assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"
866+
840867

841868
class TestAsyncJulep:
842869
client = AsyncJulep(base_url=base_url, api_key=api_key, _strict_response_validation=True)
@@ -1688,3 +1715,30 @@ async def test_main() -> None:
16881715
raise AssertionError("calling get_platform using asyncify resulted in a hung process")
16891716

16901717
time.sleep(0.1)
1718+
1719+
@pytest.mark.respx(base_url=base_url)
1720+
async def test_follow_redirects(self, respx_mock: MockRouter) -> None:
1721+
# Test that the default follow_redirects=True allows following redirects
1722+
respx_mock.post("/redirect").mock(
1723+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1724+
)
1725+
respx_mock.get("/redirected").mock(return_value=httpx.Response(200, json={"status": "ok"}))
1726+
1727+
response = await self.client.post("/redirect", body={"key": "value"}, cast_to=httpx.Response)
1728+
assert response.status_code == 200
1729+
assert response.json() == {"status": "ok"}
1730+
1731+
@pytest.mark.respx(base_url=base_url)
1732+
async def test_follow_redirects_disabled(self, respx_mock: MockRouter) -> None:
1733+
# Test that follow_redirects=False prevents following redirects
1734+
respx_mock.post("/redirect").mock(
1735+
return_value=httpx.Response(302, headers={"Location": f"{base_url}/redirected"})
1736+
)
1737+
1738+
with pytest.raises(APIStatusError) as exc_info:
1739+
await self.client.post(
1740+
"/redirect", body={"key": "value"}, options={"follow_redirects": False}, cast_to=httpx.Response
1741+
)
1742+
1743+
assert exc_info.value.response.status_code == 302
1744+
assert exc_info.value.response.headers["Location"] == f"{base_url}/redirected"

0 commit comments

Comments
 (0)