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

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

@@ -5,6 +5,18 @@ 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
+
+- support codeocean 0.13 and reuse only the caller's own captures
+
 ## v0.2.0 (2026-10-15)
 
 ### Feat

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: aind-codeocean-dispatch
-Version: 0.2.0
+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
@@ -12,7 +12,7 @@ License-File: LICENSE
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.11
 Requires-Dist: aind-code-ocean-pipeline-utils>=0.7.1
-Requires-Dist: codeocean>=0.17
+Requires-Dist: codeocean>=0.13
 Description-Content-Type: text/markdown
 
 # AIND Code Ocean dispatch

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

@@ -13,11 +13,11 @@ authors = [
 ]
 classifiers = ["Programming Language :: Python :: 3"]
 readme = "README.md"
-version = "0.2.0"
+version = "0.2.2"
 
 dependencies = [
     "aind-code-ocean-pipeline-utils>=0.7.1",
-    "codeocean>=0.17",
+    "codeocean>=0.13",
 ]
 
 [project.urls]

{aind_codeocean_dispatch-0.2.0 → 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.
@@ -33,9 +35,13 @@ from typing import TYPE_CHECKING, Any, Literal, TypeVar
 import requests
 from aind_code_ocean_pipeline_utils.cache import input_fingerprint
 from aind_code_ocean_pipeline_utils.process import GracefulExit, check_shutdown
+
+# Import paths that exist across supported SDK versions; 0.17 moved the models to
+# ``codeocean.models`` and kept these as re-exports.
+from codeocean.components import Ownership
+from codeocean.computation import Computation, ComputationEndStatus, ComputationState, RunParams
+from codeocean.data_asset import DataAsset, DataAssetParams, DataAssetSearchParams, DataAssetState
 from codeocean.error import Error as CodeOceanError
-from codeocean.models.computation import Computation, ComputationEndStatus, ComputationState, RunParams
-from codeocean.models.data_asset import DataAsset, DataAssetParams, DataAssetSearchParams, DataAssetState
 
 if TYPE_CHECKING:
     from codeocean import CodeOcean
@@ -88,8 +94,8 @@ class Job:
         can depend on it. ``None`` stops at a successful computation.
     key : str, optional
         Resume key (see :func:`job_key`), added to the captured asset as
-        :func:`key_tag`. With ``reuse=True``, a Ready asset carrying it is returned
-        instead of launching. ``None`` never reuses.
+        :func:`key_tag`. With ``reuse=True``, a Ready asset carrying it that the
+        caller created is returned instead of launching. ``None`` never reuses.
     """
 
     label: str
@@ -228,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
@@ -243,7 +250,9 @@ def run_jobs(
     capture_retries : int, optional
         New capture attempts per job after a capture ends in the Failed state.
     reuse : bool, optional
-        Return a Ready asset tagged with a job's key instead of launching it.
+        Return a Ready asset tagged with a job's key instead of launching it. Only
+        assets the caller created count: another user running identical inputs
+        produces the same key, and their asset is not the caller's to consume.
     poll_interval_s : float, optional
         Seconds between status checks of each running computation.
     timeout_s : float, optional
@@ -265,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,
@@ -278,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):
@@ -479,7 +500,7 @@ class _Dispatcher:
             if slot.next_at > _now():
                 continue
             tag = key_tag(slot.job.key)
-            params = DataAssetSearchParams(query=f"tag:{tag}", limit=100)
+            params = DataAssetSearchParams(query=f"tag:{tag}", ownership=Ownership.Created, limit=100)
             try:
                 results = self.client.data_assets.search_data_assets(params)
             except (CodeOceanError, requests.RequestException) as exc:

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

@@ -8,14 +8,14 @@ creation order.
 
 from __future__ import annotations
 
+import dataclasses
 import itertools
 from dataclasses import dataclass, field
 from typing import Any
 
 import requests
-from codeocean.error import Error as CodeOceanError
-from codeocean.models.computation import Computation, ComputationEndStatus, ComputationState, RunParams
-from codeocean.models.data_asset import (
+from codeocean.computation import Computation, ComputationEndStatus, ComputationState, RunParams
+from codeocean.data_asset import (
     DataAsset,
     DataAssetParams,
     DataAssetSearchParams,
@@ -23,6 +23,16 @@ from codeocean.models.data_asset import (
     DataAssetState,
     DataAssetType,
 )
+from codeocean.error import Error as CodeOceanError
+
+
+def build(cls: Any, **values: Any) -> Any:
+    """Construct an SDK model, dropping fields this SDK version does not declare.
+
+    Required fields differ across supported versions (0.17 added ``owner``).
+    """
+    declared = {f.name for f in dataclasses.fields(cls)}
+    return cls(**{name: value for name, value in values.items() if name in declared})
 
 
 class FakeClock:
@@ -69,7 +79,8 @@ CRASHED = snapshot(ComputationState.Completed, end_status=ComputationEndStatus.F
 
 
 def asset(asset_id: str, state: DataAssetState, *, tags: list[str] | None = None, created: int = 0) -> DataAsset:
-    return DataAsset(
+    return build(
+        DataAsset,
         id=asset_id,
         created=created,
         name=asset_id,
@@ -115,7 +126,7 @@ class FakeComputations:
 
     @staticmethod
     def _computation(computation_id: str, step: dict[str, Any]) -> Computation:
-        return Computation(id=computation_id, created=0, name=computation_id, owner="owner", run_time=0, **step)
+        return build(Computation, id=computation_id, created=0, name=computation_id, owner="owner", run_time=0, **step)
 
 
 @dataclass
@@ -125,7 +136,7 @@ class FakeDataAssets:
     existing: list[DataAsset] = field(default_factory=list)
     search_errors: list[Exception] = field(default_factory=list)
     created: list[DataAssetParams] = field(default_factory=list)
-    searches: list[str] = field(default_factory=list)
+    searches: list[DataAssetSearchParams] = field(default_factory=list)
     _scripts: dict[str, list[Any]] = field(default_factory=dict)
 
     def create_data_asset(self, data_asset_params: DataAssetParams) -> DataAsset:
@@ -145,7 +156,7 @@ class FakeDataAssets:
         return asset(data_asset_id, step)
 
     def search_data_assets(self, search_params: DataAssetSearchParams) -> DataAssetSearchResults:
-        self.searches.append(search_params.query)
+        self.searches.append(search_params)
         if self.search_errors:
             raise self.search_errors.pop(0)
         return DataAssetSearchResults(has_more=False, results=list(self.existing))
@@ -155,3 +166,4 @@ class FakeDataAssets:
 class FakeClient:
     computations: FakeComputations
     data_assets: FakeDataAssets
+    retries: Any = 0

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

@@ -5,8 +5,11 @@ from typing import Any
 import pytest
 import requests
 from aind_code_ocean_pipeline_utils.process import GracefulExit
-from codeocean.models.computation import Computation, DataAssetsRunParam, NamedRunParam, RunParams
-from codeocean.models.data_asset import DataAssetParams, DataAssetState
+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,
@@ -255,6 +258,8 @@ def test_reuse_returns_newest_ready_asset_with_exact_tag(clock: FakeClock) -> No
     assert outcome.status == "reused"
     assert outcome.asset_id == "new"
     assert client.computations.launches == []
+    (search,) = client.data_assets.searches
+    assert search.ownership == Ownership.Created
 
 
 def test_reuse_launches_when_nothing_matches(clock: FakeClock) -> None:
@@ -312,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.0 → aind_codeocean_dispatch-0.2.2}/uv.lock

@@ -17,7 +17,7 @@ wheels = [
 
 [[package]]
 name = "aind-codeocean-dispatch"
-version = "0.2.0"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "aind-code-ocean-pipeline-utils" },
@@ -50,7 +50,7 @@ types = [
 [package.metadata]
 requires-dist = [
     { name = "aind-code-ocean-pipeline-utils", specifier = ">=0.7.1" },
-    { name = "codeocean", specifier = ">=0.17" },
+    { name = "codeocean", specifier = ">=0.13" },
 ]
 
 [package.metadata.requires-dev]