Skip to content

fix: grab the first value if the server response contains a comma #482

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
baywet merged 5 commits into from
Jun 27, 2025
Merged

fix: grab the first value if the server response contains a comma #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e8a824
fix: grab the first value if the serve response contains a comma
MarcoP9 Jun 23, 2025
9e3b597
test: Add test on the retry handler when handling comma separated values
MarcoP9 Jun 25, 2025
a334ac9
fix: make the comma check more specific through a regex
MarcoP9 Jun 26, 2025
a741917
Merge branch 'main' into bugfix/retry_handler
baywet Jun 26, 2025
47d62b6
chore: relaxes regex
baywet Jun 27, 2025
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
4 changes: 4 additions & 0 deletions packages/http/httpx/kiota_http/middleware/retry_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import datetime
import random
import re
import time
from email.utils import parsedate_to_datetime

Expand Down Expand Up @@ -202,6 +203,9 @@ def _parse_retry_after(self, retry_after):
Helper to parse Retry-After and get value in seconds.
"""
try:
retry_after = retry_after.split(",")[0] if re.match(
r"\d+,\d+$", retry_after
) else retry_after
delay = int(retry_after)
except ValueError:
# Not an integer? Try HTTP date
Expand Down
10 changes: 10 additions & 0 deletions packages/http/httpx/tests/middleware_tests/test_retry_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ def test_get_retry_after_no_header():
assert retry_handler._get_retry_after(response) is None


def test_get_retry_after_string_with_comma():
"""
Test the _get_retry_after method with string 30,120 as Retry-After value.
"""
response = httpx.Response(TOO_MANY_REQUESTS, headers={RETRY_AFTER: f'30,120'})

retry_handler = RetryHandler()
assert retry_handler._get_retry_after(response) == 30


def test_get_retry_after_http_date():
"""
Test the _get_retry_after method with a http date as Retry-After value.
Expand Down