prefect-client 3.7.1.dev6__tar.gz → 3.7.1.dev7__tar.gz

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.7.1.dev6
+Version: 3.7.1.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.7.1.dev7/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.7.1.dev7"
+__build_date__ = "2026-05-13 09:09:16.813044+00:00"
+__git_commit__ = "35c7f1ed90b2a8605bc9f39b83d917ed2b862e08"
+__dirty__ = False

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/server/api/server.py

@@ -257,7 +257,13 @@ def _build_ui_path(base_url: str, relative_path: str) -> str:
         return normalized_relative_path
 
     if normalized_relative_path == "/":
-        return normalized_base_url
+        # Preserve the trailing slash so the redirect target falls inside
+        # the bundle's mount. Starlette's `Mount` only routes requests
+        # whose path starts with `{mount}/`; a bare `{mount}` falls through
+        # to whatever else matches, which in practice is the V1 SPA mount
+        # at "/" — that returns V1's index.html under the `/v2` URL and
+        # the V1 router can't resolve the route.
+        return f"{normalized_base_url}/"
 
     return f"{normalized_base_url}{normalized_relative_path}"
 

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/workers/_worker_channel/__init__.py

@@ -9,6 +9,7 @@ from prefect.workers._worker_channel._state import (
     WorkerChannelState,
     WorkerChannelStatus,
     WorkerChannelTerminalError,
+    WorkPoolSnapshotState,
 )
 from prefect.workers._worker_channel._sync import WorkPoolWorkerChannel
 
@@ -21,5 +22,6 @@ __all__ = [
     "WorkerChannelState",
     "WorkerChannelStatus",
     "WorkerChannelTerminalError",
+    "WorkPoolSnapshotState",
     "WorkPoolWorkerChannel",
 ]

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/workers/_worker_channel/_protocol.py

@@ -27,6 +27,7 @@ from prefect.client.schemas.worker_channel import (
     WorkerHelloFrame,
     WorkerReadyFrame,
     WorkPoolSnapshotFrame,
+    WorkPoolSnapshotPayload,
     validate_worker_channel_frame,
 )
 from prefect.settings import get_current_settings
@@ -38,6 +39,7 @@ from prefect.workers._worker_channel._state import (
     WorkerChannelRetryableError,
     WorkerChannelSession,
     WorkerChannelTerminalError,
+    WorkPoolSnapshotState,
 )
 
 
@@ -77,6 +79,7 @@ class WorkerChannelProtocolHandler:
         self._current_session = CurrentWorkerChannelSession()
         self._worker_id: UUID | None = None
         self._worker_metadata_sent = False
+        self._work_pool_snapshots = WorkPoolSnapshotState()
 
     @property
     def worker_id(self) -> UUID | None:
@@ -86,6 +89,10 @@ class WorkerChannelProtocolHandler:
     def worker_metadata_sent(self) -> bool:
         return self._worker_metadata_sent
 
+    @property
+    def work_pool_snapshots_available(self) -> bool:
+        return self._work_pool_snapshots.snapshots_available
+
     async def handshake(
         self, websocket: websockets.asyncio.client.ClientConnection
     ) -> WorkerReadyFrame:
@@ -175,12 +182,26 @@ class WorkerChannelProtocolHandler:
             )
 
     def _handle_ready(self, ready: WorkerReadyFrame) -> None:
-        self.handle_work_pool_snapshot(ready.payload.initial_snapshot.work_pool)
+        self.reset_work_pool_snapshot_sequence()
+        self.handle_work_pool_snapshot(ready.payload.initial_snapshot)
         worker_id = ready.payload.worker_id
         if worker_id is not None:
             self.record_worker_id(worker_id)
 
-    def handle_work_pool_snapshot(self, work_pool: WorkPool) -> None:
+    def reset_work_pool_snapshot_sequence(self) -> None:
+        self._work_pool_snapshots.reset_connection_sequence()
+
+    def handle_work_pool_snapshot(self, snapshot: WorkPoolSnapshotPayload) -> bool:
+        work_pool = self._work_pool_snapshots.apply_snapshot(snapshot)
+        if work_pool is None:
+            return False
+
+        if self._on_work_pool_snapshot is not None:
+            self._on_work_pool_snapshot(work_pool)
+        return True
+
+    def record_rest_work_pool_snapshot(self, work_pool: WorkPool) -> None:
+        work_pool = self._work_pool_snapshots.replace_from_rest(work_pool)
         if self._on_work_pool_snapshot is not None:
             self._on_work_pool_snapshot(work_pool)
 
@@ -299,7 +320,7 @@ class WorkerChannelProtocolHandler:
                 ) from exc
 
             if isinstance(frame, WorkPoolSnapshotFrame):
-                self.handle_work_pool_snapshot(frame.payload.work_pool)
+                self.handle_work_pool_snapshot(frame.payload)
                 continue
 
             if isinstance(frame, CleanupMessageFrame):

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/workers/_worker_channel/_state.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import copy
 from dataclasses import dataclass
 from enum import Enum
 from typing import Protocol
@@ -10,10 +11,12 @@ import websockets.asyncio.client
 import websockets.exceptions
 
 from prefect.client.orchestration import PrefectClient
+from prefect.client.schemas.objects import WorkPool
 from prefect.client.schemas.worker_channel import (
     WorkerChannelCapability,
     WorkerChannelFrame,
     WorkerReadyFrame,
+    WorkPoolSnapshotPayload,
 )
 
 
@@ -77,6 +80,34 @@ class WorkerChannelState:
 WorkerChannelFallbackState = WorkerChannelState
 
 
+@dataclass
+class WorkPoolSnapshotState:
+    work_pool: WorkPool | None = None
+    last_applied_sequence: int | None = None
+
+    @property
+    def snapshots_available(self) -> bool:
+        return self.last_applied_sequence is not None
+
+    def reset_connection_sequence(self) -> None:
+        self.last_applied_sequence = None
+
+    def apply_snapshot(self, snapshot: WorkPoolSnapshotPayload) -> WorkPool | None:
+        if (
+            self.last_applied_sequence is not None
+            and snapshot.snapshot_sequence <= self.last_applied_sequence
+        ):
+            return None
+
+        self.last_applied_sequence = snapshot.snapshot_sequence
+        self.work_pool = copy.deepcopy(snapshot.work_pool)
+        return self.work_pool
+
+    def replace_from_rest(self, work_pool: WorkPool) -> WorkPool:
+        self.work_pool = copy.deepcopy(work_pool)
+        return self.work_pool
+
+
 @dataclass
 class WorkerChannelSession:
     """One successfully negotiated worker-channel WebSocket session."""
@@ -146,6 +177,9 @@ class WorkerChannel(Protocol):
     @property
     def rest_fallback_enabled(self) -> bool: ...
 
+    @property
+    def snapshots_available(self) -> bool: ...
+
     def set_client(self, client: PrefectClient) -> None: ...
 
     async def sync(self, task_group: anyio.abc.TaskGroup | None) -> None: ...

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/workers/_worker_channel/_sync.py

@@ -112,6 +112,10 @@ class WorkPoolWorkerChannel:
     def rest_fallback_enabled(self) -> bool:
         return self.state.rest_fallback_enabled
 
+    @property
+    def snapshots_available(self) -> bool:
+        return self._protocol.work_pool_snapshots_available
+
     @property
     def worker_id(self) -> UUID | None:
         return self._protocol.worker_id
@@ -128,7 +132,7 @@ class WorkPoolWorkerChannel:
             self._run_scope.cancel()
 
     async def sync(self, task_group: anyio.abc.TaskGroup | None) -> None:
-        if self.state.healthy:
+        if self.state.healthy and self.snapshots_available:
             return
 
         if task_group is not None:
@@ -138,7 +142,7 @@ class WorkPoolWorkerChannel:
             if self.url is None:
                 self.state.mark_terminal("endpoint_unavailable")
 
-        if channel_started:
+        if channel_started and self.snapshots_available:
             return
 
         await self._sync_rest_work_pool()
@@ -317,13 +321,27 @@ class WorkPoolWorkerChannel:
                     )
                 return
 
+        if self.state.healthy and self.snapshots_available:
+            self._logger.debug(
+                "Skipping REST work pool sync because the worker channel applied a "
+                "snapshot while REST sync was in flight."
+            )
+            return
+
         if not work_pool.base_job_template:
             await self._set_work_pool_template(
                 work_pool, self.default_base_job_template
             )
             work_pool.base_job_template = self.default_base_job_template
 
-        self._protocol.handle_work_pool_snapshot(work_pool)
+        if self.state.healthy and self.snapshots_available:
+            self._logger.debug(
+                "Skipping REST work pool snapshot because the worker channel applied "
+                "a snapshot while REST sync was in flight."
+            )
+            return
+
+        self._protocol.record_rest_work_pool_snapshot(work_pool)
 
     async def _set_work_pool_template(
         self, work_pool: WorkPool, job_template: dict[str, Any]

{prefect_client-3.7.1.dev6 → prefect_client-3.7.1.dev7}/src/prefect/workers/base.py

@@ -957,12 +957,14 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
             create_bundle_for_flow_run,
         )
 
+        work_pool = copy.deepcopy(self.work_pool)
+
         if (
-            self.work_pool.storage_configuration.bundle_upload_step is None
-            or self.work_pool.storage_configuration.bundle_execution_step is None
+            work_pool.storage_configuration.bundle_upload_step is None
+            or work_pool.storage_configuration.bundle_execution_step is None
         ):
             raise RuntimeError(
-                f"Storage is not configured for work pool {self.work_pool.name!r}. "
+                f"Storage is not configured for work pool {work_pool.name!r}. "
                 "Please configure storage for the work pool by running `prefect "
                 "work-pool storage configure`."
             )
@@ -982,11 +984,11 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         ):
             result_storage = None
             if (
-                self.work_pool.storage_configuration.default_result_storage_block_id
+                work_pool.storage_configuration.default_result_storage_block_id
                 is not None
             ):
                 result_storage = await aresolve_result_storage(
-                    self.work_pool.storage_configuration.default_result_storage_block_id
+                    work_pool.storage_configuration.default_result_storage_block_id
                 )
             else:
                 default_result_storage = await _aget_default_result_storage()
@@ -1010,12 +1012,12 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         bundle_key = str(uuid.uuid4())
         flow_launcher = getattr(flow, "launcher", None)
         upload_step = resolve_bundle_step_with_launcher(
-            self.work_pool.storage_configuration.bundle_upload_step,
+            work_pool.storage_configuration.bundle_upload_step,
             flow_launcher,
             "upload",
         )
         execute_step = resolve_bundle_step_with_launcher(
-            self.work_pool.storage_configuration.bundle_execution_step,
+            work_pool.storage_configuration.bundle_execution_step,
             flow_launcher,
             "execution",
         )
@@ -1051,7 +1053,7 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
                 parameters=flow.serialize_parameters(parameters),
                 state=Pending(),
                 job_variables=job_variables,
-                work_pool_name=self.work_pool.name,
+                work_pool_name=work_pool.name,
                 tags=TagsContext.get().current_tags,
                 parent_task_run_id=getattr(parent_task_run, "id", None),
             )
@@ -1073,14 +1075,14 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         logger = self.get_flow_run_logger(flow_run)
 
         configuration = await self.job_configuration.from_template_and_values(
-            base_job_template=self.work_pool.base_job_template,
+            base_job_template=work_pool.base_job_template,
             values=job_variables,
             client=self._client,
         )
         configuration.prepare_for_flow_run(
             flow_run=flow_run,
             flow=api_flow,
-            work_pool=self.work_pool,
+            work_pool=work_pool,
             worker_name=self.name,
             worker_id=self.backend_id,
         )
@@ -1261,6 +1263,8 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         return await self._submit_scheduled_flow_runs(flow_run_response=runs_response)
 
     def _record_work_pool_snapshot(self, work_pool: WorkPool) -> None:
+        work_pool = copy.deepcopy(work_pool)
+
         if not work_pool.base_job_template:
             work_pool.base_job_template = self.__class__.get_default_base_job_template()
 
@@ -1612,6 +1616,8 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         flow_run: "FlowRun",
         deployment: Optional["DeploymentResponse"] = None,
     ) -> C:
+        work_pool = copy.deepcopy(self.work_pool)
+
         if not deployment and flow_run.deployment_id:
             deployment = await self.client.read_deployment(flow_run.deployment_id)
 
@@ -1627,7 +1633,7 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         job_variables.update(flow_run_vars)
 
         configuration = await self.job_configuration.from_template_and_values(
-            base_job_template=self.work_pool.base_job_template,
+            base_job_template=work_pool.base_job_template,
             values=job_variables,
             client=self.client,
         )
@@ -1636,7 +1642,7 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
                 flow_run=flow_run,
                 deployment=deployment,
                 flow=flow,
-                work_pool=self.work_pool,
+                work_pool=work_pool,
                 worker_name=self.name,
                 worker_id=self.backend_id,
             )

prefect_client-3.7.1.dev6/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.7.1.dev6"
-__build_date__ = "2026-05-12 09:04:39.810368+00:00"
-__git_commit__ = "5d909d2aeb5011f5017fcee073b7e445c1d7b078"
-__dirty__ = False