prefect-client 3.7.2.dev2__py3-none-any.whl → 3.7.2.dev3__py3-none-any.whl

prefect/_build_info.py

@@ -1,5 +1,5 @@
 # Generated by versioningit
-__version__ = "3.7.2.dev2"
-__build_date__ = "2026-05-19 09:17:54.056516+00:00"
-__git_commit__ = "68244724cf7a168f14f81bdf032689c912a404de"
+__version__ = "3.7.2.dev3"
+__build_date__ = "2026-05-20 09:16:00.764815+00:00"
+__git_commit__ = "30ca141845030af77328e2ebe495e200db2fc679"
 __dirty__ = False

prefect/automations.py

@@ -11,6 +11,7 @@ from prefect.events.actions import (
     CancelFlowRun,
     ChangeFlowRunState,
     DeclareIncident,
+    DeleteFlowRun,
     DoNothing,
     PauseAutomation,
     PauseDeployment,
@@ -61,6 +62,7 @@ __all__ = [
     "PauseDeployment",
     "ResumeDeployment",
     "CancelFlowRun",
+    "DeleteFlowRun",
     "ChangeFlowRunState",
     "PauseWorkQueue",
     "ResumeWorkQueue",

prefect/bundles/_zip_builder.py

@@ -11,6 +11,7 @@ from __future__ import annotations
 import hashlib
 import logging
 import shutil
+import struct
 import tempfile
 import zipfile
 from dataclasses import dataclass
@@ -32,7 +33,8 @@ class ZipResult:
 
     Attributes:
         zip_path: Path to the temporary zip file.
-        sha256_hash: Lowercase hex digest of the zip content.
+        sha256_hash: SHA256 hex digest of the canonical bundled file contents
+            (paths, modes, and bytes), not the raw zip archive bytes.
         storage_key: Content-addressed storage key in format "files/{hash}.zip".
         size_bytes: Size of the zip file in bytes.
     """
@@ -95,16 +97,40 @@ class ZipBuilder:
         self._temp_dir = tempfile.mkdtemp(prefix="prefect-zip-")
         zip_path = Path(self._temp_dir) / "files.zip"
 
-        # Build the zip with DEFLATED compression
+        # Build the zip and compute the content hash in a single pass so
+        # that every file is read exactly once, avoiding race conditions
+        # where a source file could change between the zip write and the
+        # hash computation.
+        hasher = hashlib.sha256()
+        hasher.update(b"prefect-bundle-files-v1\0")
+
         with zipfile.ZipFile(zip_path, "w", compression=zipfile.ZIP_DEFLATED) as zf:
             for file_path in sorted_files:
-                # Compute relative path with forward slashes
                 rel_path = file_path.relative_to(self.base_dir)
                 arcname = str(rel_path).replace("\\", "/")
-                zf.write(file_path, arcname)
 
-        # Compute SHA256 hash using chunked reading
-        sha256_hash = self._compute_hash(zip_path)
+                file_stat = file_path.stat()
+
+                arcname_bytes = arcname.encode("utf-8")
+                hasher.update(struct.pack(">I", len(arcname_bytes)))
+                hasher.update(arcname_bytes)
+                hasher.update(struct.pack(">I", file_stat.st_mode & 0xFFFF))
+                hasher.update(struct.pack(">Q", file_stat.st_size))
+
+                zip_info = zipfile.ZipInfo.from_file(file_path, arcname)
+                zip_info.compress_type = zipfile.ZIP_DEFLATED
+                with (
+                    file_path.open("rb") as src,
+                    zf.open(zip_info, "w") as dest,
+                ):
+                    while True:
+                        chunk = src.read(HASH_CHUNK_SIZE)
+                        if not chunk:
+                            break
+                        dest.write(chunk)
+                        hasher.update(chunk)
+
+        sha256_hash = hasher.hexdigest()
 
         # Get file size
         size_bytes = zip_path.stat().st_size
@@ -123,25 +149,6 @@ class ZipBuilder:
             size_bytes=size_bytes,
         )
 
-    def _compute_hash(self, zip_path: Path) -> str:
-        """
-        Compute SHA256 hash of a file using chunked reading.
-
-        Args:
-            zip_path: Path to the file to hash.
-
-        Returns:
-            Lowercase hex digest of the SHA256 hash.
-        """
-        hasher = hashlib.sha256()
-        with open(zip_path, "rb") as f:
-            while True:
-                chunk = f.read(HASH_CHUNK_SIZE)
-                if not chunk:
-                    break
-                hasher.update(chunk)
-        return hasher.hexdigest()
-
     def _emit_size_warning(
         self, zip_path: Path, files: list[Path], size_bytes: int
     ) -> None:

prefect/events/__init__.py

@@ -31,6 +31,7 @@ from .actions import (
     ResumeDeployment,
     ChangeFlowRunState,
     CancelFlowRun,
+    DeleteFlowRun,
     SuspendFlowRun,
     CallWebhook,
     SendNotification,
@@ -78,6 +79,7 @@ __all__ = [
     "ResumeDeployment",
     "ChangeFlowRunState",
     "CancelFlowRun",
+    "DeleteFlowRun",
     "SuspendFlowRun",
     "CallWebhook",
     "SendNotification",

prefect/events/actions.py

@@ -126,6 +126,12 @@ class CancelFlowRun(Action):
     type: Literal["cancel-flow-run"] = "cancel-flow-run"
 
 
+class DeleteFlowRun(Action):
+    """Deletes a flow run associated with the trigger"""
+
+    type: Literal["delete-flow-run"] = "delete-flow-run"
+
+
 class ResumeFlowRun(Action):
     """Resumes a flow run associated with the trigger"""
 
@@ -294,6 +300,7 @@ ActionTypes: TypeAlias = Union[
     ResumeDeployment,
     ResumeFlowRun,
     CancelFlowRun,
+    DeleteFlowRun,
     ChangeFlowRunState,
     PauseWorkQueue,
     ResumeWorkQueue,

prefect/server/api/clients.py

@@ -93,6 +93,9 @@ class OrchestrationClient(BaseClient):
     async def read_flow_run_raw(self, flow_run_id: UUID) -> Response:
         return await self._http_client.get(f"/flow_runs/{flow_run_id}")
 
+    async def delete_flow_run(self, flow_run_id: UUID) -> Response:
+        return await self._http_client.delete(f"/flow_runs/{flow_run_id}")
+
     async def read_task_run_raw(self, task_run_id: UUID) -> Response:
         return await self._http_client.get(f"/task_runs/{task_run_id}")
 

prefect/server/api/workers.py

@@ -2,7 +2,9 @@
 Routes for interacting with work queue objects.
 """
 
-from typing import TYPE_CHECKING, List, Optional
+from dataclasses import dataclass
+from logging import Logger
+from typing import TYPE_CHECKING, Any, List, Optional
 from uuid import UUID
 
 import sqlalchemy as sa
@@ -11,15 +13,32 @@ from fastapi import (
     Depends,
     HTTPException,
     Path,
+    WebSocket,
     status,
 )
 from packaging.version import Version
+from pydantic import ValidationError
 from sqlalchemy.ext.asyncio import AsyncSession
 
 import prefect.server.api.dependencies as dependencies
 import prefect.server.models as models
 import prefect.server.schemas as schemas
 from prefect._internal.uuid7 import uuid7
+from prefect.client.schemas.worker_channel import (
+    WORK_POOL_SNAPSHOT_CAPABILITY,
+    WORKER_CHANNEL_CLOSE_POLICIES,
+    WORKER_HEARTBEAT_CAPABILITY,
+    WorkerChannelCloseReason,
+    WorkerChannelProtocolError,
+    WorkerHeartbeatFrame,
+    WorkerHelloFrame,
+    WorkerReadyFrame,
+    WorkPoolSnapshot,
+    WorkPoolSnapshotPayload,
+    select_worker_channel_version,
+    validate_worker_channel_frame,
+)
+from prefect.logging import get_logger
 from prefect.server.api.validation import validate_job_variable_defaults_for_work_pool
 from prefect.server.database import PrefectDBInterface, provide_database_interface
 from prefect.server.models.deployments import mark_deployments_ready
@@ -29,17 +48,25 @@ from prefect.server.models.work_queues import (
 )
 from prefect.server.models.workers import emit_work_pool_status_event
 from prefect.server.schemas.statuses import WorkQueueStatus
+from prefect.server.utilities import subscriptions
 from prefect.server.utilities.server import PrefectRouter
 from prefect.types import DateTime
 from prefect.types._datetime import now
 
 if TYPE_CHECKING:
-    from prefect.server.database.orm_models import ORMWorkQueue
+    from prefect.server.database.orm_models import WorkPool as ORMWorkPool
+    from prefect.server.database.orm_models import WorkQueue as ORMWorkQueue
 
 router: PrefectRouter = PrefectRouter(
     prefix="/work_pools",
     tags=["Work Pools"],
 )
+logger: Logger = get_logger("prefect.server.api.workers")
+
+_OSS_WORKER_CHANNEL_ACCEPTED_CAPABILITIES = [
+    WORKER_HEARTBEAT_CAPABILITY,
+    WORK_POOL_SNAPSHOT_CAPABILITY,
+]
 
 
 # -----------------------------------------------------
@@ -145,6 +172,288 @@ class WorkerLookups:
         return queue.id
 
 
+class WorkerChannelSetupError(Exception):
+    def __init__(self, close_reason: WorkerChannelCloseReason, detail: str):
+        super().__init__(detail)
+        self.close_reason = close_reason
+        self.detail = detail
+
+
+@dataclass(frozen=True)
+class WorkerChannelWorkPoolUpdateEvent:
+    work_pool_id: UUID
+    changed_fields: dict[str, dict[str, Any]]
+
+
+async def _close_worker_channel(
+    websocket: WebSocket, close_reason: WorkerChannelCloseReason
+) -> None:
+    policy = WORKER_CHANNEL_CLOSE_POLICIES[close_reason]
+    await websocket.close(code=policy.websocket_code, reason=close_reason.value)
+
+
+async def _receive_worker_hello(websocket: WebSocket) -> WorkerHelloFrame:
+    try:
+        message = await websocket.receive_json()
+        frame = validate_worker_channel_frame(message)
+    except ValidationError as exc:
+        raise WorkerChannelSetupError(
+            WorkerChannelCloseReason.PROTOCOL_ERROR,
+            "Worker channel received a malformed hello frame",
+        ) from exc
+    except ValueError as exc:
+        raise WorkerChannelSetupError(
+            WorkerChannelCloseReason.PROTOCOL_ERROR,
+            "Worker channel received invalid JSON during setup",
+        ) from exc
+
+    if not isinstance(frame, WorkerHelloFrame):
+        raise WorkerChannelSetupError(
+            WorkerChannelCloseReason.PROTOCOL_ERROR,
+            "Expected worker.hello.v1 during worker channel setup",
+        )
+
+    return frame
+
+
+async def _resolve_worker_channel_work_pool(
+    session: AsyncSession,
+    work_pool_name: str,
+    hello: WorkerHelloFrame,
+) -> "ORMWorkPool":
+    work_pool = await models.workers.read_work_pool_by_name(
+        session=session,
+        work_pool_name=work_pool_name,
+    )
+
+    default_base_job_template = hello.payload.default_base_job_template
+    if work_pool is None:
+        if not hello.payload.create_pool_if_not_found:
+            raise WorkerChannelSetupError(
+                WorkerChannelCloseReason.AUTHORIZATION_FAILED,
+                "work_pool_not_found",
+            )
+
+        if work_pool_name.lower().startswith("prefect"):
+            raise WorkerChannelSetupError(
+                WorkerChannelCloseReason.AUTHORIZATION_FAILED,
+                "work_pool_creation_unauthorized",
+            )
+
+        await validate_job_variable_defaults_for_work_pool(
+            session, work_pool_name, default_base_job_template
+        )
+        try:
+            async with session.begin_nested():
+                work_pool = await models.workers.create_work_pool(
+                    session=session,
+                    work_pool=schemas.actions.WorkPoolCreate(
+                        name=work_pool_name,
+                        type=hello.payload.worker_type,
+                        base_job_template=default_base_job_template,
+                    ),
+                )
+        except sa.exc.IntegrityError:
+            work_pool = await models.workers.read_work_pool_by_name(
+                session=session,
+                work_pool_name=work_pool_name,
+            )
+            if work_pool is None:
+                raise
+        return work_pool
+
+    return work_pool
+
+
+async def _resolve_worker_channel_work_queues(
+    session: AsyncSession,
+    work_pool_id: UUID,
+    work_pool_name: str,
+    work_queue_names: list[str],
+) -> list["ORMWorkQueue"]:
+    if not work_queue_names:
+        return list(
+            await models.workers.read_work_queues(
+                session=session, work_pool_id=work_pool_id
+            )
+        )
+
+    work_queues = []
+    for work_queue_name in dict.fromkeys(work_queue_names):
+        work_queue = await models.workers.read_work_queue_by_name(
+            session=session,
+            work_pool_name=work_pool_name,
+            work_queue_name=work_queue_name,
+        )
+        if work_queue is None:
+            raise WorkerChannelSetupError(
+                WorkerChannelCloseReason.AUTHORIZATION_FAILED,
+                "work_queue_not_found",
+            )
+        work_queues.append(work_queue)
+
+    return work_queues
+
+
+async def _build_worker_channel_work_pool_snapshot(
+    session: AsyncSession,
+    work_pool: "ORMWorkPool",
+) -> WorkPoolSnapshot:
+    work_pool_response = schemas.responses.WorkPoolResponse.model_validate(
+        work_pool, from_attributes=True
+    )
+
+    if work_pool_response.concurrency_limit is not None:
+        work_pool_response.active_slots = (
+            await models.workers.count_work_pool_active_slots(
+                session=session,
+                work_pool_id=work_pool.id,
+            )
+        )
+
+    return WorkPoolSnapshot.model_validate(work_pool_response.model_dump(mode="json"))
+
+
+async def _build_worker_ready_frame(
+    session: AsyncSession,
+    work_pool_name: str,
+    hello: WorkerHelloFrame,
+) -> tuple[WorkerReadyFrame, WorkerChannelWorkPoolUpdateEvent | None]:
+    try:
+        selected_channel_version = select_worker_channel_version(
+            hello.payload.supported_channel_versions
+        )
+    except WorkerChannelProtocolError as exc:
+        raise WorkerChannelSetupError(exc.close_reason, str(exc)) from exc
+
+    work_pool = await _resolve_worker_channel_work_pool(
+        session=session,
+        work_pool_name=work_pool_name,
+        hello=hello,
+    )
+    work_queues = await _resolve_worker_channel_work_queues(
+        session=session,
+        work_pool_id=work_pool.id,
+        work_pool_name=work_pool_name,
+        work_queue_names=hello.payload.work_queue_names,
+    )
+    default_base_job_template = hello.payload.default_base_job_template
+    work_pool_update_event = None
+    if not work_pool.base_job_template and default_base_job_template:
+        previous_base_job_template = work_pool.base_job_template
+        await validate_job_variable_defaults_for_work_pool(
+            session, work_pool_name, default_base_job_template
+        )
+        updated = await models.workers.update_work_pool(
+            session=session,
+            work_pool_id=work_pool.id,
+            work_pool=schemas.actions.WorkPoolUpdate(
+                base_job_template=default_base_job_template
+            ),
+            emit_update_event=False,
+            emit_status_change=emit_work_pool_status_event,
+        )
+        if updated:
+            work_pool_update_event = WorkerChannelWorkPoolUpdateEvent(
+                work_pool_id=work_pool.id,
+                changed_fields={
+                    "base_job_template": {
+                        "from": previous_base_job_template,
+                        "to": default_base_job_template,
+                    }
+                },
+            )
+        refreshed = await models.workers.read_work_pool(
+            session=session, work_pool_id=work_pool.id
+        )
+        assert refreshed is not None
+        work_pool = refreshed
+
+    try:
+        worker = await models.workers.record_worker_heartbeat(
+            session=session,
+            work_pool=work_pool,
+            worker_name=hello.payload.worker_name,
+            heartbeat_interval_seconds=hello.payload.heartbeat_interval_seconds,
+            emit_status_change=emit_work_pool_status_event,
+            return_worker=True,
+        )
+    except Exception as exc:
+        raise WorkerChannelSetupError(
+            WorkerChannelCloseReason.HEARTBEAT_PERSISTENCE_FAILED,
+            "worker_channel_initial_heartbeat_failed",
+        ) from exc
+    assert worker is not None
+
+    refreshed_work_pool = await models.workers.read_work_pool(
+        session=session, work_pool_id=work_pool.id
+    )
+    assert refreshed_work_pool is not None
+    initial_snapshot = WorkPoolSnapshotPayload(
+        snapshot_sequence=1,
+        reason="initial",
+        work_pool=await _build_worker_channel_work_pool_snapshot(
+            session=session,
+            work_pool=refreshed_work_pool,
+        ),
+    )
+
+    requested_capabilities = list(dict.fromkeys(hello.payload.requested_capabilities))
+    accepted = _OSS_WORKER_CHANNEL_ACCEPTED_CAPABILITIES
+    accepted_set = set(accepted)
+    rejected = [
+        capability
+        for capability in requested_capabilities
+        if capability not in accepted_set
+    ]
+
+    return (
+        WorkerReadyFrame(
+            type="worker.ready.v1",
+            id=uuid7(),
+            sent_at=now("UTC"),
+            payload={
+                "consumer_id": hello.payload.consumer_id,
+                "worker_id": worker.id,
+                "selected_channel_version": selected_channel_version,
+                "effective_heartbeat_interval_seconds": (
+                    hello.payload.heartbeat_interval_seconds
+                ),
+                "accepted_capabilities": accepted,
+                "rejected_capabilities": rejected,
+                "effective_max_cleanup_concurrency": 0,
+                "resolved_work_queues": [
+                    {"id": work_queue.id, "name": work_queue.name}
+                    for work_queue in work_queues
+                ],
+                "initial_snapshot": initial_snapshot,
+            },
+        ),
+        work_pool_update_event,
+    )
+
+
+async def _persist_worker_channel_heartbeat(
+    session: AsyncSession,
+    work_pool_name: str,
+    frame: WorkerHeartbeatFrame,
+) -> None:
+    work_pool = await models.workers.read_work_pool_by_name(
+        session=session,
+        work_pool_name=work_pool_name,
+    )
+    if work_pool is None:
+        raise RuntimeError("Worker channel work pool no longer exists")
+
+    await models.workers.record_worker_heartbeat(
+        session=session,
+        work_pool=work_pool,
+        worker_name=frame.payload.worker_name,
+        heartbeat_interval_seconds=frame.payload.heartbeat_interval_seconds,
+        emit_status_change=emit_work_pool_status_event,
+    )
+
+
 # -----------------------------------------------------
 # --
 # --
@@ -756,6 +1065,104 @@ async def delete_work_queue(
 # -----------------------------------------------------
 
 
+@router.websocket("/{work_pool_name}/workers/connect")
+async def worker_channel_connect(
+    websocket: WebSocket,
+    work_pool_name: str = Path(..., description="The work pool name"),
+    db: PrefectDBInterface = Depends(provide_database_interface),
+) -> None:
+    websocket = await subscriptions.accept_prefect_socket(
+        websocket,
+        require_prefect_subprotocol=True,
+        authentication_failed_reason=WorkerChannelCloseReason.AUTHENTICATION_FAILED.value,
+    )
+    if not websocket:
+        return
+
+    try:
+        hello = await _receive_worker_hello(websocket)
+        async with db.session_context(begin_transaction=True) as session:
+            ready, work_pool_update_event = await _build_worker_ready_frame(
+                session=session,
+                work_pool_name=work_pool_name,
+                hello=hello,
+            )
+
+        if work_pool_update_event is not None:
+            async with db.session_context() as session:
+                work_pool = await models.workers.read_work_pool(
+                    session=session,
+                    work_pool_id=work_pool_update_event.work_pool_id,
+                )
+                assert work_pool is not None
+                await models.workers.emit_work_pool_updated_event(
+                    session=session,
+                    work_pool=work_pool,
+                    changed_fields=work_pool_update_event.changed_fields,
+                )
+
+        await websocket.send_json(ready.model_dump(mode="json"))
+
+        while True:
+            try:
+                message = await websocket.receive_json()
+                frame = validate_worker_channel_frame(message)
+            except ValidationError:
+                await _close_worker_channel(
+                    websocket, WorkerChannelCloseReason.PROTOCOL_ERROR
+                )
+                return
+            except ValueError:
+                await _close_worker_channel(
+                    websocket, WorkerChannelCloseReason.PROTOCOL_ERROR
+                )
+                return
+
+            if not isinstance(frame, WorkerHeartbeatFrame):
+                await _close_worker_channel(
+                    websocket, WorkerChannelCloseReason.PROTOCOL_ERROR
+                )
+                return
+
+            if (
+                frame.payload.consumer_id != hello.payload.consumer_id
+                or frame.payload.worker_name != hello.payload.worker_name
+            ):
+                await _close_worker_channel(
+                    websocket, WorkerChannelCloseReason.PROTOCOL_ERROR
+                )
+                return
+
+            try:
+                async with db.session_context(begin_transaction=True) as session:
+                    await _persist_worker_channel_heartbeat(
+                        session=session,
+                        work_pool_name=work_pool_name,
+                        frame=frame,
+                    )
+            except Exception:
+                logger.exception("Worker channel heartbeat persistence failed")
+                await _close_worker_channel(
+                    websocket,
+                    WorkerChannelCloseReason.HEARTBEAT_PERSISTENCE_FAILED,
+                )
+                return
+
+    except WorkerChannelSetupError as exc:
+        logger.info("Worker channel setup failed: %s", exc.detail)
+        await _close_worker_channel(websocket, exc.close_reason)
+    except HTTPException as exc:
+        logger.info("Worker channel setup failed HTTP validation: %s", exc.detail)
+        await _close_worker_channel(websocket, WorkerChannelCloseReason.PROTOCOL_ERROR)
+    except subscriptions.NORMAL_DISCONNECT_EXCEPTIONS:
+        return
+    except Exception:
+        logger.exception("Worker channel setup failed due to a transient server error")
+        await _close_worker_channel(
+            websocket, WorkerChannelCloseReason.TRANSIENT_SERVER_ERROR
+        )
+
+
 @router.post(
     "/{work_pool_name}/workers/heartbeat",
     status_code=status.HTTP_204_NO_CONTENT,
@@ -780,23 +1187,14 @@ async def worker_heartbeat(
                 detail=f'Work pool "{work_pool_name}" not found.',
             )
 
-        await models.workers.worker_heartbeat(
+        await models.workers.record_worker_heartbeat(
             session=session,
-            work_pool_id=work_pool.id,
+            work_pool=work_pool,
             worker_name=name,
             heartbeat_interval_seconds=heartbeat_interval_seconds,
+            emit_status_change=emit_work_pool_status_event,
         )
 
-        if work_pool.status == schemas.statuses.WorkPoolStatus.NOT_READY:
-            await models.workers.update_work_pool(
-                session=session,
-                work_pool_id=work_pool.id,
-                work_pool=schemas.internal.InternalWorkPoolUpdate(
-                    status=schemas.statuses.WorkPoolStatus.READY
-                ),
-                emit_status_change=emit_work_pool_status_event,
-            )
-
 
 @router.post("/{work_pool_name}/workers/filter")
 async def read_workers(

prefect/utilities/templating/__init__.py

@@ -14,6 +14,7 @@ from typing import (
     overload,
 )
 
+import prefect.exceptions
 from prefect.client.utilities import inject_client
 from prefect.logging.loggers import get_logger
 from prefect.utilities.annotations import NotSet
@@ -348,9 +349,19 @@ async def resolve_block_document_references(
             )
         block_type_slug, block_document_name, *value_keypath = parts
 
-        block_document = await client.read_block_document_by_name(
-            name=block_document_name, block_type_slug=block_type_slug
-        )
+        try:
+            block_document = await client.read_block_document_by_name(
+                name=block_document_name, block_type_slug=block_type_slug
+            )
+        except prefect.exceptions.ObjectNotFound as exc:
+            raise prefect.exceptions.ObjectNotFound(
+                http_exc=exc.http_exc,
+                help_message=(
+                    f"Block not found: '{block_document_name}' of type '{block_type_slug}'. "
+                    f"This block was referenced in your deployment or work pool configuration but no longer exists. "
+                    f"It may have been deleted. Please check your configuration or create a new block."
+                ),
+            ) from exc
 
         data = block_document.data
         value: Any = data
@@ -377,7 +388,17 @@ async def resolve_block_document_references(
     if isinstance(template, dict):
         block_document_id = template.get("$ref", {}).get("block_document_id")
         if block_document_id:
-            block_document = await client.read_block_document(block_document_id)
+            try:
+                block_document = await client.read_block_document(block_document_id)
+            except prefect.exceptions.ObjectNotFound as exc:
+                raise prefect.exceptions.ObjectNotFound(
+                    http_exc=exc.http_exc,
+                    help_message=(
+                        f"Block not found: ID '{block_document_id}'. "
+                        f"This block was referenced in your deployment or work pool configuration but no longer exists. "
+                        f"It may have been deleted. Please check your configuration or create a new block."
+                    ),
+                ) from exc
             return block_document.data
         updated_template: dict[str, Any] = {}
         for key, value in template.items():

prefect/workers/_worker_channel/_protocol.py

@@ -93,6 +93,10 @@ class WorkerChannelProtocolHandler:
     def work_pool_snapshots_available(self) -> bool:
         return self._work_pool_snapshots.snapshots_available
 
+    @property
+    def work_pool_snapshot_sequence(self) -> int | None:
+        return self._work_pool_snapshots.last_applied_sequence
+
     async def handshake(
         self, websocket: websockets.asyncio.client.ClientConnection
     ) -> WorkerReadyFrame:

prefect/workers/_worker_channel/_sync.py

@@ -103,6 +103,7 @@ class WorkPoolWorkerChannel:
         )
         self._websocket_started = False
         self._run_scope: anyio.CancelScope | None = None
+        self._stopped = False
 
     @property
     def url(self) -> str | None:
@@ -128,13 +129,11 @@ class WorkPoolWorkerChannel:
         self._client = client
 
     def stop(self) -> None:
+        self._stopped = True
         if self._run_scope is not None:
             self._run_scope.cancel()
 
     async def sync(self, task_group: anyio.abc.TaskGroup | None) -> None:
-        if self.state.healthy and self.snapshots_available:
-            return
-
         if task_group is not None:
             channel_started = await self._start_websocket(task_group)
         else:
@@ -142,10 +141,9 @@ class WorkPoolWorkerChannel:
             if self.url is None:
                 self.state.mark_terminal("endpoint_unavailable")
 
-        if channel_started and self.snapshots_available:
-            return
+        if not (channel_started and self.snapshots_available):
+            await self._sync_rest_work_pool()
 
-        await self._sync_rest_work_pool()
         await self._send_rest_worker_heartbeat()
 
     async def _start_websocket(self, task_group: anyio.abc.TaskGroup) -> bool:
@@ -239,6 +237,8 @@ class WorkPoolWorkerChannel:
     async def _run(self, initial_session: WorkerChannelSession | None = None) -> None:
         with anyio.CancelScope() as scope:
             self._run_scope = scope
+            if self._stopped:
+                scope.cancel()
             try:
                 async with AsyncExitStack() as stack:
                     if self._cleanup_executor is not None:
@@ -296,6 +296,7 @@ class WorkPoolWorkerChannel:
                     self._run_scope = None
 
     async def _sync_rest_work_pool(self) -> None:
+        initial_snapshot_sequence = self._protocol.work_pool_snapshot_sequence
         try:
             work_pool = await self._client.read_work_pool(
                 work_pool_name=self.work_pool_name
@@ -334,7 +335,10 @@ class WorkPoolWorkerChannel:
                     )
                 return
 
-        if self.state.healthy and self.snapshots_available:
+        if (
+            self.state.healthy
+            and self._protocol.work_pool_snapshot_sequence != initial_snapshot_sequence
+        ):
             self._logger.debug(
                 "Skipping REST work pool sync because the worker channel applied a "
                 "snapshot while REST sync was in flight."
@@ -347,7 +351,10 @@ class WorkPoolWorkerChannel:
             )
             work_pool.base_job_template = self.default_base_job_template
 
-        if self.state.healthy and self.snapshots_available:
+        if (
+            self.state.healthy
+            and self._protocol.work_pool_snapshot_sequence != initial_snapshot_sequence
+        ):
             self._logger.debug(
                 "Skipping REST work pool snapshot because the worker channel applied "
                 "a snapshot while REST sync was in flight."

prefect/workers/base.py

@@ -11,6 +11,7 @@ import uuid
 import warnings
 from contextlib import AsyncExitStack
 from functools import partial
+from importlib.metadata import distributions
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -26,9 +27,6 @@ from zoneinfo import ZoneInfo
 import anyio
 import anyio.abc
 from exceptiongroup import BaseExceptionGroup, ExceptionGroup
-from importlib_metadata import (
-    distributions,  # type: ignore[reportUnknownVariableType] incomplete typing
-)
 from pydantic import BaseModel, Field, PrivateAttr, field_validator
 from pydantic.json_schema import GenerateJsonSchema
 from typing_extensions import Literal, Self, TypeVar

{prefect_client-3.7.2.dev2.dist-info → prefect_client-3.7.2.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.7.2.dev2
+Version: 3.7.2.dev3
 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.2.dev2.dist-info → prefect_client-3.7.2.dev3.dist-info}/RECORD

@@ -2,11 +2,11 @@ prefect/.prefectignore,sha256=awSprvKT0vI8a64mEOLrMxhxqcO-b0ERQeYpA2rNKVQ,390
 prefect/AGENTS.md,sha256=rOU4L6B0ZdvnVmLr_eL394QlwfJkPh1OZswHppAjUN4,10063
 prefect/__init__.py,sha256=4e69hAJtYPoEeRxc8iNjzp5WIkmXP0i2SNiN3c97_Go,6703
 prefect/__main__.py,sha256=WFjw3kaYJY6pOTA7WDOgqjsz8zUEUZHCcj3P5wyVa-g,66
-prefect/_build_info.py,sha256=AHkrkaCbyqiZK5RthlP9QpdWA0STowHOiJKlYYABweI,185
+prefect/_build_info.py,sha256=D7OiFa_wqNlew0FeFafW9ZPD-g41AtRn_SNU2gkqMNQ,185
 prefect/_flow_run_suspension.py,sha256=5zTTB7ZIBHzoS0pVrhNn23-9hK51qZ3CQA6C-azluC0,4144
 prefect/agent.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/artifacts.py,sha256=ZdMLJeJGK82hibtRzbsVa-g95dMa0D2UP1LiESoXmf4,23951
-prefect/automations.py,sha256=ZzPxn2tINdlXTQo805V4rIlbXuNWxd7cdb3gTJxZIeY,12567
+prefect/automations.py,sha256=OxfOezLuHHOB_S-ohyRBoTg6yL9MtbrlAyQq8zGkF9A,12607
 prefect/cache_policies.py,sha256=K0cymkMbEQBuwY1fSehefllN4Y4RblpNzYsh-LtjdXM,13156
 prefect/context.py,sha256=arDksENXHs3O1yOP8Iiq3CaerbsT6ixxM4BIrIuE2tM,38026
 prefect/engine.py,sha256=F0YQlbewnvQGJZyB-wDePQxm_9b89D0_9S1PhMvuULI,6002
@@ -146,7 +146,7 @@ prefect/bundles/__init__.py,sha256=3LiZeX-QG-5NnKq2FaQZrPOI_2Ta-2bOUir4F9-tEV0,3
 prefect/bundles/_file_collector.py,sha256=15v9l1vtbSwSfgA9tHF3jJzJxf2vWCCEJRvFIR89OSw,21222
 prefect/bundles/_ignore_filter.py,sha256=4p7Ku8h6LOVmagC0lLlK3SBo-FLrz2JXoJexFto5nKo,11067
 prefect/bundles/_path_resolver.py,sha256=-3VCDZxD7aDFJlucOdTK4PneW4XEfxpFo1MSfLJe5Xk,18366
-prefect/bundles/_zip_builder.py,sha256=KfPiuuTXUV9d7B0zLp53NMuWiZAUNBsPk34jcSeYfBU,5799
+prefect/bundles/_zip_builder.py,sha256=-agAOPVSaW5mEFyGcmAFgVj_K2sdtaWF-bPt0PGQLCo,6360
 prefect/bundles/_zip_extractor.py,sha256=aFU2PWH6Ar-6HMOljsSvdSruSS6QUlHt5rjdCpIWvNU,4637
 prefect/bundles/execute.py,sha256=KubXt8jNr9Xq7hf44oxi5fZEh0QcLHQO7ivtSElrQq0,1736
 prefect/client/AGENTS.md,sha256=16krPZUqEyiEaKk6jsLRK7MJHKlshe1mWnKvtvZiMco,3079
@@ -230,8 +230,8 @@ prefect/docker/__init__.py,sha256=gX5MJ5yHIK7WwpoOR3LpcR-vydv5SxrkOWdYQcgUL5o,71
 prefect/docker/_buildx.py,sha256=sVh0v12RZ3TkqzdawuIzfj1d2GTgpvT2WM5khrGXsqA,519
 prefect/docker/docker_image.py,sha256=afAOYLv8pIGBV-rDuMbzfnnfGlu7qMUb6l3jXGCAe_k,6962
 prefect/events/AGENTS.md,sha256=ZCrjaA67BQGdDzO5R7yJB7HO5Ahb8z7A3sT8yuKQ6V0,3049
-prefect/events/__init__.py,sha256=kBeikKnDbUpVGuBJAGGCI8Jj3qaZDleJ2eZddLRuakc,2162
-prefect/events/actions.py,sha256=7SXrnc_I72IrUjQRg7W3WTH6olS0r26SAPwusRTtffE,9620
+prefect/events/__init__.py,sha256=e3aIcHzTfseOmq_A3hM_jSPNYP_OdndJErzjcdrMuAc,2202
+prefect/events/actions.py,sha256=Ii5P4FX10Xu1nzU0e7okA1KC1eVIHhzExubFurrOr_Q,9785
 prefect/events/clients.py,sha256=m0KN7LpulgatjCVX5-3f8kzQKI_7u7Y3Nk6V948tTyc,33339
 prefect/events/filters.py,sha256=_vweQbeRxK8KiyKIPb6fYEtA5crbaUxlYPkWorFmMm4,9201
 prefect/events/related.py,sha256=CTeexYUmmA93V4gsR33GIFmw-SS-X_ouOpRg-oeq-BU,6672
@@ -304,7 +304,7 @@ prefect/server/api/block_capabilities.py,sha256=0x1vtC2CtSRVcCWydgNbylmfv_LnJHIo
 prefect/server/api/block_documents.py,sha256=srU5Jmn-Fguhut6PtV2N4XWZLJa2enwZ7ShcbrDRR6w,6034
 prefect/server/api/block_schemas.py,sha256=H9kxnKPlTvz62SMcX1ssHnQ8KACU2728ebCtSp2iLcs,5508
 prefect/server/api/block_types.py,sha256=DdKesZhnpGlTJtIidGoBSLEFFcAwFp-_XEA-SUOlhAM,8343
-prefect/server/api/clients.py,sha256=jP7N62_NUxOp2aUQhl6FFTNYPP7X33XcT00vNQLOEM0,9054
+prefect/server/api/clients.py,sha256=6bOdrsgn7jyM_YD89opjzrg9cJn6uUTHbs1P6wFotRI,9198
 prefect/server/api/collections.py,sha256=RI7cjdM8RYFyAk2rgb35vqh06PWGXAamTvwThl83joY,2454
 prefect/server/api/concurrency_limits.py,sha256=nJKOiKZwQvxFfAMBaqyeAWHjm6hrpErfnQIMuhhszoA,24503
 prefect/server/api/concurrency_limits_v2.py,sha256=-Wwk7eWe0stLt738wQslHZQxYUiMIiTodMWU1P6BuLk,17817
@@ -328,7 +328,7 @@ prefect/server/api/templates.py,sha256=EW5aJOuvSXBeShd5VIygI1f9W0uTUpGb32ADrL9LG
 prefect/server/api/validation.py,sha256=DPofXjLFejs_qusUQgzRkG89X2EFoviAy9J08pnNvyM,14543
 prefect/server/api/variables.py,sha256=8Ursuf20R5zXUS015ZexCH72K7R6Yv76ehkr_l3Xt0k,6186
 prefect/server/api/work_queues.py,sha256=BQQgiBWytrMgPhbHbOR_6Vx8T1V7JDIgeoZ4_LhmvCo,11276
-prefect/server/api/workers.py,sha256=SukmrFKvZro4OHHhiJE2z7iUvQSqlOPHgLXQCnJSNfM,30075
+prefect/server/api/workers.py,sha256=WnlQHlD41DS6ZH4NCr9Rx7dOXNWPTTFNaoH3TkHPNn4,44174
 prefect/server/api/collections_data/views/aggregate-worker-metadata.json,sha256=otKGMKJUh_ySkQyNBFCe84E6VRbuR-Z7_676D21YKsw,81525
 prefect/server/api/static/prefect-logo-mark-gradient.png,sha256=ylRjJkI_JHCw8VbQasNnXQHwZW-sH-IQiUGSD3aWP1E,73430
 prefect/server/api/ui/__init__.py,sha256=TCXO4ZUZCqCbm2QoNvWNTErkzWiX2nSACuO-0Tiomvg,93
@@ -422,23 +422,23 @@ prefect/utilities/schema_tools/__init__.py,sha256=At3rMHd2g_Em2P3_dFQlFgqR_EpBwr
 prefect/utilities/schema_tools/hydration.py,sha256=446SKv-W65VlX_5UGY3YvGYPQ7aYgb6dPy85EueU8FM,9671
 prefect/utilities/schema_tools/validation.py,sha256=UhRLWStdT9__u4yz-mnc3lcdt-VJmRGJBGV_f_9um-Y,10749
 prefect/utilities/templating/AGENTS.md,sha256=vkflyqkm9snY5sR-Wfxr855F55yJQTfSBEt5ThoSUF4,2097
-prefect/utilities/templating/__init__.py,sha256=8JR-OpK1Pblxp0AGpbLp48R5KDSBmUhWSIZs8nfkYbs,18091
+prefect/utilities/templating/__init__.py,sha256=-GGrp9CRHVPddmc_9z3BTBkMO7Vwqg-yevkJFaFHI2I,19248
 prefect/workers/AGENTS.md,sha256=rNcd5PutF7TUQJerXezNX3kemXR7VII_5CnuYq0l0vs,4282
 prefect/workers/__init__.py,sha256=EaM1F0RZ-XIJaGeTKLsXDnfOPHzVWk5bk0_c4BVS44M,64
 prefect/workers/_cleanup.py,sha256=U0tc0vExmsVpXaTo9H9CGHWnJOoykZiQVKI-cn5TJao,23675
 prefect/workers/_cleanup_handlers.py,sha256=dVy2qi5qjazjusunWcRZro5Hiy-stp8NqSeMNthjOnk,5169
-prefect/workers/base.py,sha256=zJWxpfwWxL21y3HpVdSdp-ephTdGCbt3qGyP_Op-ZlA,78395
+prefect/workers/base.py,sha256=cDxZY3jCZ5sm7xB_EXpxuxe6XIUdMqQ0OrcSNiwEscY,78325
 prefect/workers/block.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/workers/cloud.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/workers/process.py,sha256=QA9p3Z3br77PGVL_McPgYyeF2zABXlGTF1qLAsTHYwY,12820
 prefect/workers/server.py,sha256=bWnYfMfJf5_IO3y3aJOpia7p9lFKC3ZZjiMvHox-UKY,1992
 prefect/workers/utilities.py,sha256=-re_0s1Jr98W5xhJr4Xvvz34OxN3T4ypSupxdBiC8aA,2633
 prefect/workers/_worker_channel/__init__.py,sha256=vEc7NvC1sjxnCn5thQv5lSU1bDKRaT1sV7AA_6VRoCM,709
-prefect/workers/_worker_channel/_protocol.py,sha256=Wo5QuQ9h7gJlq1FLzrHHGbqTRgPS7mJA31svSBkfHBY,15699
+prefect/workers/_worker_channel/_protocol.py,sha256=GpCNh1o3qmmqHA_UOOTge1QVC6IRvWP2RdpAEBqXPs0,15834
 prefect/workers/_worker_channel/_state.py,sha256=eQTFZtAVDZH1vVWps3SdeY6aW3qu2wx1UKYQXK3AyuE,5369
-prefect/workers/_worker_channel/_sync.py,sha256=4VPYQbnhHeB2W4mJr-4qb-XR-YnaigUKjdAvJQqV0iw,14708
+prefect/workers/_worker_channel/_sync.py,sha256=G5G8_UaQYbeLebi5Mb1Z_KgGfXfyjXo5uT9la5_zwqY,14984
 prefect/workers/_worker_channel/_transport.py,sha256=cgrtAENawDpIPB8gwILd62y2VduykUCmg1NaO1pL-tg,9021
-prefect_client-3.7.2.dev2.dist-info/METADATA,sha256=Wy-hi6qLcnTmx0g139Ic9N6ArEO0VYVs5eXdOAkz3ec,7502
-prefect_client-3.7.2.dev2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-prefect_client-3.7.2.dev2.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
-prefect_client-3.7.2.dev2.dist-info/RECORD,,
+prefect_client-3.7.2.dev3.dist-info/METADATA,sha256=30GTP0tqIsf673WM91EeD7fFTwH5bpIw8m1fekn7s9M,7502
+prefect_client-3.7.2.dev3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+prefect_client-3.7.2.dev3.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
+prefect_client-3.7.2.dev3.dist-info/RECORD,,