prefect-client 3.7.2.dev3__tar.gz → 3.7.2.dev5__tar.gz

{prefect_client-3.7.2.dev3 → prefect_client-3.7.2.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.7.2.dev3
+Version: 3.7.2.dev5
 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.dev3 → prefect_client-3.7.2.dev5}/src/prefect/__init__.py

@@ -113,6 +113,11 @@ def _initialize_plugins() -> None:
         # Re-raise SystemExit from strict mode
         raise
     except Exception as e:
+        from pydantic_settings.exceptions import SettingsError
+
+        if isinstance(e, SettingsError):
+            return
+
         # Log but don't crash on plugin errors
         try:
             from prefect.logging import get_logger

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.7.2.dev5"
+__build_date__ = "2026-05-22 09:13:37.097941+00:00"
+__git_commit__ = "abc1acf7a442e5e43ad2849dc73d66c5b91143ae"
+__dirty__ = False

{prefect_client-3.7.2.dev3 → prefect_client-3.7.2.dev5}/src/prefect/runner/runner.py

@@ -215,7 +215,7 @@ class Runner:
                 def goodbye_flow(name):
                     print(f"goodbye {name}")
 
-                if __name__ == "__main__"
+                if __name__ == "__main__":
                     runner = Runner(name="my-runner")
 
                     # Will be runnable via the API
@@ -614,17 +614,17 @@ class Runner:
             def goodbye_flow(name):
                 print(f"goodbye {name}")
 
-            if __name__ == "__main__"
-                runner = Runner(name="my-runner")
+                if __name__ == "__main__":
+                    runner = Runner(name="my-runner")
 
-                # Will be runnable via the API
-                runner.add_flow(hello_flow)
+                    # Will be runnable via the API
+                    runner.add_flow(hello_flow)
 
-                # Run on a cron schedule
-                runner.add_flow(goodbye_flow, schedule={"cron": "0 * * * *"})
+                    # Run on a cron schedule
+                    runner.add_flow(goodbye_flow, schedule={"cron": "0 * * * *"})
 
-                asyncio.run(runner.start())
-            ```
+                    asyncio.run(runner.start())
+                ```
         """
         from prefect.runner.server import start_webserver
 
@@ -781,9 +781,9 @@ class Runner:
             # The process may be a multiprocessing.context.SpawnProcess, in which case it will have an `exitcode` attribute
             # but no `returncode` attribute
             if (
-                getattr(process, "returncode", None)
-                or getattr(process, "exitcode", None)
-            ) is None:
+                getattr(process, "returncode", None) is None
+                and getattr(process, "exitcode", None) is None
+            ):
                 await self._add_flow_run_process_map_entry(
                     flow_run.id, ProcessMapEntry(pid=process.pid, flow_run=flow_run)
                 )

{prefect_client-3.7.2.dev3 → prefect_client-3.7.2.dev5}/src/prefect/server/api/work_queues.py

@@ -78,6 +78,15 @@ async def update_work_queue(
     Updates an existing work queue.
     """
     async with db.session_context(begin_transaction=True) as session:
+        existing_work_queue = await models.work_queues.read_work_queue(
+            session=session, work_queue_id=work_queue_id
+        )
+        if existing_work_queue is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail=f"Work Queue {work_queue_id} not found",
+            )
+
         result = await models.work_queues.update_work_queue(
             session=session,
             work_queue_id=work_queue_id,
@@ -86,7 +95,8 @@ async def update_work_queue(
         )
     if not result:
         raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail=f"Work Queue {id} not found"
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail=f"Work Queue {work_queue_id} not found",
         )
 
 
@@ -239,6 +249,13 @@ async def delete_work_queue(
     Delete a work queue by id.
     """
     async with db.session_context(begin_transaction=True) as session:
+        existing_work_queue = await models.work_queues.read_work_queue(
+            session=session, work_queue_id=work_queue_id
+        )
+        if existing_work_queue is None:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND, detail="work queue not found"
+            )
         result = await models.work_queues.delete_work_queue(
             session=session, work_queue_id=work_queue_id
         )

{prefect_client-3.7.2.dev3 → prefect_client-3.7.2.dev5}/src/prefect/server/api/workers.py

@@ -26,14 +26,11 @@ 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,
@@ -49,6 +46,7 @@ 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 import worker_channel as worker_channel_utils
 from prefect.server.utilities.server import PrefectRouter
 from prefect.types import DateTime
 from prefect.types._datetime import now
@@ -185,13 +183,6 @@ class WorkerChannelWorkPoolUpdateEvent:
     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()
@@ -295,25 +286,6 @@ async def _resolve_worker_channel_work_queues(
     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,
@@ -392,7 +364,7 @@ async def _build_worker_ready_frame(
     initial_snapshot = WorkPoolSnapshotPayload(
         snapshot_sequence=1,
         reason="initial",
-        work_pool=await _build_worker_channel_work_pool_snapshot(
+        work_pool=await worker_channel_utils.build_worker_channel_work_pool_snapshot(
             session=session,
             work_pool=refreshed_work_pool,
         ),
@@ -433,27 +405,6 @@ async def _build_worker_ready_frame(
     )
 
 
-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,
-    )
-
-
 # -----------------------------------------------------
 # --
 # --
@@ -642,13 +593,23 @@ async def update_work_pool(
         work_pool_id = await worker_lookups._get_work_pool_id_from_name(
             session=session, work_pool_name=work_pool_name
         )
-        await models.workers.update_work_pool(
+        updated = await models.workers.update_work_pool(
             session=session,
             work_pool_id=work_pool_id,
             work_pool=work_pool,
             emit_status_change=emit_work_pool_status_event,
         )
 
+    if updated and worker_channel_utils.work_pool_update_triggers_snapshot(
+        update_values
+    ):
+        await worker_channel_utils.publish_snapshot_invalidation(
+            worker_channel_utils.WorkerChannelSnapshotInvalidation(
+                work_pool_id=work_pool_id,
+                reason="work_pool_updated",
+            )
+        )
+
 
 @router.delete("/{name}", status_code=status.HTTP_204_NO_CONTENT)
 async def delete_work_pool(
@@ -674,10 +635,19 @@ async def delete_work_pool(
             session=session, work_pool_name=work_pool_name
         )
 
-        await models.workers.delete_work_pool(
+        deleted = await models.workers.delete_work_pool(
             session=session, work_pool_id=work_pool_id
         )
 
+    if deleted:
+        await worker_channel_utils.publish_snapshot_invalidation(
+            worker_channel_utils.WorkerChannelSnapshotInvalidation(
+                work_pool_id=work_pool_id,
+                reason="work_pool_deleted",
+                work_pool_deleted=True,
+            )
+        )
+
 
 @router.post("/{name}/concurrency_status")
 async def read_work_pool_concurrency_status(
@@ -1013,8 +983,11 @@ async def update_work_queue(
     """
     Update a work pool queue
     """
-
     async with db.session_context(begin_transaction=True) as session:
+        await worker_lookups._get_work_pool_id_from_name(
+            session=session,
+            work_pool_name=work_pool_name,
+        )
         work_queue_id = await worker_lookups._get_work_queue_id_from_name(
             work_pool_name=work_pool_name,
             work_queue_name=work_queue_name,
@@ -1045,6 +1018,10 @@ async def delete_work_queue(
     """
 
     async with db.session_context(begin_transaction=True) as session:
+        await worker_lookups._get_work_pool_id_from_name(
+            session=session,
+            work_pool_name=work_pool_name,
+        )
         work_queue_id = await worker_lookups._get_work_queue_id_from_name(
             session=session,
             work_pool_name=work_pool_name,
@@ -1081,84 +1058,58 @@ async def worker_channel_connect(
 
     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(
+        async with worker_channel_utils.messaging.ephemeral_subscription(
+            worker_channel_utils.WORKER_CHANNEL_SNAPSHOT_TOPIC,
+        ) as consumer_kwargs:
+            async with db.session_context(begin_transaction=True) as session:
+                ready, work_pool_update_event = await _build_worker_ready_frame(
                     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
+                    work_pool_name=work_pool_name,
+                    hello=hello,
                 )
-                return
 
-            try:
-                async with db.session_context(begin_transaction=True) as session:
-                    await _persist_worker_channel_heartbeat(
+            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_name=work_pool_name,
-                        frame=frame,
+                        work_pool=work_pool,
+                        changed_fields=work_pool_update_event.changed_fields,
+                    )
+                await worker_channel_utils.publish_snapshot_invalidation(
+                    worker_channel_utils.WorkerChannelSnapshotInvalidation(
+                        work_pool_id=work_pool_update_event.work_pool_id,
+                        reason="work_pool_updated",
                     )
-            except Exception:
-                logger.exception("Worker channel heartbeat persistence failed")
-                await _close_worker_channel(
-                    websocket,
-                    WorkerChannelCloseReason.HEARTBEAT_PERSISTENCE_FAILED,
                 )
-                return
+
+            connection = worker_channel_utils.WorkerChannelConnection(
+                websocket=websocket,
+                db=db,
+                work_pool_name=work_pool_name,
+                work_pool_id=ready.payload.initial_snapshot.work_pool.id,
+                consumer_id=hello.payload.consumer_id,
+                worker_name=hello.payload.worker_name,
+            )
+            await connection.run(ready, consumer_kwargs)
 
     except WorkerChannelSetupError as exc:
         logger.info("Worker channel setup failed: %s", exc.detail)
-        await _close_worker_channel(websocket, exc.close_reason)
+        await worker_channel_utils.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)
+        await worker_channel_utils.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(
+        await worker_channel_utils.close_worker_channel(
             websocket, WorkerChannelCloseReason.TRANSIENT_SERVER_ERROR
         )
 

{prefect_client-3.7.2.dev3 → prefect_client-3.7.2.dev5}/src/prefect/settings/sources.py

@@ -14,6 +14,7 @@ from pydantic_settings import (
     EnvSettingsSource,
     PydanticBaseSettingsSource,
 )
+from pydantic_settings.exceptions import SettingsError
 from pydantic_settings.sources import (
     ENV_FILE_SENTINEL,
     ConfigFileSourceMixin,
@@ -230,7 +231,12 @@ class TomlConfigSettingsSourceBase(PydanticBaseSettingsSource, ConfigFileSourceM
         self.toml_data: dict[str, Any] = {}
 
     def _read_file(self, path: Path) -> dict[str, Any]:
-        return _read_toml_file(path)
+        try:
+            return _read_toml_file(path)
+        except tomllib.TOMLDecodeError as e:
+            raise SettingsError(
+                f"Failed to load Prefect settings from {path}: invalid TOML ({e})"
+            ) from e
 
     @staticmethod
     def _field_is_dict_type(field: FieldInfo) -> bool:

prefect_client-3.7.2.dev3/src/prefect/_build_info.py

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