Skip to content

Fix async retry #2630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Badiboy merged 2 commits into from
Sep 19, 2026
Merged

Fix async retry #2630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a07f98
Fix https://github.com/eternnoir/pyTelegramBotAPI/pull/2599
Badiboy Sep 18, 2026
834e5ca
MAX_RETRIES set to 3 both for sync/async
Badiboy Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion telebot/apihelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def _get_multipart_header_formatter(urllib3_fields):

RETRY_ON_ERROR = False
RETRY_TIMEOUT = 2
MAX_RETRIES = 15
MAX_RETRIES = 3
RETRY_ENGINE = 1

CUSTOM_SERIALIZER = None
Expand Down
30 changes: 16 additions & 14 deletions telebot/asyncio_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
FILE_URL = None

REQUEST_TIMEOUT = 300
RETRY_ON_ERROR = False
RETRY_TIMEOUT = 2

@coder2020official coder2020official Sep 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

retry_delay?

MAX_RETRIES = 3

REQUEST_LIMIT = 50
Expand Down Expand Up @@ -90,28 +92,28 @@ async def _process_request(token, url, method='get', params=None, files=None, **
params = _prepare_data(params, files)

timeout = aiohttp.ClientTimeout(total=request_timeout)
got_result = False
current_try=0
max_attempts = max(1, MAX_RETRIES if RETRY_ON_ERROR else 1)
last_error = None
session = await session_manager.get_session()
while not got_result and current_try<MAX_RETRIES-1:
current_try +=1
for current_try in range(1, max_attempts + 1):
Comment thread
Badiboy marked this conversation as resolved.
try:
async with session.request(method=method, url=API_URL.format(token, url), data=params, timeout=timeout, proxy=proxy) as resp:
got_result = True
logger.debug("Request: method={0} url={1} params={2} files={3} request_timeout={4} current_try={5}".format(method, url, params, files, request_timeout, current_try).replace(token, token.split(':')[0] + ":{TOKEN}"))

json_result = await _check_result(url, resp)
if json_result:
return json_result['result']
except (ApiTelegramException,ApiInvalidJSONException, ApiHTTPException) as e:
raise e
except aiohttp.ClientError as e:
logger.error('Aiohttp ClientError: {0}'.format(e.__class__.__name__))
except Exception as e:
logger.error(f'Unknown error: {e.__class__.__name__}')
if not got_result:
raise RequestTimeout("Request timeout. Request: method={0} url={1} params={2} files={3} request_timeout={4}".format(method, url, params, files, request_timeout, current_try))
return None
return None
except (aiohttp.ClientError, asyncio.TimeoutError) as e:
last_error = e
logger.error('Aiohttp request error: {0} (try #{1})'.format(e.__class__.__name__, current_try))

if current_try == max_attempts:
break

await asyncio.sleep(RETRY_TIMEOUT)

raise RequestTimeout("Request timeout. Request: method={0} url={1} params={2} files={3} request_timeout={4} current_try={5}".format(method, url, params, files, request_timeout, current_try)) from last_error

def _prepare_file(obj):
"""
Expand Down
Loading