prefect 3.5.1.dev2__tar.gz → 3.5.1.dev3__tar.gz

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/PKG-INFO

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

prefect-3.5.1.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.5.1.dev3"
+__build_date__ = "2025-11-06 08:09:37.199504+00:00"
+__git_commit__ = "ab79573349a6dfc69a4fcb4227957d18b24c7b53"
+__dirty__ = False

prefect-3.5.1.dev3/src/prefect/_internal/lazy.py

@@ -0,0 +1,47 @@
+"""Utilities for lazy-loading module-level objects."""
+
+from typing import Callable, Generic, TypeVar
+
+K = TypeVar("K")
+V = TypeVar("V")
+
+
+class LazyDict(Generic[K, V]):
+    """
+    A dictionary-like object that defers loading its contents until first access.
+
+    Useful for module-level registries that import heavy dependencies. The loader
+    function is called once on first access, and the result is cached.
+
+    Example:
+        >>> def load_plugins() -> dict[str, type]:
+        ...     from heavy_module import PluginA, PluginB
+        ...     return {"a": PluginA, "b": PluginB}
+        >>>
+        >>> plugins: LazyDict[str, type] = LazyDict(load_plugins)
+        >>> # Nothing loaded yet
+        >>> plugins.get("a")  # Triggers load, returns PluginA
+        >>> plugins.get("b")  # Uses cached result, returns PluginB
+    """
+
+    def __init__(self, loader_func: Callable[[], dict[K, V]]) -> None:
+        self._loader = loader_func
+        self._cache: dict[K, V] | None = None
+
+    def _ensure_loaded(self) -> dict[K, V]:
+        """Load the dictionary contents if not already loaded."""
+        if self._cache is None:
+            self._cache = self._loader()
+        return self._cache
+
+    def get(self, key: K, default: V | None = None) -> V | None:
+        """Get an item from the lazy dict, loading if necessary."""
+        return self._ensure_loaded().get(key, default)
+
+    def __contains__(self, key: K) -> bool:
+        """Check if key is in the lazy dict, loading if necessary."""
+        return key in self._ensure_loaded()
+
+    def __getitem__(self, key: K) -> V:
+        """Get an item from the lazy dict, loading if necessary."""
+        return self._ensure_loaded()[key]

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/_types.py

@@ -6,7 +6,7 @@ import asyncio
 import functools
 import sys
 from datetime import datetime
-from typing import Any, Callable, List, Optional
+from typing import TYPE_CHECKING, Any, Callable, List, Optional
 
 import typer
 from rich.console import Console
@@ -14,11 +14,14 @@ from rich.theme import Theme
 
 from prefect._internal.compatibility.deprecated import generate_deprecation_message
 from prefect.cli._utilities import with_cli_exception_handling
-from prefect.settings import PREFECT_CLI_COLORS, Setting
+from prefect.settings import get_current_settings
 from prefect.utilities.asyncutils import is_async_fn
 
+if TYPE_CHECKING:
+    from prefect.settings.legacy import Setting
 
-def SettingsOption(setting: Setting, *args: Any, **kwargs: Any) -> Any:
+
+def SettingsOption(setting: "Setting", *args: Any, **kwargs: Any) -> Any:
     """Custom `typer.Option` factory to load the default value from settings"""
 
     return typer.Option(
@@ -34,7 +37,7 @@ def SettingsOption(setting: Setting, *args: Any, **kwargs: Any) -> Any:
     )
 
 
-def SettingsArgument(setting: Setting, *args: Any, **kwargs: Any) -> Any:
+def SettingsArgument(setting: "Setting", *args: Any, **kwargs: Any) -> Any:
     """Custom `typer.Argument` factory to load the default value from settings"""
 
     # See comments in `SettingsOption`
@@ -91,7 +94,7 @@ class PrefectTyper(typer.Typer):
         self.console = Console(
             highlight=False,
             theme=Theme({"prompt.choices": "bold blue"}),
-            color_system="auto" if PREFECT_CLI_COLORS else None,
+            color_system="auto" if get_current_settings().cli.colors else None,
         )
 
     def add_typer(
@@ -201,7 +204,7 @@ class PrefectTyper(typer.Typer):
     def setup_console(self, soft_wrap: bool, prompt: bool) -> None:
         self.console = Console(
             highlight=False,
-            color_system="auto" if PREFECT_CLI_COLORS else None,
+            color_system="auto" if get_current_settings().cli.colors else None,
             theme=Theme({"prompt.choices": "bold blue"}),
             soft_wrap=not soft_wrap,
             force_interactive=prompt,

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/_utilities.py

@@ -12,7 +12,7 @@ import typer
 from click.exceptions import ClickException
 
 from prefect.exceptions import MissingProfileError
-from prefect.settings import PREFECT_TEST_MODE
+from prefect.settings import get_current_settings
 
 
 def exit_with_error(message: str | Exception, code: int = 1, **kwargs: Any) -> NoReturn:
@@ -47,7 +47,7 @@ def with_cli_exception_handling(fn: Callable[..., Any]) -> Callable[..., Any]:
         except MissingProfileError as exc:
             exit_with_error(exc)
         except Exception:
-            if PREFECT_TEST_MODE.value():
+            if get_current_settings().testing.test_mode:
                 raise  # Reraise exceptions during test mode
             traceback.print_exc()
             exit_with_error("An exception occurred.")

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/block.py

@@ -28,7 +28,7 @@ from prefect.exceptions import (
     ScriptError,
     exception_traceback,
 )
-from prefect.settings import PREFECT_UI_URL
+from prefect.settings import get_current_settings
 from prefect.utilities.asyncutils import run_sync_in_worker_thread
 from prefect.utilities.importtools import load_script_as_module
 
@@ -244,7 +244,7 @@ async def register(
         "go to the Blocks page in the Prefect UI.\n"
     )
 
-    if ui_url := PREFECT_UI_URL:
+    if ui_url := get_current_settings().ui_url:
         if determine_server_type() == ServerType.CLOUD:
             block_catalog_url = f"{ui_url}/settings/blocks/catalog"
         else:
@@ -349,17 +349,16 @@ async def block_create(
             app.console.print(f"Available block types: {', '.join(slugs)}")
             raise typer.Exit(1)
 
-        if not PREFECT_UI_URL:
+        ui_url = get_current_settings().ui_url
+        if not ui_url:
             exit_with_error(
                 "Prefect must be configured to use a hosted Prefect server or "
                 "Prefect Cloud to display the Prefect UI"
             )
         if determine_server_type() == ServerType.CLOUD:
-            block_link = f"{PREFECT_UI_URL.value()}/settings/blocks/catalog/{block_type.slug}/create"
+            block_link = f"{ui_url}/settings/blocks/catalog/{block_type.slug}/create"
         else:
-            block_link = (
-                f"{PREFECT_UI_URL.value()}/blocks/catalog/{block_type.slug}/create"
-            )
+            block_link = f"{ui_url}/blocks/catalog/{block_type.slug}/create"
         app.console.print(
             f"Create a {block_type_slug} block: {block_link}",
         )

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/cloud/webhook.py

@@ -14,7 +14,7 @@ from prefect.cli.cloud import cloud_app, confirm_logged_in
 from prefect.cli.root import app, is_interactive
 from prefect.client.cloud import get_cloud_client
 from prefect.exceptions import ObjectNotFound
-from prefect.settings import PREFECT_API_URL
+from prefect.settings import get_current_settings
 
 webhook_app: PrefectTyper = PrefectTyper(
     name="webhook", help="Manage Prefect Cloud Webhooks"
@@ -49,7 +49,7 @@ async def ls():
     confirm_logged_in()
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         retrieved_webhooks = await client.request("POST", "/webhooks/filter")
         display_table = _render_webhooks_into_table(retrieved_webhooks)
         app.console.print(display_table)
@@ -63,7 +63,7 @@ async def get(webhook_id: UUID):
     confirm_logged_in()
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         webhook = await client.request("GET", f"/webhooks/{webhook_id}")
         display_table = _render_webhooks_into_table([webhook])
         app.console.print(display_table)
@@ -94,7 +94,7 @@ async def create(
     confirm_logged_in()
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         response = await client.request(
             "POST",
             "/webhooks/",
@@ -122,7 +122,7 @@ async def rotate(webhook_id: UUID):
         return
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         response = await client.request("POST", f"/webhooks/{webhook_id}/rotate")
         app.console.print(f"Successfully rotated webhook URL to {response['slug']}")
 
@@ -138,7 +138,7 @@ async def toggle(
 
     status_lookup = {True: "enabled", False: "disabled"}
 
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         response = await client.request("GET", f"/webhooks/{webhook_id}")
         current_status = response["enabled"]
         new_status = not current_status
@@ -166,7 +166,7 @@ async def update(
     confirm_logged_in()
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         response = await client.request("GET", f"/webhooks/{webhook_id}")
         update_payload = {
             "name": webhook_name or response["name"],
@@ -192,7 +192,7 @@ async def delete(webhook_id: UUID):
         exit_with_error("Deletion aborted.")
 
     # The /webhooks API lives inside the /accounts/{id}/workspaces/{id} routing tree
-    async with get_cloud_client(host=PREFECT_API_URL.value()) as client:
+    async with get_cloud_client(host=get_current_settings().api.url) as client:
         try:
             await client.request("DELETE", f"/webhooks/{webhook_id}")
             app.console.print(f"Successfully deleted webhook {webhook_id}")

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/dashboard.py

@@ -3,7 +3,7 @@ import webbrowser
 from prefect.cli._types import PrefectTyper
 from prefect.cli._utilities import exit_with_error, exit_with_success
 from prefect.cli.root import app
-from prefect.settings import PREFECT_UI_URL
+from prefect.settings import get_current_settings
 from prefect.utilities.asyncutils import run_sync_in_worker_thread
 
 dashboard_app: PrefectTyper = PrefectTyper(
@@ -19,7 +19,7 @@ async def open() -> None:
     Open the Prefect UI in the browser.
     """
 
-    if not (ui_url := PREFECT_UI_URL.value()):
+    if not (ui_url := get_current_settings().ui_url):
         exit_with_error(
             "`PREFECT_UI_URL` must be set to the URL of a running Prefect server or Prefect Cloud workspace."
         )

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/deploy/_commands.py

@@ -8,12 +8,11 @@ import yaml
 from rich.table import Table
 
 import prefect
-from prefect.cli._types import SettingsOption
 from prefect.cli._utilities import exit_with_error
 from prefect.cli.root import app, is_interactive
 from prefect.client.schemas.objects import ConcurrencyLimitConfig
 from prefect.deployments import initialize_project
-from prefect.settings import PREFECT_DEFAULT_WORK_POOL_NAME
+from prefect.settings import get_current_settings
 
 from ._config import (
     _load_deploy_configs_and_actions,
@@ -178,11 +177,12 @@ async def deploy(
         "--collision-strategy",
         help="Configure the behavior for runs once the concurrency limit is reached. Falls back to `ENQUEUE` if unset.",
     ),
-    work_pool_name: str = SettingsOption(
-        PREFECT_DEFAULT_WORK_POOL_NAME,
+    work_pool_name: str = typer.Option(
+        lambda: get_current_settings().deployments.default_work_pool_name,
         "-p",
         "--pool",
         help="The work pool that will handle this deployment's runs.",
+        show_default="from PREFECT_DEFAULT_WORK_POOL_NAME",
     ),
     work_queue_name: str = typer.Option(
         None,

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/deploy/_core.py

@@ -25,7 +25,7 @@ from prefect.deployments.runner import RunnerDeployment
 from prefect.deployments.steps.core import run_steps
 from prefect.exceptions import ObjectNotFound
 from prefect.flows import load_flow_from_entrypoint
-from prefect.settings import PREFECT_UI_URL
+from prefect.settings import get_current_settings
 from prefect.utilities.callables import parameter_schema
 from prefect.utilities.collections import get_from_dict
 from prefect.utilities.templating import (
@@ -373,10 +373,10 @@ async def _run_single_deploy(
         style="green",
     )
 
-    if PREFECT_UI_URL:
+    if ui_url := get_current_settings().ui_url:
         message = (
             "\nView Deployment in UI:"
-            f" {PREFECT_UI_URL.value()}/deployments/deployment/{deployment_id}\n"
+            f" {ui_url}/deployments/deployment/{deployment_id}\n"
         )
         app.console.print(message, soft_wrap=True)
 

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/root.py

@@ -19,10 +19,7 @@ from prefect.cli._utilities import with_cli_exception_handling
 from prefect.client.base import determine_server_type
 from prefect.client.constants import SERVER_API_VERSION
 from prefect.logging.configuration import setup_logging
-from prefect.settings import (
-    PREFECT_CLI_WRAP_LINES,
-    PREFECT_TEST_MODE,
-)
+from prefect.settings import get_current_settings
 from prefect.types._datetime import parse_datetime
 
 app: PrefectTyper = PrefectTyper(add_completion=True, no_args_is_help=True)
@@ -77,9 +74,9 @@ def main(
             exit(1)
 
     # Configure the output console after loading the profile
-    app.setup_console(soft_wrap=PREFECT_CLI_WRAP_LINES.value(), prompt=prompt)
+    app.setup_console(soft_wrap=get_current_settings().cli.wrap_lines, prompt=prompt)
 
-    if not PREFECT_TEST_MODE:
+    if not get_current_settings().testing.test_mode:
         # When testing, this entrypoint can be called multiple times per process which
         # can cause logging configuration conflicts. Logging is set up in conftest
         # during tests.
@@ -107,7 +104,6 @@ async def version(
 
     from prefect.server.database.dependencies import provide_database_interface
     from prefect.server.utilities.database import get_dialect
-    from prefect.settings import PREFECT_API_DATABASE_CONNECTION_URL
 
     if build_date_str := prefect.__version_info__.get("date", None):
         build_date = parse_datetime(build_date_str).strftime("%a, %b %d, %Y %I:%M %p")
@@ -134,7 +130,8 @@ async def version(
 
     version_info["Pydantic version"] = pydantic_version
 
-    if connection_url := PREFECT_API_DATABASE_CONNECTION_URL.value():
+    if connection_url_setting := get_current_settings().server.database.connection_url:
+        connection_url = connection_url_setting.get_secret_value()
         database = get_dialect(connection_url).name
         version_info["Server"] = {"Database": database}
         if database == "sqlite":

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/shell.py

@@ -22,7 +22,7 @@ from prefect.context import tags
 from prefect.exceptions import FailedRun
 from prefect.logging.loggers import get_run_logger
 from prefect.runner import Runner
-from prefect.settings import PREFECT_UI_URL
+from prefect.settings import get_current_settings
 from prefect.types.entrypoint import EntrypointType
 
 shell_app: PrefectTyper = PrefectTyper(
@@ -236,10 +236,10 @@ async def serve(
         " command:\n[blue]\n\t$ prefect deployment run"
         f" '{runner_deployment.flow_name}/{deployment_name}'\n[/]"
     )
-    if PREFECT_UI_URL:
+    if ui_url := get_current_settings().ui_url:
         help_message += (
             "\nYou can also run your flow via the Prefect UI:"
-            f" [blue]{PREFECT_UI_URL.value()}/deployments/deployment/{deployment_id}[/]\n"
+            f" [blue]{ui_url}/deployments/deployment/{deployment_id}[/]\n"
         )
 
     app.console.print(help_message, soft_wrap=True)

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/cli/work_pool.py

@@ -36,10 +36,7 @@ from prefect.client.schemas.objects import (
     WorkPoolStorageConfiguration,
 )
 from prefect.exceptions import ObjectAlreadyExists, ObjectNotFound
-from prefect.infrastructure.provisioners import (
-    _provisioners,
-    get_infrastructure_provisioner_for_work_pool_type,
-)
+from prefect.infrastructure import provisioners
 from prefect.settings import update_current_profile
 from prefect.types._datetime import now as now_fn
 from prefect.utilities import urls
@@ -76,7 +73,7 @@ def has_provisioner_for_type(work_pool_type: str) -> bool:
     Returns:
         bool: True if a provisioner exists for the given type, False otherwise.
     """
-    return work_pool_type in _provisioners
+    return work_pool_type in provisioners._provisioners
 
 
 @work_pool_app.command()
@@ -202,7 +199,9 @@ async def create(
 
         if provision_infrastructure:
             try:
-                provisioner = get_infrastructure_provisioner_for_work_pool_type(type)
+                provisioner = (
+                    provisioners.get_infrastructure_provisioner_for_work_pool_type(type)
+                )
                 provisioner.console = app.console
                 template_contents = await provisioner.provision(
                     work_pool_name=name, base_job_template=template_contents
@@ -492,8 +491,10 @@ async def provision_infrastructure(
             exit_with_error(f"Failed to read work pool {name!r}: {exc}")
 
         try:
-            provisioner = get_infrastructure_provisioner_for_work_pool_type(
-                work_pool.type
+            provisioner = (
+                provisioners.get_infrastructure_provisioner_for_work_pool_type(
+                    work_pool.type
+                )
             )
             provisioner.console = app.console
             new_base_job_template = await provisioner.provision(

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/client/schemas/actions.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import datetime
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
+from typing import Any, Callable, Optional, TypeVar, Union
 from uuid import UUID, uuid4
 
 import jsonschema
@@ -22,6 +22,7 @@ from prefect._internal.schemas.validators import (
     validate_name_present_on_nonanonymous_blocks,
     validate_schedule_max_scheduled_runs,
 )
+from prefect._result_records import ResultRecordMetadata
 from prefect.client.schemas.objects import (
     StateDetails,
     StateType,
@@ -57,9 +58,6 @@ from prefect.types.names import (
 from prefect.utilities.collections import visit_collection
 from prefect.utilities.pydantic import get_class_fields_only
 
-if TYPE_CHECKING:
-    from prefect._result_records import ResultRecordMetadata
-
 R = TypeVar("R")
 
 
@@ -70,7 +68,7 @@ class StateCreate(ActionBaseModel):
     name: Optional[str] = Field(default=None)
     message: Optional[str] = Field(default=None, examples=["Run started"])
     state_details: StateDetails = Field(default_factory=StateDetails)
-    data: Union["ResultRecordMetadata", Any] = Field(
+    data: Union[ResultRecordMetadata, Any] = Field(
         default=None,
     )
 

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/deployments/flow_runs.py

@@ -7,7 +7,7 @@ from opentelemetry import trace
 
 import prefect
 from prefect._result_records import ResultRecordMetadata
-from prefect.client.schemas import FlowRun
+from prefect.client.schemas import FlowRun, TaskRunResult
 from prefect.client.utilities import inject_client
 from prefect.context import FlowRunContext, TaskRunContext
 from prefect.logging import get_logger
@@ -136,6 +136,21 @@ async def run_deployment(
             k: await collect_task_run_inputs(v) for k, v in parameters.items()
         }
 
+        # Track parent task if this is being called from within a task
+        # This enables the execution graph to properly display the deployment
+        # flow run as nested under the calling task
+        if task_run_ctx:
+            # The task run is only considered a parent if it is in the same
+            # flow run (otherwise the child is in a subflow, so the subflow
+            # serves as the parent) or if there is no flow run
+            if not flow_run_ctx or (
+                task_run_ctx.task_run.flow_run_id
+                == getattr(flow_run_ctx.flow_run, "id", None)
+            ):
+                task_inputs["__parents__"] = [
+                    TaskRunResult(id=task_run_ctx.task_run.id)
+                ]
+
         if deployment_id:
             flow = await client.read_flow(deployment.flow_id)
             deployment_name = f"{flow.name}/{deployment.name}"

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/deployments/steps/core.py

@@ -19,12 +19,15 @@ import subprocess
 import warnings
 from copy import deepcopy
 from importlib import import_module
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any
+from uuid import UUID
 
 from prefect._internal.compatibility.deprecated import PrefectDeprecationWarning
 from prefect._internal.concurrency.api import Call, from_async
 from prefect._internal.installation import install_packages
 from prefect._internal.integrations import KNOWN_EXTRAS_FOR_PACKAGES
+from prefect.events.clients import get_events_client
+from prefect.events.schemas.events import Event, RelatedResource, Resource
 from prefect.logging.loggers import get_logger
 from prefect.settings import PREFECT_DEBUG_MODE
 from prefect.utilities.importtools import import_object
@@ -65,7 +68,7 @@ def _strip_version(requirement: str) -> str:
 
 
 def _get_function_for_step(
-    fully_qualified_name: str, requires: Union[str, List[str], None] = None
+    fully_qualified_name: str, requires: str | list[str] | None = None
 ):
     if not isinstance(requires, list):
         packages = [requires] if requires else []
@@ -103,7 +106,7 @@ def _get_function_for_step(
 
 
 async def run_step(
-    step: dict[str, Any], upstream_outputs: Optional[dict[str, Any]] = None
+    step: dict[str, Any], upstream_outputs: dict[str, Any] | None = None
 ) -> dict[str, Any]:
     """
     Runs a step, returns the step's output.
@@ -141,17 +144,34 @@ async def run_step(
 
 
 async def run_steps(
-    steps: List[Dict[str, Any]],
-    upstream_outputs: Optional[Dict[str, Any]] = None,
+    steps: list[dict[str, Any]],
+    upstream_outputs: dict[str, Any] | None = None,
     print_function: Any = print,
+    deployment: Any | None = None,
+    flow_run: Any | None = None,
+    logger: Any | None = None,
 ) -> dict[str, Any]:
     upstream_outputs = deepcopy(upstream_outputs) if upstream_outputs else {}
-    for step in steps:
+    for step_index, step in enumerate(steps):
         if not step:
             continue
         fqn, inputs = _get_step_fully_qualified_name_and_inputs(step)
         step_name = fqn.split(".")[-1]
         print_function(f" > Running {step_name} step...")
+
+        # SECURITY: Serialize inputs BEFORE running the step (and thus before templating).
+        # This ensures that the event payload contains template strings like
+        # "{{ prefect.blocks.secret.api-key }}" rather than resolved secret values.
+        # Templating (which resolves blocks, variables, and env vars) happens inside
+        # run_step(), so by serializing here we prevent secrets from leaking in events.
+        serialized_step = {
+            "index": step_index,
+            "qualified_name": fqn,
+            "step_name": step_name,
+            "id": inputs.get("id"),
+            "inputs": inputs,  # Keep all inputs including reserved keywords like 'requires'
+        }
+
         try:
             # catch warnings to ensure deprecation warnings are printed
             with warnings.catch_warnings(record=True) as w:
@@ -190,11 +210,88 @@ async def run_steps(
             if inputs.get("id"):
                 upstream_outputs[inputs.get("id")] = step_output
             upstream_outputs.update(step_output)
+
+            # Emit success event for this step
+            await _emit_pull_step_event(
+                serialized_step,
+                event_type="prefect.flow-run.pull-step.executed",
+                deployment=deployment,
+                flow_run=flow_run,
+                logger=logger,
+            )
         except Exception as exc:
+            # Emit failure event for this step
+            await _emit_pull_step_event(
+                serialized_step,
+                event_type="prefect.flow-run.pull-step.failed",
+                deployment=deployment,
+                flow_run=flow_run,
+                logger=logger,
+            )
             raise StepExecutionError(f"Encountered error while running {fqn}") from exc
+
     return upstream_outputs
 
 
-def _get_step_fully_qualified_name_and_inputs(step: Dict) -> Tuple[str, Dict]:
+def _get_step_fully_qualified_name_and_inputs(step: dict) -> tuple[str, dict]:
     step = deepcopy(step)
     return step.popitem()
+
+
+async def _emit_pull_step_event(
+    serialized_step: dict[str, Any],
+    *,
+    event_type: str,
+    deployment: Any | None = None,
+    flow_run: Any | None = None,
+    logger: Any | None = None,
+) -> None:
+    # Get flow_run_id from flow_run param or environment
+    flow_run_id = None
+    if flow_run:
+        flow_run_id = flow_run.id
+    else:
+        # Read directly from environment variable
+        flow_run_id_str = os.getenv("PREFECT__FLOW_RUN_ID")
+        if flow_run_id_str:
+            flow_run_id = UUID(flow_run_id_str)
+
+    if not flow_run_id:
+        return
+
+    # Build related resources
+    related: list[RelatedResource] = []
+    if deployment:
+        related.append(
+            RelatedResource(
+                {
+                    "prefect.resource.id": f"prefect.deployment.{deployment.id}",
+                    "prefect.resource.role": "deployment",
+                }
+            )
+        )
+
+    try:
+        # Use events client directly with checkpoint_every=1 to avoid buffering issues
+        async with get_events_client(checkpoint_every=1) as events_client:
+            await events_client.emit(
+                Event(
+                    event=event_type,
+                    resource=Resource(
+                        {
+                            "prefect.resource.id": f"prefect.flow-run.{flow_run_id}",
+                        }
+                    ),
+                    related=related,
+                    payload=serialized_step,
+                )
+            )
+    except Exception:
+        if logger:
+            logger.warning(
+                "Failed to emit pull-step event for flow run %s", flow_run_id
+            )
+        else:
+            get_logger(__name__).warning(
+                "Failed to emit pull-step event for flow run %s", flow_run_id
+            )

{prefect-3.5.1.dev2 → prefect-3.5.1.dev3}/src/prefect/exceptions.py

@@ -17,8 +17,8 @@ if TYPE_CHECKING:
 
 
 def _trim_traceback(
-    tb: Optional[TracebackType], remove_modules: Iterable[ModuleType]
-) -> Optional[TracebackType]:
+    tb: TracebackType | None, remove_modules: Iterable[ModuleType]
+) -> TracebackType | None:
     """
     Utility to remove frames from specific modules from a traceback.