diff --git a/tests/conftest.py b/tests/conftest.py index 6ba51ce7..2c791d06 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,8 +27,6 @@ def event_loop() -> Iterator[asyncio.AbstractEventLoop]: base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") access_token = "My Access Token" -client_id = "4ab15e51-11ad-49f4-acae-f343b7794375" -client_secret = "My Client Secret" @pytest.fixture(scope="session") @@ -37,13 +35,7 @@ def client(request: FixtureRequest) -> Iterator[Finch]: if not isinstance(strict, bool): raise TypeError(f"Unexpected fixture parameter type {type(strict)}, expected {bool}") - with Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=strict, - ) as client: + with Finch(base_url=base_url, access_token=access_token, _strict_response_validation=strict) as client: yield client @@ -53,11 +45,5 @@ async def async_client(request: FixtureRequest) -> AsyncIterator[AsyncFinch]: if not isinstance(strict, bool): raise TypeError(f"Unexpected fixture parameter type {type(strict)}, expected {bool}") - async with AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=strict, - ) as client: + async with AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=strict) as client: yield client diff --git a/tests/test_client.py b/tests/test_client.py index 276a61dc..67cf27e6 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -26,8 +26,6 @@ base_url = os.environ.get("TEST_API_BASE_URL", "http://127.0.0.1:4010") access_token = "My Access Token" -client_id = "4ab15e51-11ad-49f4-acae-f343b7794375" -client_secret = "My Client Secret" def _get_params(client: BaseClient[Any, Any]) -> dict[str, str]: @@ -41,13 +39,7 @@ def _low_retry_timeout(*_args: Any, **_kwargs: Any) -> float: class TestFinch: - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) @pytest.mark.respx(base_url=base_url) def test_raw_response(self, respx_mock: MockRouter) -> None: @@ -77,14 +69,6 @@ def test_copy(self) -> None: assert copied.access_token == "another My Access Token" assert self.client.access_token == "My Access Token" - copied = self.client.copy(client_id="another 4ab15e51-11ad-49f4-acae-f343b7794375") - assert copied.client_id == "another 4ab15e51-11ad-49f4-acae-f343b7794375" - assert self.client.client_id == "4ab15e51-11ad-49f4-acae-f343b7794375" - - copied = self.client.copy(client_secret="another My Client Secret") - assert copied.client_secret == "another My Client Secret" - assert self.client.client_secret == "My Client Secret" - def test_copy_default_options(self) -> None: # options that have a default are overridden correctly copied = self.client.copy(max_retries=7) @@ -105,8 +89,6 @@ def test_copy_default_headers(self) -> None: client = Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={"X-Foo": "bar"}, ) @@ -142,12 +124,7 @@ def test_copy_default_headers(self) -> None: def test_copy_default_query(self) -> None: client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - default_query={"foo": "bar"}, + base_url=base_url, access_token=access_token, _strict_response_validation=True, default_query={"foo": "bar"} ) assert _get_params(client)["foo"] == "bar" @@ -272,12 +249,7 @@ def test_request_timeout(self) -> None: def test_client_timeout_option(self) -> None: client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - timeout=httpx.Timeout(0), + base_url=base_url, access_token=access_token, _strict_response_validation=True, timeout=httpx.Timeout(0) ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -288,12 +260,7 @@ def test_http_client_timeout_option(self) -> None: # custom timeout given to the httpx client should be used with httpx.Client(timeout=None) as http_client: client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -303,12 +270,7 @@ def test_http_client_timeout_option(self) -> None: # no timeout given to the httpx client should not use the httpx default with httpx.Client() as http_client: client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -318,12 +280,7 @@ def test_http_client_timeout_option(self) -> None: # explicitly passing the default timeout currently results in it being ignored with httpx.Client(timeout=HTTPX_DEFAULT_TIMEOUT) as http_client: client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -336,8 +293,6 @@ async def test_invalid_http_client(self) -> None: Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=cast(Any, http_client), ) @@ -346,8 +301,6 @@ def test_default_headers_option(self) -> None: client = Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={"X-Foo": "bar"}, ) @@ -358,8 +311,6 @@ def test_default_headers_option(self) -> None: client2 = Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={ "X-Foo": "stainless", @@ -371,23 +322,11 @@ def test_default_headers_option(self) -> None: assert request.headers.get("x-stainless-lang") == "my-overriding-header" def test_validate_headers(self) -> None: - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) assert request.headers.get("Authorization") == f"Bearer {access_token}" - client2 = Finch( - base_url=base_url, - access_token=None, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client2 = Finch(base_url=base_url, access_token=None, _strict_response_validation=True) with pytest.raises( TypeError, @@ -404,8 +343,6 @@ def test_default_query_option(self) -> None: client = Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_query={"query_param": "bar"}, ) @@ -608,11 +545,7 @@ class Model(BaseModel): def test_base_url_setter(self) -> None: client = Finch( - base_url="https://example.com/from_init", - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, + base_url="https://example.com/from_init", access_token=access_token, _strict_response_validation=True ) assert client.base_url == "https://example.com/from_init/" @@ -622,12 +555,7 @@ def test_base_url_setter(self) -> None: def test_base_url_env(self) -> None: with update_env(FINCH_BASE_URL="http://localhost:5000/from/env"): - client = Finch( - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(access_token=access_token, _strict_response_validation=True) assert client.base_url == "http://localhost:5000/from/env/" @pytest.mark.parametrize( @@ -636,15 +564,11 @@ def test_base_url_env(self) -> None: Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.Client(), ), @@ -667,15 +591,11 @@ def test_base_url_trailing_slash(self, client: Finch) -> None: Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.Client(), ), @@ -698,15 +618,11 @@ def test_base_url_no_trailing_slash(self, client: Finch) -> None: Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), Finch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.Client(), ), @@ -733,12 +649,7 @@ def test_transport_option_is_deprecated(self) -> None: ) client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - transport=transport, + base_url=base_url, access_token=access_token, _strict_response_validation=True, transport=transport ) assert client._client._transport is transport @@ -750,8 +661,6 @@ def test_transport_option_mutually_exclusive_with_http_client(self) -> None: Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, transport=httpx.MockTransport( lambda: None, # type: ignore @@ -771,8 +680,6 @@ def test_connection_pool_limits_option_is_deprecated(self) -> None: client = Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, connection_pool_limits=connection_pool_limits, ) @@ -791,8 +698,6 @@ def test_connection_pool_limits_option_mutually_exclusive_with_http_client(self) Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, connection_pool_limits=httpx.Limits( max_connections=101, max_keepalive_connections=76, keepalive_expiry=23 @@ -808,12 +713,7 @@ def test_proxies_option_is_deprecated(self) -> None: proxies = "https://www.example.com/proxy" client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - proxies=proxies, + base_url=base_url, access_token=access_token, _strict_response_validation=True, proxies=proxies ) mounts = list(client._client._mounts.keys()) @@ -829,21 +729,13 @@ def test_proxies_option_mutually_exclusive_with_http_client(self) -> None: Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, proxies="https://www.example.com/proxy", http_client=http_client, ) def test_copied_client_does_not_close_http(self) -> None: - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) assert not client.is_closed() copied = client.copy() @@ -854,13 +746,7 @@ def test_copied_client_does_not_close_http(self) -> None: assert not client.is_closed() def test_client_context_manager(self) -> None: - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) with client as c2: assert c2 is client assert not c2.is_closed() @@ -884,8 +770,6 @@ def test_client_max_retries_validation(self) -> None: Finch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, max_retries=cast(Any, None), ) @@ -897,24 +781,12 @@ class Model(BaseModel): respx_mock.get("/foo").mock(return_value=httpx.Response(200, text="my-custom-format")) - strict_client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + strict_client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) with pytest.raises(APIResponseValidationError): strict_client.get("/foo", cast_to=Model) - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=False, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=False) response = client.get("/foo", cast_to=Model) assert isinstance(response, str) # type: ignore[unreachable] @@ -941,13 +813,7 @@ class Model(BaseModel): ) @mock.patch("time.time", mock.MagicMock(return_value=1696004797)) def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None: - client = Finch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = Finch(base_url=base_url, access_token=access_token, _strict_response_validation=True) headers = httpx.Headers({"retry-after": retry_after}) options = FinalRequestOptions(method="get", url="/foo", max_retries=3) @@ -1001,13 +867,7 @@ def retry_handler(_request: httpx.Request) -> httpx.Response: class TestAsyncFinch: - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) @pytest.mark.respx(base_url=base_url) @pytest.mark.asyncio @@ -1039,14 +899,6 @@ def test_copy(self) -> None: assert copied.access_token == "another My Access Token" assert self.client.access_token == "My Access Token" - copied = self.client.copy(client_id="another 4ab15e51-11ad-49f4-acae-f343b7794375") - assert copied.client_id == "another 4ab15e51-11ad-49f4-acae-f343b7794375" - assert self.client.client_id == "4ab15e51-11ad-49f4-acae-f343b7794375" - - copied = self.client.copy(client_secret="another My Client Secret") - assert copied.client_secret == "another My Client Secret" - assert self.client.client_secret == "My Client Secret" - def test_copy_default_options(self) -> None: # options that have a default are overridden correctly copied = self.client.copy(max_retries=7) @@ -1067,8 +919,6 @@ def test_copy_default_headers(self) -> None: client = AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={"X-Foo": "bar"}, ) @@ -1104,12 +954,7 @@ def test_copy_default_headers(self) -> None: def test_copy_default_query(self) -> None: client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - default_query={"foo": "bar"}, + base_url=base_url, access_token=access_token, _strict_response_validation=True, default_query={"foo": "bar"} ) assert _get_params(client)["foo"] == "bar" @@ -1234,12 +1079,7 @@ async def test_request_timeout(self) -> None: async def test_client_timeout_option(self) -> None: client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - timeout=httpx.Timeout(0), + base_url=base_url, access_token=access_token, _strict_response_validation=True, timeout=httpx.Timeout(0) ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -1250,12 +1090,7 @@ async def test_http_client_timeout_option(self) -> None: # custom timeout given to the httpx client should be used async with httpx.AsyncClient(timeout=None) as http_client: client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -1265,12 +1100,7 @@ async def test_http_client_timeout_option(self) -> None: # no timeout given to the httpx client should not use the httpx default async with httpx.AsyncClient() as http_client: client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -1280,12 +1110,7 @@ async def test_http_client_timeout_option(self) -> None: # explicitly passing the default timeout currently results in it being ignored async with httpx.AsyncClient(timeout=HTTPX_DEFAULT_TIMEOUT) as http_client: client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - http_client=http_client, + base_url=base_url, access_token=access_token, _strict_response_validation=True, http_client=http_client ) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) @@ -1298,8 +1123,6 @@ def test_invalid_http_client(self) -> None: AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=cast(Any, http_client), ) @@ -1308,8 +1131,6 @@ def test_default_headers_option(self) -> None: client = AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={"X-Foo": "bar"}, ) @@ -1320,8 +1141,6 @@ def test_default_headers_option(self) -> None: client2 = AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_headers={ "X-Foo": "stainless", @@ -1333,23 +1152,11 @@ def test_default_headers_option(self) -> None: assert request.headers.get("x-stainless-lang") == "my-overriding-header" def test_validate_headers(self) -> None: - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) request = client._build_request(FinalRequestOptions(method="get", url="/foo")) assert request.headers.get("Authorization") == f"Bearer {access_token}" - client2 = AsyncFinch( - base_url=base_url, - access_token=None, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client2 = AsyncFinch(base_url=base_url, access_token=None, _strict_response_validation=True) with pytest.raises( TypeError, @@ -1366,8 +1173,6 @@ def test_default_query_option(self) -> None: client = AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, default_query={"query_param": "bar"}, ) @@ -1570,11 +1375,7 @@ class Model(BaseModel): def test_base_url_setter(self) -> None: client = AsyncFinch( - base_url="https://example.com/from_init", - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, + base_url="https://example.com/from_init", access_token=access_token, _strict_response_validation=True ) assert client.base_url == "https://example.com/from_init/" @@ -1584,12 +1385,7 @@ def test_base_url_setter(self) -> None: def test_base_url_env(self) -> None: with update_env(FINCH_BASE_URL="http://localhost:5000/from/env"): - client = AsyncFinch( - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(access_token=access_token, _strict_response_validation=True) assert client.base_url == "http://localhost:5000/from/env/" @pytest.mark.parametrize( @@ -1598,15 +1394,11 @@ def test_base_url_env(self) -> None: AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.AsyncClient(), ), @@ -1629,15 +1421,11 @@ def test_base_url_trailing_slash(self, client: AsyncFinch) -> None: AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.AsyncClient(), ), @@ -1660,15 +1448,11 @@ def test_base_url_no_trailing_slash(self, client: AsyncFinch) -> None: AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, ), AsyncFinch( base_url="http://localhost:5000/custom/path/", access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, http_client=httpx.AsyncClient(), ), @@ -1695,12 +1479,7 @@ def test_transport_option_is_deprecated(self) -> None: ) client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - transport=transport, + base_url=base_url, access_token=access_token, _strict_response_validation=True, transport=transport ) assert client._client._transport is transport @@ -1712,8 +1491,6 @@ async def test_transport_option_mutually_exclusive_with_http_client(self) -> Non AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, transport=httpx.MockTransport( lambda: None, # type: ignore @@ -1733,8 +1510,6 @@ def test_connection_pool_limits_option_is_deprecated(self) -> None: client = AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, connection_pool_limits=connection_pool_limits, ) @@ -1753,8 +1528,6 @@ async def test_connection_pool_limits_option_mutually_exclusive_with_http_client AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, connection_pool_limits=httpx.Limits( max_connections=101, max_keepalive_connections=76, keepalive_expiry=23 @@ -1770,12 +1543,7 @@ def test_proxies_option_is_deprecated(self) -> None: proxies = "https://www.example.com/proxy" client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - proxies=proxies, + base_url=base_url, access_token=access_token, _strict_response_validation=True, proxies=proxies ) mounts = list(client._client._mounts.keys()) @@ -1791,21 +1559,13 @@ async def test_proxies_option_mutually_exclusive_with_http_client(self) -> None: AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, proxies="https://www.example.com/proxy", http_client=http_client, ) async def test_copied_client_does_not_close_http(self) -> None: - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) assert not client.is_closed() copied = client.copy() @@ -1817,13 +1577,7 @@ async def test_copied_client_does_not_close_http(self) -> None: assert not client.is_closed() async def test_client_context_manager(self) -> None: - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) async with client as c2: assert c2 is client assert not c2.is_closed() @@ -1848,8 +1602,6 @@ async def test_client_max_retries_validation(self) -> None: AsyncFinch( base_url=base_url, access_token=access_token, - client_id=client_id, - client_secret=client_secret, _strict_response_validation=True, max_retries=cast(Any, None), ) @@ -1862,24 +1614,12 @@ class Model(BaseModel): respx_mock.get("/foo").mock(return_value=httpx.Response(200, text="my-custom-format")) - strict_client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + strict_client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) with pytest.raises(APIResponseValidationError): await strict_client.get("/foo", cast_to=Model) - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=False, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=False) response = await client.get("/foo", cast_to=Model) assert isinstance(response, str) # type: ignore[unreachable] @@ -1907,13 +1647,7 @@ class Model(BaseModel): @mock.patch("time.time", mock.MagicMock(return_value=1696004797)) @pytest.mark.asyncio async def test_parse_retry_after_header(self, remaining_retries: int, retry_after: str, timeout: float) -> None: - client = AsyncFinch( - base_url=base_url, - access_token=access_token, - client_id=client_id, - client_secret=client_secret, - _strict_response_validation=True, - ) + client = AsyncFinch(base_url=base_url, access_token=access_token, _strict_response_validation=True) headers = httpx.Headers({"retry-after": retry_after}) options = FinalRequestOptions(method="get", url="/foo", max_retries=3)