9
9
import inspect
10
10
import logging
11
11
import platform
12
- import warnings
13
12
import email .utils
14
13
from types import TracebackType
15
14
from random import random
36
35
import httpx
37
36
import distro
38
37
import pydantic
39
- from httpx import URL , Limits
38
+ from httpx import URL
40
39
from pydantic import PrivateAttr
41
40
42
41
from . import _exceptions
51
50
Timeout ,
52
51
NotGiven ,
53
52
ResponseT ,
54
- Transport ,
55
53
AnyMapping ,
56
54
PostParser ,
57
- ProxiesTypes ,
58
55
RequestFiles ,
59
56
HttpxSendArgs ,
60
- AsyncTransport ,
61
57
RequestOptions ,
62
58
HttpxRequestFiles ,
63
59
ModelBuilderProtocol ,
@@ -337,9 +333,6 @@ class BaseClient(Generic[_HttpxClientT, _DefaultStreamT]):
337
333
_base_url : URL
338
334
max_retries : int
339
335
timeout : Union [float , Timeout , None ]
340
- _limits : httpx .Limits
341
- _proxies : ProxiesTypes | None
342
- _transport : Transport | AsyncTransport | None
343
336
_strict_response_validation : bool
344
337
_idempotency_header : str | None
345
338
_default_stream_cls : type [_DefaultStreamT ] | None = None
@@ -352,19 +345,13 @@ def __init__(
352
345
_strict_response_validation : bool ,
353
346
max_retries : int = DEFAULT_MAX_RETRIES ,
354
347
timeout : float | Timeout | None = DEFAULT_TIMEOUT ,
355
- limits : httpx .Limits ,
356
- transport : Transport | AsyncTransport | None ,
357
- proxies : ProxiesTypes | None ,
358
348
custom_headers : Mapping [str , str ] | None = None ,
359
349
custom_query : Mapping [str , object ] | None = None ,
360
350
) -> None :
361
351
self ._version = version
362
352
self ._base_url = self ._enforce_trailing_slash (URL (base_url ))
363
353
self .max_retries = max_retries
364
354
self .timeout = timeout
365
- self ._limits = limits
366
- self ._proxies = proxies
367
- self ._transport = transport
368
355
self ._custom_headers = custom_headers or {}
369
356
self ._custom_query = custom_query or {}
370
357
self ._strict_response_validation = _strict_response_validation
@@ -800,46 +787,11 @@ def __init__(
800
787
base_url : str | URL ,
801
788
max_retries : int = DEFAULT_MAX_RETRIES ,
802
789
timeout : float | Timeout | None | NotGiven = NOT_GIVEN ,
803
- transport : Transport | None = None ,
804
- proxies : ProxiesTypes | None = None ,
805
- limits : Limits | None = None ,
806
790
http_client : httpx .Client | None = None ,
807
791
custom_headers : Mapping [str , str ] | None = None ,
808
792
custom_query : Mapping [str , object ] | None = None ,
809
793
_strict_response_validation : bool ,
810
794
) -> None :
811
- kwargs : dict [str , Any ] = {}
812
- if limits is not None :
813
- warnings .warn (
814
- "The `connection_pool_limits` argument is deprecated. The `http_client` argument should be passed instead" ,
815
- category = DeprecationWarning ,
816
- stacklevel = 3 ,
817
- )
818
- if http_client is not None :
819
- raise ValueError ("The `http_client` argument is mutually exclusive with `connection_pool_limits`" )
820
- else :
821
- limits = DEFAULT_CONNECTION_LIMITS
822
-
823
- if transport is not None :
824
- kwargs ["transport" ] = transport
825
- warnings .warn (
826
- "The `transport` argument is deprecated. The `http_client` argument should be passed instead" ,
827
- category = DeprecationWarning ,
828
- stacklevel = 3 ,
829
- )
830
- if http_client is not None :
831
- raise ValueError ("The `http_client` argument is mutually exclusive with `transport`" )
832
-
833
- if proxies is not None :
834
- kwargs ["proxies" ] = proxies
835
- warnings .warn (
836
- "The `proxies` argument is deprecated. The `http_client` argument should be passed instead" ,
837
- category = DeprecationWarning ,
838
- stacklevel = 3 ,
839
- )
840
- if http_client is not None :
841
- raise ValueError ("The `http_client` argument is mutually exclusive with `proxies`" )
842
-
843
795
if not is_given (timeout ):
844
796
# if the user passed in a custom http client with a non-default
845
797
# timeout set then we use that timeout.
@@ -860,12 +812,9 @@ def __init__(
860
812
861
813
super ().__init__ (
862
814
version = version ,
863
- limits = limits ,
864
815
# cast to a valid type because mypy doesn't understand our type narrowing
865
816
timeout = cast (Timeout , timeout ),
866
- proxies = proxies ,
867
817
base_url = base_url ,
868
- transport = transport ,
869
818
max_retries = max_retries ,
870
819
custom_query = custom_query ,
871
820
custom_headers = custom_headers ,
@@ -875,9 +824,6 @@ def __init__(
875
824
base_url = base_url ,
876
825
# cast to a valid type because mypy doesn't understand our type narrowing
877
826
timeout = cast (Timeout , timeout ),
878
- limits = limits ,
879
- follow_redirects = True ,
880
- ** kwargs , # type: ignore
881
827
)
882
828
883
829
def is_closed (self ) -> bool :
@@ -1372,45 +1318,10 @@ def __init__(
1372
1318
_strict_response_validation : bool ,
1373
1319
max_retries : int = DEFAULT_MAX_RETRIES ,
1374
1320
timeout : float | Timeout | None | NotGiven = NOT_GIVEN ,
1375
- transport : AsyncTransport | None = None ,
1376
- proxies : ProxiesTypes | None = None ,
1377
- limits : Limits | None = None ,
1378
1321
http_client : httpx .AsyncClient | None = None ,
1379
1322
custom_headers : Mapping [str , str ] | None = None ,
1380
1323
custom_query : Mapping [str , object ] | None = None ,
1381
1324
) -> None :
1382
- kwargs : dict [str , Any ] = {}
1383
- if limits is not None :
1384
- warnings .warn (
1385
- "The `connection_pool_limits` argument is deprecated. The `http_client` argument should be passed instead" ,
1386
- category = DeprecationWarning ,
1387
- stacklevel = 3 ,
1388
- )
1389
- if http_client is not None :
1390
- raise ValueError ("The `http_client` argument is mutually exclusive with `connection_pool_limits`" )
1391
- else :
1392
- limits = DEFAULT_CONNECTION_LIMITS
1393
-
1394
- if transport is not None :
1395
- kwargs ["transport" ] = transport
1396
- warnings .warn (
1397
- "The `transport` argument is deprecated. The `http_client` argument should be passed instead" ,
1398
- category = DeprecationWarning ,
1399
- stacklevel = 3 ,
1400
- )
1401
- if http_client is not None :
1402
- raise ValueError ("The `http_client` argument is mutually exclusive with `transport`" )
1403
-
1404
- if proxies is not None :
1405
- kwargs ["proxies" ] = proxies
1406
- warnings .warn (
1407
- "The `proxies` argument is deprecated. The `http_client` argument should be passed instead" ,
1408
- category = DeprecationWarning ,
1409
- stacklevel = 3 ,
1410
- )
1411
- if http_client is not None :
1412
- raise ValueError ("The `http_client` argument is mutually exclusive with `proxies`" )
1413
-
1414
1325
if not is_given (timeout ):
1415
1326
# if the user passed in a custom http client with a non-default
1416
1327
# timeout set then we use that timeout.
@@ -1432,11 +1343,8 @@ def __init__(
1432
1343
super ().__init__ (
1433
1344
version = version ,
1434
1345
base_url = base_url ,
1435
- limits = limits ,
1436
1346
# cast to a valid type because mypy doesn't understand our type narrowing
1437
1347
timeout = cast (Timeout , timeout ),
1438
- proxies = proxies ,
1439
- transport = transport ,
1440
1348
max_retries = max_retries ,
1441
1349
custom_query = custom_query ,
1442
1350
custom_headers = custom_headers ,
@@ -1446,9 +1354,6 @@ def __init__(
1446
1354
base_url = base_url ,
1447
1355
# cast to a valid type because mypy doesn't understand our type narrowing
1448
1356
timeout = cast (Timeout , timeout ),
1449
- limits = limits ,
1450
- follow_redirects = True ,
1451
- ** kwargs , # type: ignore
1452
1357
)
1453
1358
1454
1359
def is_closed (self ) -> bool :
0 commit comments