Skip to content

Commit 1311f2c

Browse files
authored
V1: Remove errors when passing Retrying instead of RetryConfig to TenacityTransport (#2717)
1 parent ac18492 commit 1311f2c

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

pydantic_ai_slim/pydantic_ai/retries.py

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
)
2525

2626
try:
27-
from tenacity import AsyncRetrying, RetryCallState, RetryError, Retrying, retry, wait_exponential
27+
from tenacity import RetryCallState, RetryError, retry, wait_exponential
2828
except ImportError as _import_error:
2929
raise ImportError(
3030
'Please install `tenacity` to use the retries utilities, '
@@ -34,7 +34,7 @@
3434
from collections.abc import Awaitable, Callable
3535
from datetime import datetime, timezone
3636
from email.utils import parsedate_to_datetime
37-
from typing import TYPE_CHECKING, Any, NoReturn, cast
37+
from typing import TYPE_CHECKING, Any, cast
3838

3939
from typing_extensions import TypedDict
4040

@@ -157,18 +157,7 @@ def __init__(
157157
config: RetryConfig,
158158
wrapped: BaseTransport | None = None,
159159
validate_response: Callable[[Response], Any] | None = None,
160-
**kwargs: NoReturn,
161160
):
162-
# TODO: Remove the following checks (and **kwargs) during v1 release
163-
if 'controller' in kwargs: # pragma: no cover
164-
raise TypeError('The `controller` argument has been renamed to `config`, and now requires a `RetryConfig`.')
165-
if kwargs: # pragma: no cover
166-
raise TypeError(f'Unexpected keyword arguments: {", ".join(kwargs)}')
167-
if isinstance(config, Retrying): # pragma: no cover
168-
raise ValueError(
169-
'Passing a Retrying instance is no longer supported; the `config` argument must be a `pydantic_ai.retries.RetryConfig`.'
170-
)
171-
172161
self.config = config
173162
self.wrapped = wrapped or HTTPTransport()
174163
self.validate_response = validate_response
@@ -245,18 +234,7 @@ def __init__(
245234
config: RetryConfig,
246235
wrapped: AsyncBaseTransport | None = None,
247236
validate_response: Callable[[Response], Any] | None = None,
248-
**kwargs: NoReturn,
249237
):
250-
# TODO: Remove the following checks (and **kwargs) during v1 release
251-
if 'controller' in kwargs: # pragma: no cover
252-
raise TypeError('The `controller` argument has been renamed to `config`, and now requires a `RetryConfig`.')
253-
if kwargs: # pragma: no cover
254-
raise TypeError(f'Unexpected keyword arguments: {", ".join(kwargs)}')
255-
if isinstance(config, AsyncRetrying): # pragma: no cover
256-
raise ValueError(
257-
'Passing an AsyncRetrying instance is no longer supported; the `config` argument must be a `pydantic_ai.retries.RetryConfig`.'
258-
)
259-
260238
self.config = config
261239
self.wrapped = wrapped or AsyncHTTPTransport()
262240
self.validate_response = validate_response

0 commit comments

Comments
 (0)