prefect-client 3.8.7.dev5__tar.gz → 3.8.7.dev7__tar.gz

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: prefect-client
-Version: 3.8.7.dev5
+Version: 3.8.7.dev7
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

prefect_client-3.8.7.dev7/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.8.7.dev7"
+__build_date__ = "2026-09-26 08:18:39.365341+00:00"
+__git_commit__ = "c24d832726a2347dd4df2b82b38226a7a994823d"
+__dirty__ = False

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/src/prefect/_internal/concurrency/cancellation.py

@@ -410,6 +410,11 @@ class WatcherThreadCancelScope(CancelScope):
     def __enter__(self):
         super().__enter__()
         self._event = threading.Event()
+        # Serializes exception delivery with the supervised thread's exit, so the
+        # exception is never injected into a thread that has already left the scope
+        # and is running arbitrary code.
+        self._exit_lock = threading.Lock()
+        self._exited = False
         self._enforcer_thread = None
         self._supervised_thread = threading.current_thread()
 
@@ -428,7 +433,9 @@ class WatcherThreadCancelScope(CancelScope):
         # this frame, so the event must be set from a `finally` to guarantee the
         # enforcer is always released.
         try:
-            retval = super().__exit__(*_)
+            with self._exit_lock:
+                self._exited = True
+                retval = super().__exit__(*_)
         finally:
             self._event.set()
             if self._enforcer_thread:
@@ -448,7 +455,13 @@ class WatcherThreadCancelScope(CancelScope):
                 self,
                 self._supervised_thread,
             )
-            with _get_thread_shield(self._supervised_thread):
+            # The shield is acquired before the exit lock: the supervised thread may
+            # exit the scope while shielded and must not wait on a lock held by a
+            # thread that is waiting for that shield.
+            with _get_thread_shield(self._supervised_thread), self._exit_lock:
+                if self._exited:
+                    logger.debug("%r already exited; not sending exception", self)
+                    return
                 try:
                     _send_exception_to_thread(self._supervised_thread, CancelledError)
                 except ValueError:
@@ -462,8 +475,7 @@ class WatcherThreadCancelScope(CancelScope):
         if not self._event.wait(self.timeout):
             logger.debug("%r enforcer detected timeout!", self)
             if self.cancel(throw=False):
-                with _get_thread_shield(self._supervised_thread):
-                    self._send_cancelled_error()
+                self._send_cancelled_error()
 
     def cancel(self, throw: bool = True):
         if not super().cancel():

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/src/prefect/flow_engine.py

@@ -930,9 +930,10 @@ class FlowRunEngine(BaseFlowRunEngine[P, R]):
         run, if appropriate.
 
         If the parent task run is in a final state, we return the existing
-        subflow run to avoid re-execution (unless the parent is being rerun
-        and the subflow did not complete, in which case a fresh run is
-        desired).
+        subflow run unless the parent is being rerun and the subflow either
+        did not complete or has no persisted result. In those cases a fresh
+        run gives the subflow its full retry budget while preserving the
+        previous run's history.
 
         If the parent task run is in a non-final state (e.g. still Running
         after a process restart), we also look for an existing subflow run
@@ -972,8 +973,18 @@ class FlowRunEngine(BaseFlowRunEngine[P, R]):
         )
         if flow_runs:
             loaded_flow_run = flow_runs[0]
-            # When the parent task run is final the subflow has already
-            # finished; cache the result so the engine skips re-execution.
+            if (
+                rerunning
+                and parent_task_run.state.is_completed()
+                and loaded_flow_run.state is not None
+                and loaded_flow_run.state.is_completed()
+                and loaded_flow_run.state.data is None
+            ):
+                # Without a persisted result the child must execute again. A
+                # fresh run preserves its history and restores its retry budget.
+                return None
+
+            # Keep the previous state available when reusing a finished run.
             if parent_task_run.state.is_final():
                 self._return_value = loaded_flow_run.state
             return loaded_flow_run
@@ -1638,9 +1649,10 @@ class AsyncFlowRunEngine(BaseFlowRunEngine[P, R]):
         run, if appropriate.
 
         If the parent task run is in a final state, we return the existing
-        subflow run to avoid re-execution (unless the parent is being rerun
-        and the subflow did not complete, in which case a fresh run is
-        desired).
+        subflow run unless the parent is being rerun and the subflow either
+        did not complete or has no persisted result. In those cases a fresh
+        run gives the subflow its full retry budget while preserving the
+        previous run's history.
 
         If the parent task run is in a non-final state (e.g. still Running
         after a process restart), we also look for an existing subflow run
@@ -1680,8 +1692,18 @@ class AsyncFlowRunEngine(BaseFlowRunEngine[P, R]):
         )
         if flow_runs:
             loaded_flow_run = flow_runs[0]
-            # When the parent task run is final the subflow has already
-            # finished; cache the result so the engine skips re-execution.
+            if (
+                rerunning
+                and parent_task_run.state.is_completed()
+                and loaded_flow_run.state is not None
+                and loaded_flow_run.state.is_completed()
+                and loaded_flow_run.state.data is None
+            ):
+                # Without a persisted result the child must execute again. A
+                # fresh run preserves its history and restores its retry budget.
+                return None
+
+            # Keep the previous state available when reusing a finished run.
             if parent_task_run.state.is_final():
                 self._return_value = loaded_flow_run.state
             return loaded_flow_run

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/src/prefect/results.py

@@ -486,15 +486,21 @@ class ResultStore(BaseModel):
         Returns:
             ResultRecord: The result record.
         """
-        if metadata.storage_block_id is None:
-            storage_block = None
-        else:
-            storage_block = await aresolve_result_storage(metadata.storage_block_id)
-        store = cls(result_storage=storage_block, serializer=metadata.serializer)
         if metadata.storage_key is None:
             raise ValueError(
                 "storage_key is required to hydrate a result record from metadata"
             )
+        if metadata.storage_block_id is not None:
+            storage_block = await aresolve_result_storage(metadata.storage_block_id)
+        elif Path(metadata.storage_key).is_absolute():
+            # Results written to an unsaved local filesystem record an absolute path
+            # as the storage key, which may live outside the default local storage.
+            storage_block = LocalFileSystem(
+                basepath=str(Path(metadata.storage_key).parent)
+            )
+        else:
+            storage_block = None
+        store = cls(result_storage=storage_block, serializer=metadata.serializer)
         result = await store.aread(metadata.storage_key)
         return result
 

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/src/prefect/server/api/collections_data/views/aggregate-worker-metadata.json

@@ -760,6 +760,7 @@
           "auto_remove": "{{ auto_remove }}",
           "volumes": "{{ volumes }}",
           "stream_output": "{{ stream_output }}",
+          "container_wait_timeout": "{{ container_wait_timeout }}",
           "mem_limit": "{{ mem_limit }}",
           "memswap_limit": "{{ memswap_limit }}",
           "privileged": "{{ privileged }}"
@@ -856,6 +857,12 @@
               "default": true,
               "type": "boolean"
             },
+            "container_wait_timeout": {
+              "title": "Container Wait Timeout",
+              "description": "Maximum number of seconds the worker waits for a created container to exit. If the container has not exited within this time, the worker stops watching it; the container itself is not stopped. If not set, the worker waits indefinitely.",
+              "exclusiveMinimum": 0,
+              "type": "integer"
+            },
             "mem_limit": {
               "title": "Memory Limit",
               "description": "Memory limit of created containers. Accepts a value with a unit identifier (e.g. 100000b, 1000k, 128m, 1g.) If a value is given without a unit, bytes are assumed.",

{prefect_client-3.8.7.dev5 → prefect_client-3.8.7.dev7}/src/prefect/utilities/math.py

@@ -48,10 +48,15 @@ def clamped_poisson_interval(
 
     The upper bound for this random variate is: average_interval * (1 + clamping_factor).
     A lower bound is picked so that the average interval remains approximately fixed.
+
+    An `average_interval` of zero (or less) yields an interval of `0.0`.
     """
     if clamping_factor <= 0:
         raise ValueError("`clamping_factor` must be >= 0.")
 
+    if average_interval <= 0:
+        return 0.0
+
     upper_clamp_multiple = 1 + clamping_factor
     upper_bound = average_interval * upper_clamp_multiple
     lower_bound = max(0, average_interval * lower_clamp_multiple(upper_clamp_multiple))

prefect_client-3.8.7.dev5/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.8.7.dev5"
-__build_date__ = "2026-09-22 08:20:30.689908+00:00"
-__git_commit__ = "c352eb8668a97d31ba8e7636d26d929f0db84d48"
-__dirty__ = False