pivot 0.2.3__tar.gz → 0.2.4__tar.gz

{pivot-0.2.3 → pivot-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pivot
-Version: 0.2.3
+Version: 0.2.4
 Summary: High-performance Python pipeline tool with automatic code change detection
 Author: Sami Jawhar
 Author-email: Sami Jawhar <sami@metr.org>

{pivot-0.2.3 → pivot-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pivot"
-version = "0.2.3"
+version = "0.2.4"
 description = "High-performance Python pipeline tool with automatic code change detection"
 requires-python = ">=3.13,<3.14"
 readme = "README.md"

{pivot-0.2.3 → pivot-0.2.4}/src/pivot/engine/engine.py

@@ -1306,26 +1306,6 @@ class Engine:
                                                 run_id=run_id,
                                             )
 
-                            # Check cancellation
-                            if self._cancel_event.is_set():
-                                cancelled = self._scheduler.apply_cancel()
-                                for name, old_state in cancelled:
-                                    await self.emit(
-                                        StageStateChanged(
-                                            type="stage_state_changed",
-                                            stage=name,
-                                            state=StageExecutionState.COMPLETED,
-                                            previous_state=old_state,
-                                        )
-                                    )
-                                    await self._emit_terminal_stage(
-                                        name,
-                                        StageStatus.CANCELLED,
-                                        "cancelled",
-                                        results,
-                                        run_id=run_id,
-                                    )
-
                             # Start more stages if slots available
                             if not self._scheduler.stop_starting_new:
                                 await self._start_ready_stages(
@@ -1389,6 +1369,9 @@ class Engine:
                                 "Sentinel send failed (will rely on shutdown_event): %s", exc
                             )
 
+            if self._cancel_event.is_set():
+                await self._finalize_cancelled_stages(results, run_id)
+
         finally:
             # Close StateDBs first (lightweight), then shut down worker pool.
             with anyio.CancelScope(shield=True):
@@ -1682,6 +1665,19 @@ class Engine:
                     skipped = False
                 if skipped:
                     continue
+                # A watch event may cancel this run while its coordinator skip check awaited.
+                # Do not submit a stage to the pool after cancellation stopped admissions.
+                if self._cancel_event.is_set():
+                    self._scheduler.release_resources(stage_name)
+                    await self._set_stage_state(stage_name, StageExecutionState.COMPLETED)
+                    await self._emit_terminal_stage(
+                        stage_name,
+                        StageStatus.CANCELLED,
+                        "cancelled",
+                        results,
+                        run_id=run_id,
+                    )
+                    continue
 
                 # Stage must run — lazily create pool on first dispatch
                 started += 1
@@ -2162,6 +2158,29 @@ class Engine:
 
         return duration_ms
 
+    async def _finalize_cancelled_stages(
+        self,
+        results: dict[str, executor_core.ExecutionSummary],
+        run_id: str,
+    ) -> None:
+        """Mark every ready or pending stage cancelled exactly once."""
+        for stage_name, old_state in self._scheduler.apply_cancel():
+            await self.emit(
+                StageStateChanged(
+                    type="stage_state_changed",
+                    stage=stage_name,
+                    state=StageExecutionState.COMPLETED,
+                    previous_state=old_state,
+                )
+            )
+            await self._emit_terminal_stage(
+                stage_name,
+                StageStatus.CANCELLED,
+                "cancelled",
+                results,
+                run_id=run_id,
+            )
+
     async def _emit_terminal_stage(
         self,
         stage_name: str,

{pivot-0.2.3 → pivot-0.2.4}/src/pivot/fingerprint.py

@@ -1217,6 +1217,11 @@ def _resolve_dotted_path(parts: tuple[str, ...], ns: dict[str, Any]) -> Any:
     return obj
 
 
+def _method_function(method: Callable[..., Any]) -> Callable[..., Any]:
+    """Return the underlying function behind a bound method."""
+    return cast("Callable[..., Any]", getattr(method, "__func__", method))
+
+
 def get_loader_fingerprint(loader: "loaders.Writer[Any] | loaders.Reader[Any]") -> dict[str, str]:
     """Generate fingerprint manifest for a loader instance.
 
@@ -1244,13 +1249,14 @@ def get_loader_fingerprint(loader: "loaders.Writer[Any] | loaders.Reader[Any]")
         if method is not None:
             _process_callable_dependency(f"{class_name}.{method_name}", method, manifest, visited)
 
-    # Fingerprint save() if this is a Writer
+    # Use each method definition rather than a temporary bound method so the
+    # weak AST hash cache retains the entry across loader fingerprint calls.
     if isinstance(loader, loaders_module.Writer):
-        manifest[f"loader:{class_name}:save"] = hash_function_ast(loader.save)
+        manifest[f"loader:{class_name}:save"] = hash_function_ast(_method_function(loader.save))
 
     # Fingerprint load() if this is a Reader
     if isinstance(loader, loaders_module.Reader):
-        manifest[f"loader:{class_name}:load"] = hash_function_ast(loader.load)
+        manifest[f"loader:{class_name}:load"] = hash_function_ast(_method_function(loader.load))
 
         # Only fingerprint empty() if it's overridden in a Loader subclass
         if isinstance(loader, loaders_module.Loader):
@@ -1262,7 +1268,9 @@ def get_loader_fingerprint(loader: "loaders.Writer[Any] | loaders.Reader[Any]")
                     break
                 if "empty" in cls.__dict__:
                     # Found override in a subclass
-                    manifest[f"loader:{class_name}:empty"] = hash_function_ast(typed_loader.empty)
+                    manifest[f"loader:{class_name}:empty"] = hash_function_ast(
+                        _method_function(typed_loader.empty)
+                    )
                     break
 
     loader_any = cast("Any", loader)