aind-codeocean-dispatch 0.2.1__tar.gz → 0.2.2__tar.gz

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## v0.2.2 (2026-10-15)
+
+### Fix
+
+- run on a non-retrying copy of the caller's client
+
 ## v0.2.1 (2026-10-15)
 
 ### Fix

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aind-codeocean-dispatch
-Version: 0.2.1
+Version: 0.2.2
 Summary: Launch, monitor, and capture batches of Code Ocean capsule runs
 Project-URL: Repository, https://github.com/AllenNeuralDynamics/aind-codeocean-dispatch/
 Project-URL: Issues, https://github.com/AllenNeuralDynamics/aind-codeocean-dispatch/issues

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/pyproject.toml

@@ -13,7 +13,7 @@ authors = [
 ]
 classifiers = ["Programming Language :: Python :: 3"]
 readme = "README.md"
-version = "0.2.1"
+version = "0.2.2"
 
 dependencies = [
     "aind-code-ocean-pipeline-utils>=0.7.1",

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/src/aind_codeocean_dispatch/runner.py

@@ -6,7 +6,9 @@ counters rather than locks, and no thread is parked per job.
 
 Error policy
 ------------
-The SDK's client retries nothing by default, so every 429 or 5xx surfaces here.
+Every 429 or 5xx must surface here, so :func:`run_jobs` works on a copy of the
+client with ``retries=0``: transport-level retries would resend POSTs below this
+policy, and their exhausted retries raise without the status code it reads.
 
 - **429** is retried on every call, honouring ``Retry-After``: the server rejected
   the request without acting on it.
@@ -232,7 +234,8 @@ def run_jobs(
     Parameters
     ----------
     client : CodeOcean
-        Authenticated client.
+        Authenticated client. Its own ``retries`` setting is overridden on a copy;
+        the caller's client is left unchanged.
     jobs : Sequence[Job]
         Launched in order, subject to the cap and pacing.
     max_in_flight : int, optional
@@ -271,7 +274,7 @@ def run_jobs(
     """
     _validate(jobs, max_in_flight=max_in_flight, start_retries=start_retries, capture_retries=capture_retries)
     return _Dispatcher(
-        client,
+        _without_transport_retries(client),
         jobs,
         max_in_flight=max_in_flight,
         launch_interval_s=launch_interval_s,
@@ -284,6 +287,18 @@ def run_jobs(
     ).run()
 
 
+def _without_transport_retries(client: CodeOcean) -> CodeOcean:
+    """Return *client*, or a copy with ``retries=0`` if it retries requests itself.
+
+    The copy opens a new session, so anything mounted on the original's ``session``
+    by hand is not carried over.
+    """
+    if client.retries in (0, None):
+        return client
+    logger.info("using a copy of the client with retries=0 (was %r); run_jobs retries what is safe", client.retries)
+    return dataclasses.replace(client, retries=0)
+
+
 def _validate(jobs: Sequence[Job], *, max_in_flight: int | None, start_retries: int, capture_retries: int) -> None:
     labels = [job.label for job in jobs]
     if len(set(labels)) != len(labels):

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/tests/fakes.py

@@ -166,3 +166,4 @@ class FakeDataAssets:
 class FakeClient:
     computations: FakeComputations
     data_assets: FakeDataAssets
+    retries: Any = 0

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/tests/test_runner.py

@@ -5,9 +5,11 @@ from typing import Any
 import pytest
 import requests
 from aind_code_ocean_pipeline_utils.process import GracefulExit
+from codeocean import CodeOcean
 from codeocean.components import Ownership
 from codeocean.computation import Computation, DataAssetsRunParam, NamedRunParam, RunParams
 from codeocean.data_asset import DataAssetParams, DataAssetState
+from urllib3.util import Retry
 
 from aind_codeocean_dispatch import (
     DispatchFailed,
@@ -315,6 +317,33 @@ def test_duplicate_labels_are_rejected(clock: FakeClock) -> None:
         run_jobs(make_client(clock, {}), [job("a"), job("a")])
 
 
+@pytest.mark.parametrize("retries", [3, Retry(total=5, allowed_methods=["POST"])])
+def test_client_that_retries_itself_still_runs(clock: FakeClock, retries: Any) -> None:
+    client = make_client(clock, {"a": [[SUCCEEDED]]})
+    client.retries = retries
+
+    outcomes = run_jobs(client, [job("a")])
+
+    assert [o.status for o in outcomes] == ["captured"]
+    assert client.retries is retries
+
+
+def test_retrying_client_is_copied_without_retries() -> None:
+    original = CodeOcean(domain="https://codeocean.example", token="x", retries=Retry(total=5))
+
+    copy = runner._without_transport_retries(original)
+
+    assert copy is not original and copy.session is not original.session
+    assert (copy.retries, copy.domain, copy.token) == (0, original.domain, original.token)
+    assert isinstance(original.retries, Retry)
+
+
+def test_non_retrying_client_is_used_as_is() -> None:
+    client = CodeOcean(domain="https://codeocean.example", token="x")
+
+    assert runner._without_transport_retries(client) is client
+
+
 def test_invalid_key_is_rejected() -> None:
     with pytest.raises(ValueError, match="key"):
         job("a", key="has space")

{aind_codeocean_dispatch-0.2.1 → aind_codeocean_dispatch-0.2.2}/uv.lock

@@ -17,7 +17,7 @@ wheels = [
 
 [[package]]
 name = "aind-codeocean-dispatch"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "aind-code-ocean-pipeline-utils" },