Skip to content

BF: Seek file data to 0 before every retry in request(), not just for retryable status codes #1824

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
yarikoptic merged 2 commits into from
Mar 30, 2026
+9 −2
Merged

BF: Seek file data to 0 before every retry in request(), not just for retryable status codes #1824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a35018
BF: Seek file data to 0 before every retry in request(), not just for…
yarikoptic Mar 25, 2026
d7d5dd4
Merge branch 'master' into bf-zarr-upload2
CodyCBakerPhD Mar 30, 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
11 changes: 9 additions & 2 deletions dandi/dandiapi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@ def request(

lgr.debug("%s %s", method.upper(), url)

def _rewind_data(retry_state: tenacity.RetryCallState) -> None:
# After a failed attempt (ConnectionError mid-upload, HTTPError,
# etc.), the file pointer may be at an arbitrary position. Seek
# back to 0 so the next attempt sends the complete body.
# See https://github.com/dandi/dandi-cli/issues/1821
if data is not None and hasattr(data, "seek"):
data.seek(0)

try:
for i, attempt in enumerate(
tenacity.Retrying(
Expand All @@ -225,6 +233,7 @@ def request(
),
stop=tenacity.stop_after_attempt(REQUEST_RETRIES),
reraise=True,
before_sleep=_rewind_data,
)
):
with attempt:
Expand All @@ -249,8 +258,6 @@ def request(
url,
result.text,
)
if data is not None and hasattr(data, "seek"):
data.seek(0)
if retry_after := get_retry_after(result):
lgr.debug(
"Sleeping for %d seconds as instructed in response "
Expand Down
Loading