Skip to content

Commit cc9cf08

Browse files
authored
fix(python): improve type annotation of the retries config key (#23590)
1 parent ef4f898 commit cc9cf08

File tree

7 files changed

+25
-10
lines changed

7 files changed

+25
-10
lines changed

modules/openapi-generator/src/main/resources/python/configuration.mustache

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{{>partial_header}}
22

3+
{{#asyncio}}
4+
import aiohttp_retry
5+
{{/asyncio}}
36
{{#async}}
47
import base64
58
{{/async}}
@@ -187,9 +190,12 @@ class Configuration:
187190
when calling API from https server.
188191
:param ssl_ca_cert: str - the path to a file of concatenated CA certificates
189192
in PEM format.
190-
{{#async}}
193+
{{#asyncio}}
191194
:param retries: int | aiohttp_retry.RetryOptionsBase - Retry configuration.
192-
{{/async}}
195+
{{/asyncio}}
196+
{{#httpx}}
197+
:param retries: int - Retry configuration.
198+
{{/httpx}}
193199
{{^async}}
194200
:param retries: int | urllib3.util.retry.Retry - Retry configuration.
195201
{{/async}}
@@ -312,7 +318,15 @@ conf = {{{packageName}}}.Configuration(
312318
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
313319
ignore_operation_servers: bool=False,
314320
ssl_ca_cert: Optional[str]=None,
315-
retries: Optional[Union[int, Any]] = None,
321+
{{#asyncio}}
322+
retries: Optional[Union[int, aiohttp_retry.RetryOptionsBase]] = None,
323+
{{/asyncio}}
324+
{{#httpx}}
325+
retries: Optional[int] = None,
326+
{{/httpx}}
327+
{{^async}}
328+
retries: Optional[Union[int, urllib3.util.retry.Retry]] = None,
329+
{{/async}}
316330
ca_cert_data: Optional[Union[str, bytes]] = None,
317331
cert_file: Optional[str]=None,
318332
key_file: Optional[str]=None,

samples/client/echo_api/python-disallowAdditionalPropertiesIfNotPresent/openapi_client/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def __init__(
213213
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
214214
ignore_operation_servers: bool=False,
215215
ssl_ca_cert: Optional[str]=None,
216-
retries: Optional[Union[int, Any]] = None,
216+
retries: Optional[Union[int, urllib3.util.retry.Retry]] = None,
217217
ca_cert_data: Optional[Union[str, bytes]] = None,
218218
cert_file: Optional[str]=None,
219219
key_file: Optional[str]=None,

samples/client/echo_api/python/openapi_client/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def __init__(
213213
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
214214
ignore_operation_servers: bool=False,
215215
ssl_ca_cert: Optional[str]=None,
216-
retries: Optional[Union[int, Any]] = None,
216+
retries: Optional[Union[int, urllib3.util.retry.Retry]] = None,
217217
ca_cert_data: Optional[Union[str, bytes]] = None,
218218
cert_file: Optional[str]=None,
219219
key_file: Optional[str]=None,

samples/openapi3/client/petstore/python-aiohttp/petstore_api/configuration.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
""" # noqa: E501
1111

1212

13+
import aiohttp_retry
1314
import base64
1415
import copy
1516
import http.client as httplib
@@ -277,7 +278,7 @@ def __init__(
277278
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
278279
ignore_operation_servers: bool=False,
279280
ssl_ca_cert: Optional[str]=None,
280-
retries: Optional[Union[int, Any]] = None,
281+
retries: Optional[Union[int, aiohttp_retry.RetryOptionsBase]] = None,
281282
ca_cert_data: Optional[Union[str, bytes]] = None,
282283
cert_file: Optional[str]=None,
283284
key_file: Optional[str]=None,

samples/openapi3/client/petstore/python-httpx/petstore_api/configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ class Configuration:
167167
when calling API from https server.
168168
:param ssl_ca_cert: str - the path to a file of concatenated CA certificates
169169
in PEM format.
170-
:param retries: int | aiohttp_retry.RetryOptionsBase - Retry configuration.
170+
:param retries: int - Retry configuration.
171171
:param ca_cert_data: verify the peer using concatenated CA certificate data
172172
in PEM (str) or DER (bytes) format.
173173
:param cert_file: the path to a client certificate file, for mTLS.
@@ -277,7 +277,7 @@ def __init__(
277277
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
278278
ignore_operation_servers: bool=False,
279279
ssl_ca_cert: Optional[str]=None,
280-
retries: Optional[Union[int, Any]] = None,
280+
retries: Optional[int] = None,
281281
ca_cert_data: Optional[Union[str, bytes]] = None,
282282
cert_file: Optional[str]=None,
283283
key_file: Optional[str]=None,

samples/openapi3/client/petstore/python-lazyImports/petstore_api/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def __init__(
278278
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
279279
ignore_operation_servers: bool=False,
280280
ssl_ca_cert: Optional[str]=None,
281-
retries: Optional[Union[int, Any]] = None,
281+
retries: Optional[Union[int, urllib3.util.retry.Retry]] = None,
282282
ca_cert_data: Optional[Union[str, bytes]] = None,
283283
cert_file: Optional[str]=None,
284284
key_file: Optional[str]=None,

samples/openapi3/client/petstore/python/petstore_api/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def __init__(
278278
server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None,
279279
ignore_operation_servers: bool=False,
280280
ssl_ca_cert: Optional[str]=None,
281-
retries: Optional[Union[int, Any]] = None,
281+
retries: Optional[Union[int, urllib3.util.retry.Retry]] = None,
282282
ca_cert_data: Optional[Union[str, bytes]] = None,
283283
cert_file: Optional[str]=None,
284284
key_file: Optional[str]=None,

0 commit comments

Comments
 (0)