fix(client): preserve hardcoded query params when merging with user params

Author: stainless-app[bot]

src/anthropic/_base_client.py

@@ -553,12 +553,10 @@ def _build_request(
                 files = cast(HttpxRequestFiles, ForceMultipartDict())
 
         prepared_url = self._prepare_url(options.url)
-        # When the URL contains hardcoded query params (e.g. ?beta=true) and
-        # additional params are provided, httpx will replace the URL's query
-        # string with the params. Merge them to preserve both.
+        # preserve hard-coded query params from the url
         if params and prepared_url.query:
             params = {**dict(prepared_url.params.items()), **params}
-            prepared_url = prepared_url.copy_with(raw_path=prepared_url.path.encode())
+            prepared_url = prepared_url.copy_with(raw_path=prepared_url.raw_path.split(b"?", 1)[0])
         if "_" in prepared_url.host:
             # work around https://github.com/encode/httpx/discussions/2880
             kwargs["extensions"] = {"sni_hostname": prepared_url.host.replace("_", "-")}

tests/test_client.py

@@ -458,7 +458,6 @@ def test_hardcoded_query_params_in_url(self, client: Anthropic) -> None:
         url = httpx.URL(request.url)
         assert dict(url.params) == {"beta": "true"}
 
-    def test_hardcoded_query_params_with_extra_params(self, client: Anthropic) -> None:
         request = client._build_request(
             FinalRequestOptions(
                 method="get",
@@ -469,6 +468,15 @@ def test_hardcoded_query_params_with_extra_params(self, client: Anthropic) -> No
         url = httpx.URL(request.url)
         assert dict(url.params) == {"beta": "true", "limit": "10", "page": "abc"}
 
+        request = client._build_request(
+            FinalRequestOptions(
+                method="get",
+                url="/files/a%2Fb?beta=true",
+                params={"limit": "10"},
+            )
+        )
+        assert request.url.raw_path == b"/files/a%2Fb?beta=true&limit=10"
+
     def test_request_extra_json(self, client: Anthropic) -> None:
         request = client._build_request(
             FinalRequestOptions(
@@ -1474,12 +1482,11 @@ async def test_default_query_option(self) -> None:
 
         await client.close()
 
-    def test_hardcoded_query_params_in_url(self, async_client: AsyncAnthropic) -> None:
+    async def test_hardcoded_query_params_in_url(self, async_client: AsyncAnthropic) -> None:
         request = async_client._build_request(FinalRequestOptions(method="get", url="/foo?beta=true"))
         url = httpx.URL(request.url)
         assert dict(url.params) == {"beta": "true"}
 
-    def test_hardcoded_query_params_with_extra_params(self, async_client: AsyncAnthropic) -> None:
         request = async_client._build_request(
             FinalRequestOptions(
                 method="get",
@@ -1490,6 +1497,15 @@ def test_hardcoded_query_params_with_extra_params(self, async_client: AsyncAnthr
         url = httpx.URL(request.url)
         assert dict(url.params) == {"beta": "true", "limit": "10", "page": "abc"}
 
+        request = async_client._build_request(
+            FinalRequestOptions(
+                method="get",
+                url="/files/a%2Fb?beta=true",
+                params={"limit": "10"},
+            )
+        )
+        assert request.url.raw_path == b"/files/a%2Fb?beta=true&limit=10"
+
     def test_request_extra_json(self, client: Anthropic) -> None:
         request = client._build_request(
             FinalRequestOptions(