aind-codeocean-dispatch 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

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.dist-info → aind_codeocean_dispatch-0.2.2.dist-info}/METADATA

@@ -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.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+aind_codeocean_dispatch/__init__.py,sha256=NcdbegNPvYKWVRArhlkdEL7HP9kof1OOiH8aRcrcszY,660
+aind_codeocean_dispatch/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+aind_codeocean_dispatch/runner.py,sha256=Zwfvt7NuLxrCrV6t8KPfgiqkdBlV8e6XlcXkkJKwKHk,25344
+aind_codeocean_dispatch-0.2.2.dist-info/METADATA,sha256=LMBckmvXZjxfWyeGaIw-siS4aDAYETmCEnVcWwVWYyg,2797
+aind_codeocean_dispatch-0.2.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+aind_codeocean_dispatch-0.2.2.dist-info/licenses/LICENSE,sha256=zMZxYbR1i_XxgyJP_rPSWKcxY7QtyxUOzbIpowHNjCs,1093
+aind_codeocean_dispatch-0.2.2.dist-info/RECORD,,

aind_codeocean_dispatch-0.2.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-aind_codeocean_dispatch/__init__.py,sha256=NcdbegNPvYKWVRArhlkdEL7HP9kof1OOiH8aRcrcszY,660
-aind_codeocean_dispatch/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-aind_codeocean_dispatch/runner.py,sha256=hMeVmd5v5bWCF_2CQYkNV5HzD_Ywn5eyORzNqQGkHA4,24178
-aind_codeocean_dispatch-0.2.0.dist-info/METADATA,sha256=vPbl6NmG66g2-gKqzmGsJkPIeP-wvb5K7ZaacsFL8Rc,2797
-aind_codeocean_dispatch-0.2.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-aind_codeocean_dispatch-0.2.0.dist-info/licenses/LICENSE,sha256=zMZxYbR1i_XxgyJP_rPSWKcxY7QtyxUOzbIpowHNjCs,1093
-aind_codeocean_dispatch-0.2.0.dist-info/RECORD,,