prefect-client 3.7.2.dev5__tar.gz → 3.7.3.dev2__tar.gz

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.7.2.dev5
+Version: 3.7.3.dev2
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -47,7 +47,7 @@ Requires-Dist: prometheus-client>=0.20.0
 Requires-Dist: pydantic!=2.11.0,!=2.11.1,!=2.11.2,!=2.11.3,!=2.11.4,<3.0.0,>=2.10.1
 Requires-Dist: pydantic-core<3.0.0,>=2.12.0
 Requires-Dist: pydantic-extra-types<3.0.0,>=2.8.2
-Requires-Dist: pydantic-settings!=2.9.0,<3.0.0,>2.2.1
+Requires-Dist: pydantic-settings<3.0.0,>=2.9.1
 Requires-Dist: python-dateutil<3.0.0,>=2.8.2
 Requires-Dist: python-slugify<9.0,>=5.0
 Requires-Dist: pytz<2027,>=2021.1

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/pyproject.toml

@@ -51,7 +51,7 @@ dependencies = [
     "pydantic>=2.10.1,<3.0.0,!=2.11.0,!=2.11.1,!=2.11.2,!=2.11.3,!=2.11.4",
     "pydantic_core>=2.12.0,<3.0.0",
     "pydantic_extra_types>=2.8.2,<3.0.0",
-    "pydantic_settings>2.2.1,<3.0.0,!=2.9.0",
+    "pydantic_settings>=2.9.1,<3.0.0",
     "python-dateutil>=2.8.2,<3.0.0",
     "python-slugify>=5.0,<9.0",
     "pytz>=2021.1,<2027",

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.7.3.dev2"
+__build_date__ = "2026-05-25 09:28:23.703020+00:00"
+__git_commit__ = "64710e8bd0984713d10bb34b1f3cbd6098a99fac"
+__dirty__ = False

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/concurrency/_leases.py

@@ -143,9 +143,14 @@ def _start_lease_renewal_thread(
     stop_event = threading.Event()
     renewal_ctx = contextvars.copy_context()
 
-    def renewal_loop() -> None:
+    def _run_with_failure_handler() -> None:
+        # Runs inside renewal_ctx so the failure handler also sees the
+        # copied flow/task run contextvars; otherwise get_run_logger() in
+        # _handle_lease_renewal_failure can't find the run context and the
+        # message falls back to the plain "prefect.concurrency" logger,
+        # never reaching the run logs API.
         try:
-            renewal_ctx.run(_lease_renewal_loop, lease_id, lease_duration, stop_event)
+            _lease_renewal_loop(lease_id, lease_duration, stop_event)
         except Exception as exc:
             if not stop_event.is_set():
                 _handle_lease_renewal_failure(
@@ -156,6 +161,9 @@ def _start_lease_renewal_thread(
                     cancel_scope,
                 )
 
+    def renewal_loop() -> None:
+        renewal_ctx.run(_run_with_failure_handler)
+
     thread = threading.Thread(
         target=renewal_loop,
         daemon=True,

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/events/clients.py

@@ -31,7 +31,7 @@ from websockets.exceptions import (
 import prefect.types._datetime
 from prefect._internal.version_checking import check_server_version
 from prefect._internal.websockets import websocket_connect
-from prefect.events import Event
+from prefect.events.schemas.events import Event
 from prefect.logging import get_logger
 from prefect.settings import (
     PREFECT_API_KEY,

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/events/subscribers.py

@@ -13,9 +13,9 @@ from typing_extensions import Self
 
 from prefect.client.schemas.filters import LogFilter, LogFilterFlowRunId
 from prefect.client.schemas.objects import TERMINAL_STATES, Log, StateType
-from prefect.events import Event
 from prefect.events.clients import get_events_subscriber
 from prefect.events.filters import EventAnyResourceFilter, EventFilter
+from prefect.events.schemas.events import Event
 from prefect.logging.clients import get_logs_subscriber
 
 if TYPE_CHECKING:

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/logging/handlers.py

@@ -16,7 +16,6 @@ from rich.highlighter import Highlighter, NullHighlighter
 from rich.theme import Theme
 from typing_extensions import Self
 
-import prefect.context
 from prefect._internal.concurrency.api import create_call, from_sync
 from prefect._internal.concurrency.event_loop import get_running_loop
 from prefect._internal.concurrency.services import BatchedQueueService
@@ -161,7 +160,9 @@ class APILogHandler(logging.Handler):
         Send a log to the `APILogWorker`
         """
         try:
-            profile = prefect.context.get_settings_context()
+            from prefect.context import get_settings_context
+
+            profile = get_settings_context()
 
             if not profile.settings.logging.to_api.enabled:
                 return  # Respect the global settings toggle
@@ -214,7 +215,9 @@ class APILogHandler(logging.Handler):
 
         if not flow_run_id:
             try:
-                context = prefect.context.get_run_context()
+                from prefect.context import get_run_context
+
+                context = get_run_context()
             except MissingContextError:
                 raise MissingContextError(
                     f"Logger {record.name!r} attempted to send logs to the API without"

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/results.py

@@ -699,6 +699,8 @@ class ResultStore(BaseModel):
             except Exception:
                 return False
         else:
+            if self.result_storage is None:
+                self.result_storage = await aget_default_result_storage()
             try:
                 content = await call_explicitly_async_block_method(
                     self.result_storage, "read_path", (key,), {}
@@ -742,6 +744,8 @@ class ResultStore(BaseModel):
             except Exception:
                 return False
         else:
+            if self.result_storage is None:
+                self.result_storage = get_default_result_storage(_sync=True)
             try:
                 content = call_explicitly_sync_block_method(
                     self.result_storage, "read_path", (key,), {}

prefect_client-3.7.3.dev2/src/prefect/server/api/_ui_static.py

@@ -0,0 +1,85 @@
+"""Private helpers for UI static-file management during server startup."""
+
+from __future__ import annotations
+
+import errno
+import logging
+import pathlib
+import shutil
+from dataclasses import dataclass
+from typing import Literal
+
+UIVersion = Literal["v1", "v2"]
+
+
+@dataclass(frozen=True)
+class UIBundle:
+    version: UIVersion
+    source_static_path: str
+    static_dir: str
+    base_url: str
+    cache_key: str
+    mount_name: str
+
+
+def log_ui_static_copy_error(
+    bundle: UIBundle,
+    exc: OSError,
+    logger: logging.Logger,
+) -> None:
+    """Log an actionable error when copying a UI bundle's static files fails."""
+    if exc.errno == errno.ENOSPC:
+        try:
+            disk_path = pathlib.Path(bundle.static_dir)
+            while not disk_path.exists():
+                disk_path = disk_path.parent
+            usage = shutil.disk_usage(disk_path)
+            available_mb = usage.free / (1024 * 1024)
+        except OSError:
+            available_mb = None
+        try:
+            required_bytes = sum(
+                f.stat().st_size
+                for f in pathlib.Path(bundle.source_static_path).rglob("*")
+                if f.is_file()
+            )
+            required_mb = required_bytes / (1024 * 1024)
+        except OSError:
+            required_mb = None
+
+        space_detail = ""
+        if required_mb is not None and available_mb is not None:
+            space_detail = (
+                f" Required: {required_mb:.1f} MB, available: {available_mb:.1f} MB."
+            )
+        elif available_mb is not None:
+            space_detail = f" Available disk space: {available_mb:.1f} MB."
+
+        logger.error(
+            "Not enough disk space to unpack %s UI static"
+            " files at %s.%s To resolve this, increase the"
+            " size of the volume mounted at that path or set"
+            " PREFECT_UI_STATIC_DIRECTORY to a location with"
+            " sufficient space.",
+            bundle.version.upper(),
+            bundle.static_dir,
+            space_detail,
+        )
+    elif isinstance(exc, PermissionError):
+        logger.error(
+            "Failed to create %s UI static directory at %s:"
+            " %s. That UI will not be available. To resolve"
+            " this, set PREFECT_UI_STATIC_DIRECTORY to a"
+            " writable directory.",
+            bundle.version.upper(),
+            bundle.static_dir,
+            exc,
+        )
+    else:
+        logger.error(
+            "Failed to create %s UI static directory at %s:"
+            " %s. That UI will not be available.",
+            bundle.version.upper(),
+            bundle.static_dir,
+            exc,
+        )

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/server/api/server.py

@@ -21,11 +21,10 @@ import subprocess
 import sys
 import time
 from contextlib import AsyncExitStack, asynccontextmanager
-from dataclasses import dataclass
 from datetime import timedelta
 from functools import wraps
 from hashlib import sha256
-from typing import Any, AsyncGenerator, Awaitable, Callable, Literal, Optional
+from typing import Any, AsyncGenerator, Awaitable, Callable, Optional
 
 import anyio
 import asyncpg
@@ -52,6 +51,7 @@ from prefect._internal.compatibility.starlette import status
 from prefect._internal.observability import configure_logfire
 from prefect.client.constants import SERVER_API_VERSION
 from prefect.logging import get_logger
+from prefect.server.api._ui_static import UIBundle, UIVersion, log_ui_static_copy_error
 from prefect.server.api.background_workers import background_worker
 from prefect.server.api.dependencies import EnforceMinimumAPIVersion
 from prefect.server.exceptions import ObjectNotFoundError
@@ -128,7 +128,6 @@ SQLITE_LOCKED_MSG = "database is locked"
 UI_VERSION_COOKIE_NAME = "prefect_ui_version"
 UI_VERSION_PATH_SEGMENT = "v2"
 UI_STATIC_REFERENCE_FILE_NAME = "UI_SERVE_BASE"
-UIVersion = Literal["v1", "v2"]
 
 
 class _SQLiteLockedOperationalErrorFilter(logging.Filter):
@@ -183,16 +182,6 @@ class SPAStaticFiles(StaticFiles):
             return await super().get_response("./index.html", scope)
 
 
-@dataclass(frozen=True)
-class UIBundle:
-    version: UIVersion
-    source_static_path: str
-    static_dir: str
-    base_url: str
-    cache_key: str
-    mount_name: str
-
-
 def _normalize_ui_base_url(base_url: str) -> str:
     if not base_url:
         return "/"
@@ -749,15 +738,8 @@ def create_ui_app(ephemeral: bool) -> FastAPI:
             if not reference_file_matches_cache_key(bundle):
                 try:
                     create_ui_static_subpath(bundle)
-                except PermissionError as exc:
-                    logger.error(
-                        "Failed to create %s UI static directory at %s: %s. "
-                        "That UI will not be available. "
-                        "To resolve this, set PREFECT_UI_STATIC_DIRECTORY to a writable directory.",
-                        bundle.version.upper(),
-                        bundle.static_dir,
-                        exc,
-                    )
+                except OSError as exc:
+                    log_ui_static_copy_error(bundle, exc, logger)
                     continue
 
             mounted_bundles[bundle.version] = bundle

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

@@ -386,7 +386,7 @@ async def _build_worker_ready_frame(
             sent_at=now("UTC"),
             payload={
                 "consumer_id": hello.payload.consumer_id,
-                "worker_id": worker.id,
+                "worker_id": None,
                 "selected_channel_version": selected_channel_version,
                 "effective_heartbeat_interval_seconds": (
                     hello.payload.heartbeat_interval_seconds

{prefect_client-3.7.2.dev5 → prefect_client-3.7.3.dev2}/src/prefect/utilities/templating/__init__.py

@@ -1,6 +1,7 @@
 import enum
 import os
 import re
+from copy import deepcopy
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -24,6 +25,7 @@ if TYPE_CHECKING:
     import logging
 
     from prefect.client.orchestration import PrefectClient
+    from prefect.client.schemas.objects import BlockDocument
 
 
 T = TypeVar("T", str, int, float, bool, dict[Any, Any], list[Any], None)
@@ -338,7 +340,49 @@ async def resolve_block_document_references(
         # the function signature must mark it as optional to callers.
         assert client is not None
 
-    async def _resolve_single_placeholder(placeholder: Placeholder) -> Any:
+    block_documents_by_id: dict[Any, "BlockDocument"] = {}
+    block_documents_by_name: dict[tuple[str, str], "BlockDocument"] = {}
+
+    async def _read_block_document_by_name(
+        block_type_slug: str, block_document_name: str
+    ) -> "BlockDocument":
+        cache_key = (block_type_slug, block_document_name)
+        if cache_key not in block_documents_by_name:
+            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
+            block_documents_by_name[cache_key] = block_document
+
+        return block_documents_by_name[cache_key]
+
+    async def _read_block_document_by_id(block_document_id: Any) -> "BlockDocument":
+        if block_document_id not in block_documents_by_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
+            block_documents_by_id[block_document_id] = block_document
+
+        return block_documents_by_id[block_document_id]
+
+    async def _resolve_single_placeholder(placeholder: Placeholder, tmpl: T) -> Any:
         parts = placeholder.name.replace(BLOCK_DOCUMENT_PLACEHOLDER_PREFIX, "").split(
             ".", 2
         )
@@ -349,19 +393,9 @@ async def resolve_block_document_references(
             )
         block_type_slug, block_document_name, *value_keypath = parts
 
-        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
+        block_document = await _read_block_document_by_name(
+            block_type_slug, block_document_name
+        )
 
         data = block_document.data
         value: Any = data
@@ -375,80 +409,67 @@ async def resolve_block_document_references(
             from_dict: Any = get_from_dict(data, value_keypath[0], default=NotSet)
             if from_dict is NotSet:
                 raise ValueError(
-                    f"Invalid template: {template!r}. Could not resolve the"
+                    f"Invalid template: {tmpl!r}. Could not resolve the"
                     " keypath in the block document data."
                 )
             value = from_dict
 
+        value = deepcopy(value)
+
         if value_transformer:
             value = value_transformer(placeholder.full_match, value)
 
         return value
 
-    if isinstance(template, dict):
-        block_document_id = template.get("$ref", {}).get("block_document_id")
-        if 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():
-            updated_value = await resolve_block_document_references(
-                value, value_transformer=value_transformer, client=client
+    async def _resolve(tmpl: T) -> Union[T, dict[str, Any]]:
+        if isinstance(tmpl, dict):
+            block_document_id = tmpl.get("$ref", {}).get("block_document_id")
+            if block_document_id:
+                block_document = await _read_block_document_by_id(block_document_id)
+                return deepcopy(block_document.data)
+            updated_template: dict[str, Any] = {}
+            for key, value in tmpl.items():
+                updated_template[key] = await _resolve(value)
+            return updated_template
+        elif isinstance(tmpl, list):
+            return [await _resolve(item) for item in tmpl]
+        elif isinstance(tmpl, str):
+            placeholders = find_placeholders(tmpl)
+            has_block_document_placeholder = any(
+                placeholder.type is PlaceholderType.BLOCK_DOCUMENT
+                for placeholder in placeholders
             )
-            updated_template[key] = updated_value
-        return updated_template
-    elif isinstance(template, list):
-        return [
-            await resolve_block_document_references(
-                item, value_transformer=value_transformer, client=client
-            )
-            for item in template
-        ]
-    elif isinstance(template, str):
-        placeholders = find_placeholders(template)
-        has_block_document_placeholder = any(
-            placeholder.type is PlaceholderType.BLOCK_DOCUMENT
-            for placeholder in placeholders
-        )
-        if not (placeholders and has_block_document_placeholder):
-            return template
-        elif (
-            len(placeholders) == 1
-            and list(placeholders)[0].full_match == template
-            and list(placeholders)[0].type is PlaceholderType.BLOCK_DOCUMENT
-        ):
-            [placeholder] = placeholders
-            return await _resolve_single_placeholder(placeholder)
-        else:
-            # Inline substitution: replace each block placeholder with its resolved value.
-            # Any non-block placeholders are left intact for later resolution.
-            result = template
-            for placeholder in placeholders:
-                if placeholder.type is not PlaceholderType.BLOCK_DOCUMENT:
-                    continue
-                value = await _resolve_single_placeholder(placeholder)
-                if isinstance(value, (dict, list)):
-                    raise ValueError(
-                        f"Invalid template: {template!r}. Block placeholder"
-                        f" {placeholder.full_match!r} resolved to a {type(value).__name__},"
-                        " which cannot be used for inline string substitution."
-                        " Resolve a scalar attribute instead (e.g., '.value' or '.url')."
-                    )
-                result = result.replace(placeholder.full_match, str(value))
+            if not (placeholders and has_block_document_placeholder):
+                return tmpl
+            elif (
+                len(placeholders) == 1
+                and list(placeholders)[0].full_match == tmpl
+                and list(placeholders)[0].type is PlaceholderType.BLOCK_DOCUMENT
+            ):
+                [placeholder] = placeholders
+                return await _resolve_single_placeholder(placeholder, tmpl)
+            else:
+                # Inline substitution: replace each block placeholder with its resolved value.
+                # Any non-block placeholders are left intact for later resolution.
+                result = tmpl
+                for placeholder in placeholders:
+                    if placeholder.type is not PlaceholderType.BLOCK_DOCUMENT:
+                        continue
+                    value = await _resolve_single_placeholder(placeholder, tmpl)
+                    if isinstance(value, (dict, list)):
+                        raise ValueError(
+                            f"Invalid template: {tmpl!r}. Block placeholder"
+                            f" {placeholder.full_match!r} resolved to a {type(value).__name__},"
+                            " which cannot be used for inline string substitution."
+                            " Resolve a scalar attribute instead (e.g., '.value' or '.url')."
+                        )
+                    result = result.replace(placeholder.full_match, str(value))
 
-            return cast(T, result)
+                return cast(T, result)
 
-    return template
+        return tmpl
+
+    return await _resolve(template)
 
 
 @inject_client
@@ -472,43 +493,55 @@ async def resolve_variables(template: T, client: Optional["PrefectClient"] = Non
         # the function signature must mark it as optional to callers.
         assert client is not None
 
-    if isinstance(template, str):
-        placeholders = find_placeholders(template)
-        has_variable_placeholder = any(
-            placeholder.type is PlaceholderType.VARIABLE for placeholder in placeholders
-        )
-        if not placeholders or not has_variable_placeholder:
-            # If there are no values, we can just use the template
-            return template
-        elif (
-            len(placeholders) == 1
-            and list(placeholders)[0].full_match == template
-            and list(placeholders)[0].type is PlaceholderType.VARIABLE
-        ):
-            variable_name = list(placeholders)[0].name.replace(
-                VARIABLE_PLACEHOLDER_PREFIX, ""
+    _SENTINEL = object()
+    _MISSING = object()
+    cache: dict[str, Any] = {}
+
+    async def _read_variable(name: str) -> Any:
+        variable_name = name.replace(VARIABLE_PLACEHOLDER_PREFIX, "")
+        cached = cache.get(variable_name, _SENTINEL)
+        if cached is not _SENTINEL:
+            return cached
+        variable = await client.read_variable_by_name(name=variable_name)
+        if variable is None:
+            cache[variable_name] = _MISSING
+            return _MISSING
+        cache[variable_name] = variable.value
+        return variable.value
+
+    async def _resolve(tmpl: T) -> T:
+        if isinstance(tmpl, str):
+            placeholders = find_placeholders(tmpl)
+            has_variable_placeholder = any(
+                placeholder.type is PlaceholderType.VARIABLE
+                for placeholder in placeholders
             )
-            variable = await client.read_variable_by_name(name=variable_name)
-            if variable is None:
-                return ""
+            if not placeholders or not has_variable_placeholder:
+                return tmpl
+            elif (
+                len(placeholders) == 1
+                and list(placeholders)[0].full_match == tmpl
+                and list(placeholders)[0].type is PlaceholderType.VARIABLE
+            ):
+                value = await _read_variable(list(placeholders)[0].name)
+                if value is _MISSING:
+                    return ""
+                else:
+                    return cast(T, value)
             else:
-                return cast(T, variable.value)
+                for full_match, name, placeholder_type in placeholders:
+                    if placeholder_type is PlaceholderType.VARIABLE:
+                        value = await _read_variable(name)
+                        if value is _MISSING:
+                            tmpl = tmpl.replace(full_match, "")
+                        else:
+                            tmpl = tmpl.replace(full_match, str(value))
+                return tmpl
+        elif isinstance(tmpl, dict):
+            return {key: await _resolve(value) for key, value in tmpl.items()}
+        elif isinstance(tmpl, list):
+            return [await _resolve(item) for item in tmpl]
         else:
-            for full_match, name, placeholder_type in placeholders:
-                if placeholder_type is PlaceholderType.VARIABLE:
-                    variable_name = name.replace(VARIABLE_PLACEHOLDER_PREFIX, "")
-                    variable = await client.read_variable_by_name(name=variable_name)
-                    if variable is None:
-                        template = template.replace(full_match, "")
-                    else:
-                        template = template.replace(full_match, str(variable.value))
-            return template
-    elif isinstance(template, dict):
-        return {
-            key: await resolve_variables(value, client=client)
-            for key, value in template.items()
-        }
-    elif isinstance(template, list):
-        return [await resolve_variables(item, client=client) for item in template]
-    else:
-        return template
+            return tmpl
+
+    return await _resolve(template)

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

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