prefect-client 3.6.25.dev7__tar.gz → 3.6.26.dev2__tar.gz

{prefect_client-3.6.25.dev7 → prefect_client-3.6.26.dev2}/PKG-INFO

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

prefect_client-3.6.26.dev2/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.6.26.dev2"
+__build_date__ = "2026-04-05 08:17:02.527706+00:00"
+__git_commit__ = "b1b196328332166faba5bdb79491fd0d52d01edd"
+__dirty__ = False

{prefect_client-3.6.25.dev7 → prefect_client-3.6.26.dev2}/src/prefect/runner/AGENTS.md

@@ -71,7 +71,9 @@ Each execution mode has a ProcessStarter implementation. To add a new execution
 
 ## State Transition Split (ScheduledRunPoller vs FlowRunExecutor)
 
-`ScheduledRunPoller` now calls `propose_pending` (Scheduled → Pending) before handing off to `FlowRunExecutor`. `FlowRunExecutor` then calls `propose_submitting` (Pending → Submitting sub-state) as step 1 of its lifecycle. These are two separate transitions — do not collapse them. The split exists so automations listening for the Pending state fire correctly before the executor begins.
+`ScheduledRunPoller` now calls `propose_pending` (Scheduled → Pending) before handing off to `FlowRunExecutor`. `FlowRunExecutor` then calls `propose_submitting` (Pending → Submitting sub-state) as step 1 of its lifecycle **when `propose_submitting=True` (the default)**. These are two separate transitions — do not collapse them. The split exists so automations listening for the Pending state fire correctly before the executor begins.
+
+**Exception: `prefect flow-run execute` CLI path sets `propose_submitting=False`** via `FlowRunExecutorContext.create_executor(propose_submitting=False)`. The CLI is invoked by a worker that has already advanced the flow run past the Pending state, so proposing Submitting again would be wrong. The cancelling precheck (step 1a) still runs unconditionally even when `propose_submitting=False`.
 
 ## ProcessWorker Migration (Known Gap)
 

{prefect_client-3.6.25.dev7 → prefect_client-3.6.26.dev2}/src/prefect/runner/_flow_run_executor.py

@@ -82,12 +82,14 @@ class FlowRunExecutor:
         process_manager: ProcessManager,
         state_proposer: StateProposer,
         hook_runner: HookRunner,
+        propose_submitting: bool = True,
     ) -> None:
         self._flow_run = flow_run
         self._starter = starter
         self._process_manager = process_manager
         self._state_proposer = state_proposer
         self._hook_runner = hook_runner
+        self._propose_submitting = propose_submitting
         self._logger = get_logger("runner.flow_run_executor")
 
     async def submit(
@@ -107,22 +109,25 @@ class FlowRunExecutor:
         """
         handle: ProcessHandle | None = None
         try:
-            # Step 1: propose submitting — abort if server rejects
-            if not await self._state_proposer.propose_submitting(self._flow_run):
-                # If the run is already cancelling, move it to terminal Cancelled
-                if self._flow_run.state and self._flow_run.state.is_cancelling():
-                    self._logger.info(
-                        "Flow run '%s' is cancelling, marking as cancelled.",
-                        self._flow_run.id,
-                    )
-                    await self._state_proposer.propose_cancelled(
-                        self._flow_run,
-                        state_updates={
-                            "message": "Flow run was cancelled before execution started."
-                        },
-                    )
+            # Step 1a: already-cancelling precheck (runs regardless of propose_submitting)
+            if self._flow_run.state and self._flow_run.state.is_cancelling():
+                self._logger.info(
+                    "Flow run '%s' is cancelling, marking as cancelled.",
+                    self._flow_run.id,
+                )
+                await self._state_proposer.propose_cancelled(
+                    self._flow_run,
+                    state_updates={
+                        "message": "Flow run was cancelled before execution started."
+                    },
+                )
                 return
 
+            # Step 1b: propose submitting — abort if server rejects
+            if self._propose_submitting:
+                if not await self._state_proposer.propose_submitting(self._flow_run):
+                    return
+
             # Step 2: already-cancelled precheck
             if self._flow_run.state and self._flow_run.state.is_cancelled():
                 self._logger.info(
@@ -320,6 +325,7 @@ class FlowRunExecutorContext:
         flow_run: FlowRun,
         starter: ProcessStarter,
         resolve_flow: Callable[[FlowRun], Flow[..., ...]],
+        propose_submitting: bool = True,
     ) -> FlowRunExecutor:
         hook_runner = HookRunner(resolve_flow=resolve_flow)
         # Wire the real resolver into CancellationManager for on_cancellation hooks
@@ -330,4 +336,5 @@ class FlowRunExecutorContext:
             process_manager=self.process_manager,
             state_proposer=self._state_proposer,
             hook_runner=hook_runner,
+            propose_submitting=propose_submitting,
         )

{prefect_client-3.6.25.dev7 → prefect_client-3.6.26.dev2}/src/prefect/server/api/server.py

@@ -881,6 +881,7 @@ class SubprocessASGIServer:
     def __init__(self, port: Optional[int] = None):
         # This ensures initialization happens only once
         if not hasattr(self, "_initialized"):
+            self._instance_key: Optional[int] = port
             self.port: Optional[int] = port
             self.server_process: subprocess.Popen[Any] | None = None
             self.running: bool = False
@@ -1022,8 +1023,12 @@ class SubprocessASGIServer:
                 self.server_process.wait()
             finally:
                 self.server_process = None
-        if self.port in self._instances:
-            del self._instances[self.port]
+        # Use _instance_key (the original port passed to __new__) for cleanup,
+        # since self.port may have changed during start() when an available port
+        # was assigned.
+        instance_key = getattr(self, "_instance_key", self.port)
+        if instance_key in self._instances:
+            del self._instances[instance_key]
         if self.running:
             self.running = False
 

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

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.6.25.dev7"
-__build_date__ = "2026-04-03 08:23:06.380040+00:00"
-__git_commit__ = "34f66a7cfc986e5b47688ea8ea7a91f8fc58e01f"
-__dirty__ = False