Skip to content

Commit 09df149

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 97b78d0 commit 09df149

3 files changed

Lines changed: 25 additions & 25 deletions

File tree

studio/backend/hub/services/download_lifecycle.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,7 @@ def finalize_worker_exit(
277277

278278

279279
def _set_job_transport(
280-
registry: download_registry.DownloadRegistry,
281-
key: str,
282-
transport: str,
280+
registry: download_registry.DownloadRegistry, key: str, transport: str
283281
) -> None:
284282
with registry._lock:
285283
metadata = registry._metadata.get(key)
@@ -375,7 +373,9 @@ def _try_http_retry(
375373
replace_active = True,
376374
)
377375
if not claimed:
378-
logger.debug("%s XET retry claim rejected for %s; another job took the slot", log_prefix, label)
376+
logger.debug(
377+
"%s XET retry claim rejected for %s; another job took the slot", log_prefix, label
378+
)
379379
_set_retry_failure_state(
380380
registry,
381381
key,
@@ -492,7 +492,8 @@ def _watch() -> None:
492492
transport == download_registry.TRANSPORT_XET
493493
and download_registry.download_transport_unavailable_reason(
494494
download_registry.TRANSPORT_HTTP
495-
) is None
495+
)
496+
is None
496497
)
497498
state = finalize_worker_exit(
498499
registry,
@@ -511,10 +512,7 @@ def _watch() -> None:
511512
# HTTP is available, attempt one automatic retry over HTTP. The
512513
# transport check is the recursion guard: an HTTP worker that errors
513514
# never satisfies `transport == TRANSPORT_XET`, so it stays terminal.
514-
if (
515-
can_retry_http
516-
and state == "error"
517-
):
515+
if can_retry_http and state == "error":
518516
_try_http_retry(
519517
registry,
520518
key,

studio/backend/hub/tests/test_download_lifecycle.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def _set_xet_reason(monkeypatch, reason):
1717
)
1818

1919

20-
def _make_proc(rc, stderr=b""):
20+
def _make_proc(rc, stderr = b""):
2121
class _Proc:
2222
pid = 4242
2323

@@ -63,7 +63,9 @@ def test_resolve_effective_use_xet_downgrades_when_xet_unavailable(monkeypatch):
6363
assert download_lifecycle.resolve_effective_use_xet(True) is False
6464

6565

66-
def test_download_watcher_retries_xet_failure_over_http_for_model_and_dataset(monkeypatch, tmp_path):
66+
def test_download_watcher_retries_xet_failure_over_http_for_model_and_dataset(
67+
monkeypatch, tmp_path
68+
):
6769
monkeypatch.setattr(state_dir, "cache_root", lambda: tmp_path / "state")
6870
monkeypatch.setattr(download_lifecycle.threading, "Thread", _ImmediateThread)
6971
real_register_worker = download_lifecycle.register_worker
@@ -127,7 +129,13 @@ def fake_completed_blob_bytes(*args):
127129
baseline_calls.append(args)
128130
return retry_baseline_bytes
129131

130-
def fake_spawn_worker(args, hf_token, *, use_xet, protected_blob_hashes = None):
132+
def fake_spawn_worker(
133+
args,
134+
hf_token,
135+
*,
136+
use_xet,
137+
protected_blob_hashes = None,
138+
):
131139
assert registry.get_job(key).state == "running"
132140
spawned.append((args, use_xet, protected_blob_hashes))
133141
return _make_proc(0, b"http retry")
@@ -155,7 +163,9 @@ def fake_register_worker(*_args, **kwargs):
155163
)
156164

157165
assert spawned == [(expected_args, False, None)]
158-
assert retry_registers and retry_registers[0]["transport"] == download_registry.TRANSPORT_HTTP
166+
assert (
167+
retry_registers and retry_registers[0]["transport"] == download_registry.TRANSPORT_HTTP
168+
)
159169
metadata = registry.get_job_metadata(key)
160170
assert metadata is not None
161171
assert metadata.transport == download_registry.TRANSPORT_HTTP
@@ -205,9 +215,7 @@ def fake_register_worker(*_args, **_kwargs):
205215
assert registry.get_job(key).state == "error"
206216

207217

208-
def test_download_watcher_restores_xet_transport_when_http_retry_spawn_fails(
209-
monkeypatch, tmp_path
210-
):
218+
def test_download_watcher_restores_xet_transport_when_http_retry_spawn_fails(monkeypatch, tmp_path):
211219
monkeypatch.setattr(state_dir, "cache_root", lambda: tmp_path / "state")
212220
monkeypatch.setattr(download_lifecycle.threading, "Thread", _ImmediateThread)
213221
real_register_worker = download_lifecycle.register_worker

studio/backend/hub/utils/download_registry.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -849,22 +849,16 @@ def set_job(
849849
self._jobs[key] = DownloadState(state, error)
850850

851851
def set_error_unless_cancelled(
852-
self,
853-
key: str,
854-
error: str,
852+
self, key: str, error: str
855853
) -> tuple[JobState, Optional[DownloadMetadata]]:
856854
key = normalize_job_key(key)
857855
with self._lock:
858856
current = self._jobs.get(key, DownloadState("idle")).state
859857
has_pending_cancel = key in self._pending_cancel
860858
pending_generation = self._pending_cancel.get(key)
861859
metadata = self._metadata.get(key)
862-
should_cancel = (
863-
current == "cancelling"
864-
or (
865-
has_pending_cancel
866-
and self._generation_matches_locked(key, pending_generation)
867-
)
860+
should_cancel = current == "cancelling" or (
861+
has_pending_cancel and self._generation_matches_locked(key, pending_generation)
868862
)
869863
terminal_state: JobState = "cancelled" if should_cancel else "error"
870864
self._put_terminal_job_locked(

0 commit comments

Comments
 (0)