revert rename of *_httpx_client methods to _httpx2_client

Author: s-sajid-ali

.changeset/default_to_httpx2.md

@@ -2,8 +2,4 @@
 default: major
 ---
 
-# Default to using httpx2 instead of httpx causing the following breaking API changes:
-- `set_httpx_client` -> `set_httpx2_client`
-- `get_httpx_client` -> `get_httpx2_client`
-- `set_async_httpx_client` -> `set_async_httpx2_client`
-- `get_async_httpx_client` -> `get_async_httpx2_client`
+# Default to using httpx2 and drop support for httpx entirely

end_to_end_tests/functional_tests/generated_code_execution/test_path_parameters.py

@@ -44,25 +44,25 @@ class TestPathParameterEncoding:
 
     def test_path_params_with_normal_chars_work(self, sync_detailed, Client):
         """Test that normal alphanumeric path parameters still work correctly"""
-        mock_httpx2_client = MagicMock(spec=httpx2.Client)
+        mock_httpx_client = MagicMock(spec=httpx2.Client)
         mock_response = MagicMock(spec=httpx2.Response)
         mock_response.status_code = 200
         mock_response.json.return_value = {"id": "test"}
         mock_response.content = b'{"id": "test"}'
         mock_response.headers = {}
-        mock_httpx2_client.request.return_value = mock_response
+        mock_httpx_client.request.return_value = mock_response
 
         client = Client(base_url="https://api.example.com")
-        client.set_httpx2_client(mock_httpx2_client)
+        client.set_httpx_client(mock_httpx_client)
 
         sync_detailed(
             item_id="item123",
             detail_id="detail456",
             client=client,
         )
 
-        mock_httpx2_client.request.assert_called_once()
-        call_kwargs = mock_httpx2_client.request.call_args[1]
+        mock_httpx_client.request.assert_called_once()
+        call_kwargs = mock_httpx_client.request.call_args[1]
 
         # Normal characters should remain unchanged
         expected_url = "/items/item123/details/detail456"
@@ -71,17 +71,17 @@ def test_path_params_with_normal_chars_work(self, sync_detailed, Client):
     def test_path_params_with_reserved_chars_are_encoded(self, sync_detailed, Client):
         """Test that path parameters with reserved characters are properly URL-encoded"""
         # Create a mock httpx2 client
-        mock_httpx2_client = MagicMock(spec=httpx2.Client)
+        mock_httpx_client = MagicMock(spec=httpx2.Client)
         mock_response = MagicMock(spec=httpx2.Response)
         mock_response.status_code = 200
         mock_response.json.return_value = {"id": "test"}
         mock_response.content = b'{"id": "test"}'
         mock_response.headers = {}
-        mock_httpx2_client.request.return_value = mock_response
+        mock_httpx_client.request.return_value = mock_response
 
         # Create a client with the mock httpx2 client
         client = Client(base_url="https://api.example.com")
-        client.set_httpx2_client(mock_httpx2_client)
+        client.set_httpx_client(mock_httpx_client)
 
         # Call the endpoint with path parameters containing reserved characters
         sync_detailed(
@@ -91,60 +91,60 @@ def test_path_params_with_reserved_chars_are_encoded(self, sync_detailed, Client
         )
 
         # Verify the request was made with properly encoded URL
-        mock_httpx2_client.request.assert_called_once()
-        call_kwargs = mock_httpx2_client.request.call_args[1]
+        mock_httpx_client.request.assert_called_once()
+        call_kwargs = mock_httpx_client.request.call_args[1]
 
         # The URL should have encoded slashes and query characters
         expected_url = "/items/item%2Fwith%2Fslashes/details/detail%3Fwith%3Dquery%26chars"
         assert call_kwargs["url"] == expected_url
 
     def test_path_params_with_spaces_are_encoded(self, sync_detailed, Client):
         """Test that path parameters with spaces are properly URL-encoded"""
-        mock_httpx2_client = MagicMock(spec=httpx2.Client)
+        mock_httpx_client = MagicMock(spec=httpx2.Client)
         mock_response = MagicMock(spec=httpx2.Response)
         mock_response.status_code = 200
         mock_response.json.return_value = {"id": "test"}
         mock_response.content = b'{"id": "test"}'
         mock_response.headers = {}
-        mock_httpx2_client.request.return_value = mock_response
+        mock_httpx_client.request.return_value = mock_response
 
         client = Client(base_url="https://api.example.com")
-        client.set_httpx2_client(mock_httpx2_client)
+        client.set_httpx_client(mock_httpx_client)
 
         sync_detailed(
             item_id="item with spaces",
             detail_id="detail with spaces",
             client=client,
         )
 
-        mock_httpx2_client.request.assert_called_once()
-        call_kwargs = mock_httpx2_client.request.call_args[1]
+        mock_httpx_client.request.assert_called_once()
+        call_kwargs = mock_httpx_client.request.call_args[1]
 
         # Spaces should be encoded as %20
         expected_url = "/items/item%20with%20spaces/details/detail%20with%20spaces"
         assert call_kwargs["url"] == expected_url
 
     def test_path_params_with_hash_are_encoded(self, sync_detailed, Client):
         """Test that path parameters with hash/fragment characters are properly URL-encoded"""
-        mock_httpx2_client = MagicMock(spec=httpx2.Client)
+        mock_httpx_client = MagicMock(spec=httpx2.Client)
         mock_response = MagicMock(spec=httpx2.Response)
         mock_response.status_code = 200
         mock_response.json.return_value = {"id": "test"}
         mock_response.content = b'{"id": "test"}'
         mock_response.headers = {}
-        mock_httpx2_client.request.return_value = mock_response
+        mock_httpx_client.request.return_value = mock_response
 
         client = Client(base_url="https://api.example.com")
-        client.set_httpx2_client(mock_httpx2_client)
+        client.set_httpx_client(mock_httpx_client)
 
         sync_detailed(
             item_id="item#1",
             detail_id="detail#id",
             client=client,
         )
 
-        mock_httpx2_client.request.assert_called_once()
-        call_kwargs = mock_httpx2_client.request.call_args[1]
+        mock_httpx_client.request.assert_called_once()
+        call_kwargs = mock_httpx_client.request.call_args[1]
 
         # Hash should be encoded as %23
         expected_url = "/items/item%231/details/detail%23id"

end_to_end_tests/golden-records/docstrings-on-attributes-golden-record/README.md

@@ -93,7 +93,7 @@ client = Client(
     httpx2_args={"event_hooks": {"request": [log_request], "response": [log_response]}},
 )
 
-# Or get the underlying httpx2 client to modify directly with client.get_httpx2_client() or client.get_async_httpx2_client()
+# Or get the underlying httpx2 client to modify directly with client.get_httpx_client() or client.get_async_httpx_client()
 ```
 
 You can even set the httpx2 client directly, but beware that this will override any existing settings (e.g., base_url):
@@ -106,7 +106,7 @@ client = Client(
     base_url="https://api.example.com",
 )
 # Note that base_url needs to be re-set, as would any shared cookies, headers, etc.
-client.set_httpx2_client(httpx2.Client(base_url="https://api.example.com", proxy="http://localhost:8030"))
+client.set_httpx_client(httpx2.Client(base_url="https://api.example.com", proxy="http://localhost:8030"))
 ```
 
 ## Building / publishing this package

end_to_end_tests/golden-records/docstrings-on-attributes-golden-record/my_test_api_client/client.py

@@ -65,15 +65,15 @@ def with_timeout(self, timeout: httpx2.Timeout) -> "Client":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx2_client(self, client: httpx2.Client) -> Self:
+    def set_httpx_client(self, client: httpx2.Client) -> Self:
         """Manually set the underlying httpx2.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._client = client
         return self
 
-    def get_httpx2_client(self) -> httpx2.Client:
+    def get_httpx_client(self) -> httpx2.Client:
         """Get the underlying httpx2.Client, constructing a new one if not previously set"""
         if self._client is None:
             self._client = httpx2.Client(
@@ -89,22 +89,22 @@ def get_httpx2_client(self) -> httpx2.Client:
 
     def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx2 docs)"""
-        self.get_httpx2_client().__enter__()
+        self.get_httpx_client().__enter__()
         return self
 
     def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx2.Client (see httpx2 docs)"""
-        self.get_httpx2_client().__exit__(*args, **kwargs)
+        self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx2_client(self, async_client: httpx2.AsyncClient) -> Self:
+    def set_async_httpx_client(self, async_client: httpx2.AsyncClient) -> Self:
         """Manually set the underlying httpx2.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._async_client = async_client
         return self
 
-    def get_async_httpx2_client(self) -> httpx2.AsyncClient:
+    def get_async_httpx_client(self) -> httpx2.AsyncClient:
         """Get the underlying httpx2.AsyncClient, constructing a new one if not previously set"""
         if self._async_client is None:
             self._async_client = httpx2.AsyncClient(
@@ -120,12 +120,12 @@ def get_async_httpx2_client(self) -> httpx2.AsyncClient:
 
     async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx2.AsyncClient—you cannot enter twice (see httpx2 docs)"""
-        await self.get_async_httpx2_client().__aenter__()
+        await self.get_async_httpx_client().__aenter__()
         return self
 
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx2.AsyncClient (see httpx2 docs)"""
-        await self.get_async_httpx2_client().__aexit__(*args, **kwargs)
+        await self.get_async_httpx_client().__aexit__(*args, **kwargs)
 
 
 @define
@@ -195,15 +195,15 @@ def with_timeout(self, timeout: httpx2.Timeout) -> "AuthenticatedClient":
             self._async_client.timeout = timeout
         return evolve(self, timeout=timeout)
 
-    def set_httpx2_client(self, client: httpx2.Client) -> Self:
+    def set_httpx_client(self, client: httpx2.Client) -> Self:
         """Manually set the underlying httpx2.Client
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._client = client
         return self
 
-    def get_httpx2_client(self) -> httpx2.Client:
+    def get_httpx_client(self) -> httpx2.Client:
         """Get the underlying httpx2.Client, constructing a new one if not previously set"""
         if self._client is None:
             self._headers[self.auth_header_name] = f"{self.prefix} {self.token}" if self.prefix else self.token
@@ -220,22 +220,22 @@ def get_httpx2_client(self) -> httpx2.Client:
 
     def __enter__(self) -> Self:
         """Enter a context manager for self.client—you cannot enter twice (see httpx2 docs)"""
-        self.get_httpx2_client().__enter__()
+        self.get_httpx_client().__enter__()
         return self
 
     def __exit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for internal httpx2.Client (see httpx2 docs)"""
-        self.get_httpx2_client().__exit__(*args, **kwargs)
+        self.get_httpx_client().__exit__(*args, **kwargs)
 
-    def set_async_httpx2_client(self, async_client: httpx2.AsyncClient) -> Self:
+    def set_async_httpx_client(self, async_client: httpx2.AsyncClient) -> Self:
         """Manually set the underlying httpx2.AsyncClient
 
         **NOTE**: This will override any other settings on the client, including cookies, headers, and timeout.
         """
         self._async_client = async_client
         return self
 
-    def get_async_httpx2_client(self) -> httpx2.AsyncClient:
+    def get_async_httpx_client(self) -> httpx2.AsyncClient:
         """Get the underlying httpx2.AsyncClient, constructing a new one if not previously set"""
         if self._async_client is None:
             self._headers[self.auth_header_name] = f"{self.prefix} {self.token}" if self.prefix else self.token
@@ -252,9 +252,9 @@ def get_async_httpx2_client(self) -> httpx2.AsyncClient:
 
     async def __aenter__(self) -> Self:
         """Enter a context manager for underlying httpx2.AsyncClient—you cannot enter twice (see httpx2 docs)"""
-        await self.get_async_httpx2_client().__aenter__()
+        await self.get_async_httpx_client().__aenter__()
         return self
 
     async def __aexit__(self, *args: Any, **kwargs: Any) -> None:
         """Exit a context manager for underlying httpx2.AsyncClient (see httpx2 docs)"""
-        await self.get_async_httpx2_client().__aexit__(*args, **kwargs)
+        await self.get_async_httpx_client().__aexit__(*args, **kwargs)

end_to_end_tests/golden-records/escapes-client/README.md

@@ -93,7 +93,7 @@ client = Client(
     httpx2_args={"event_hooks": {"request": [log_request], "response": [log_response]}},
 )
 
-# Or get the underlying httpx2 client to modify directly with client.get_httpx2_client() or client.get_async_httpx2_client()
+# Or get the underlying httpx2 client to modify directly with client.get_httpx_client() or client.get_async_httpx_client()
 ```
 
 You can even set the httpx2 client directly, but beware that this will override any existing settings (e.g., base_url):
@@ -106,7 +106,7 @@ client = Client(
     base_url="https://api.example.com",
 )
 # Note that base_url needs to be re-set, as would any shared cookies, headers, etc.
-client.set_httpx2_client(httpx2.Client(base_url="https://api.example.com", proxy="http://localhost:8030"))
+client.set_httpx_client(httpx2.Client(base_url="https://api.example.com", proxy="http://localhost:8030"))
 ```
 
 ## Building / publishing this package

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/get_weird_responses.py

@@ -49,7 +49,7 @@ def sync_detailed(
 
     kwargs = _get_kwargs()
 
-    response = client.get_httpx2_client().request(
+    response = client.get_httpx_client().request(
         **kwargs,
     )
 
@@ -71,6 +71,6 @@ async def asyncio_detailed(
 
     kwargs = _get_kwargs()
 
-    response = await client.get_async_httpx2_client().request(**kwargs)
+    response = await client.get_async_httpx_client().request(**kwargs)
 
     return _build_response(client=client, response=response)

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/misc_metadata_escapes.py

@@ -69,7 +69,7 @@ def sync_detailed(
         body=body,
     )
 
-    response = client.get_httpx2_client().request(
+    response = client.get_httpx_client().request(
         **kwargs,
     )
 
@@ -120,7 +120,7 @@ async def asyncio_detailed(
         body=body,
     )
 
-    response = await client.get_async_httpx2_client().request(**kwargs)
+    response = await client.get_async_httpx_client().request(**kwargs)
 
     return _build_response(client=client, response=response)
 

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/non_string_example.py

@@ -68,7 +68,7 @@ def sync_detailed(
         body=body,
     )
 
-    response = client.get_httpx2_client().request(
+    response = client.get_httpx_client().request(
         **kwargs,
     )
 
@@ -96,6 +96,6 @@ async def asyncio_detailed(
         body=body,
     )
 
-    response = await client.get_async_httpx2_client().request(**kwargs)
+    response = await client.get_async_httpx_client().request(**kwargs)
 
     return _build_response(client=client, response=response)

end_to_end_tests/golden-records/escapes-client/escapes_client/api/default/property_escapes.py

@@ -68,7 +68,7 @@ def sync_detailed(
         body=body,
     )
 
-    response = client.get_httpx2_client().request(
+    response = client.get_httpx_client().request(
         **kwargs,
     )
 
@@ -96,6 +96,6 @@ async def asyncio_detailed(
         body=body,
     )
 
-    response = await client.get_async_httpx2_client().request(**kwargs)
+    response = await client.get_async_httpx_client().request(**kwargs)
 
     return _build_response(client=client, response=response)

end_to_end_tests/golden-records/escapes-client/escapes_client/api/printtag_escape/with_braces_path.py

@@ -89,7 +89,7 @@ def sync_detailed(
         printescape_param_name=printescape_param_name,
     )
 
-    response = client.get_httpx2_client().request(
+    response = client.get_httpx_client().request(
         **kwargs,
     )
 
@@ -126,6 +126,6 @@ async def asyncio_detailed(
         printescape_param_name=printescape_param_name,
     )
 
-    response = await client.get_async_httpx2_client().request(**kwargs)
+    response = await client.get_async_httpx_client().request(**kwargs)
 
     return _build_response(client=client, response=response)