prefect-client 3.5.1.dev1__tar.gz → 3.5.1.dev3__tar.gz

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.5.1.dev1
+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_client-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:20.609501+00:00"
+__git_commit__ = "ab79573349a6dfc69a4fcb4227957d18b24c7b53"
+__dirty__ = False

prefect_client-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_client-3.5.1.dev1 → prefect_client-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_client-3.5.1.dev1 → prefect_client-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_client-3.5.1.dev1 → prefect_client-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_client-3.5.1.dev1 → prefect_client-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.
 

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/flows.py

@@ -2814,7 +2814,11 @@ async def load_flow_from_flow_run(
 
         try:
             output = await run_steps(
-                deployment.pull_steps, print_function=run_logger.info
+                deployment.pull_steps,
+                print_function=run_logger.info,
+                deployment=deployment,
+                flow_run=flow_run,
+                logger=run_logger,
             )
         except StepExecutionError as e:
             e = e.__cause__ or e

prefect_client-3.5.1.dev3/src/prefect/infrastructure/provisioners/__init__.py

@@ -0,0 +1,73 @@
+from typing import TYPE_CHECKING, Any, Dict, Optional, Protocol, Type
+
+import rich.console
+
+from prefect._internal.lazy import LazyDict
+
+if TYPE_CHECKING:
+    from prefect.client.orchestration import PrefectClient
+
+
+def _load_provisioners() -> dict[str, type]:
+    """Lazy load provisioners to avoid importing heavy cloud SDKs at module import time."""
+    from prefect.infrastructure.provisioners.coiled import CoiledPushProvisioner
+    from prefect.infrastructure.provisioners.modal import ModalPushProvisioner
+
+    from .cloud_run import CloudRunPushProvisioner
+    from .container_instance import ContainerInstancePushProvisioner
+    from .ecs import ElasticContainerServicePushProvisioner
+
+    return {
+        "cloud-run:push": CloudRunPushProvisioner,
+        "cloud-run-v2:push": CloudRunPushProvisioner,
+        "azure-container-instance:push": ContainerInstancePushProvisioner,
+        "ecs:push": ElasticContainerServicePushProvisioner,
+        "modal:push": ModalPushProvisioner,
+        "coiled:push": CoiledPushProvisioner,
+    }
+
+
+_provisioners_lazy: LazyDict[str, type] = LazyDict(_load_provisioners)
+
+
+def __getattr__(name: str) -> LazyDict[str, type]:
+    """Lazy load module attributes."""
+    if name == "_provisioners":
+        return _provisioners_lazy
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
+class Provisioner(Protocol):
+    @property
+    def console(self) -> rich.console.Console: ...
+
+    @console.setter
+    def console(self, value: rich.console.Console) -> None: ...
+
+    async def provision(
+        self,
+        work_pool_name: str,
+        base_job_template: Dict[str, Any],
+        client: Optional["PrefectClient"] = None,
+    ) -> Dict[str, Any]: ...
+
+
+def get_infrastructure_provisioner_for_work_pool_type(
+    work_pool_type: str,
+) -> Type[Provisioner]:
+    """
+    Retrieve an instance of the infrastructure provisioner for the given work pool type.
+
+    Args:
+        work_pool_type: the work pool type
+
+    Returns:
+        an instance of the infrastructure provisioner for the given work pool type
+
+    Raises:
+        ValueError: if the work pool type is not supported
+    """
+    provisioner = _provisioners_lazy.get(work_pool_type)
+    if provisioner is None:
+        raise ValueError(f"Unsupported work pool type: {work_pool_type}")
+    return provisioner()

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/infrastructure/provisioners/cloud_run.py

@@ -16,7 +16,6 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.prompt import Confirm
 from rich.syntax import Syntax
 
-from prefect.cli._prompts import prompt, prompt_select_from_table
 from prefect.client.orchestration import ServerType
 from prefect.client.schemas.actions import BlockDocumentCreate
 from prefect.client.utilities import inject_client
@@ -85,6 +84,8 @@ class CloudRunPushProvisioner:
             )
 
     async def _get_project(self):
+        from prefect.cli._prompts import prompt_select_from_table
+
         if self._console.is_interactive:
             with Progress(
                 SpinnerColumn(),
@@ -276,6 +277,8 @@ class CloudRunPushProvisioner:
     async def _customize_resource_names(
         self, work_pool_name: str, client: "PrefectClient"
     ) -> bool:
+        from prefect.cli._prompts import prompt
+
         self._service_account_name = prompt(
             "Please enter a name for the service account",
             default=self._service_account_name,
@@ -302,6 +305,8 @@ class CloudRunPushProvisioner:
         base_job_template: dict,
         client: Optional["PrefectClient"] = None,
     ) -> Dict[str, Any]:
+        from prefect.cli._prompts import prompt_select_from_table
+
         assert client, "Client injection failed"
         await self._verify_gcloud_ready()
         self._project = await self._get_project()

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/infrastructure/provisioners/container_instance.py

@@ -31,7 +31,6 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.prompt import Confirm
 from rich.syntax import Syntax
 
-from prefect.cli._prompts import prompt, prompt_select_from_table
 from prefect.client.schemas.actions import BlockDocumentCreate
 from prefect.client.utilities import inject_client
 from prefect.exceptions import ObjectAlreadyExists, ObjectNotFound
@@ -226,6 +225,8 @@ class ContainerInstancePushProvisioner:
         Raises:
             RuntimeError: If no Azure subscriptions are found or the Azure CLI command execution fails.
         """
+        from prefect.cli._prompts import prompt_select_from_table
+
         if self._console.is_interactive:
             with Progress(
                 SpinnerColumn(),
@@ -818,6 +819,8 @@ class ContainerInstancePushProvisioner:
     async def _customize_resource_names(
         self, work_pool_name: str, client: "PrefectClient"
     ) -> bool:
+        from prefect.cli._prompts import prompt
+
         self._resource_group_name = prompt(
             "Please enter a name for the resource group",
             default=self._resource_group_name,
@@ -874,6 +877,8 @@ class ContainerInstancePushProvisioner:
         Raises:
             RuntimeError: If client injection fails or the Azure CLI command execution fails.
         """
+        from prefect.cli._prompts import prompt_select_from_table
+
         if not client:
             self._console.print(
                 "Client injection failed, cannot proceed with provisioning.",

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/infrastructure/provisioners/ecs.py

@@ -22,7 +22,6 @@ from rich.prompt import Confirm
 from rich.syntax import Syntax
 
 from prefect._internal.installation import ainstall_packages
-from prefect.cli._prompts import prompt
 from prefect.client.schemas.actions import BlockDocumentCreate
 from prefect.client.utilities import inject_client
 from prefect.exceptions import ObjectNotFound
@@ -1179,6 +1178,8 @@ class ElasticContainerServicePushProvisioner:
         Returns:
             dict: An updated copy base job template.
         """
+        from prefect.cli._prompts import prompt
+
         if not self.is_boto3_installed():
             if self.console.is_interactive and Confirm.ask(
                 "boto3 is required to configure your AWS account. Would you like to"

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/settings/__init__.py

@@ -10,11 +10,8 @@ After https://github.com/pydantic/pydantic/issues/9789 is resolved, we will be a
 for settings, at which point we will not need to use the "after" model_validator.
 """
 
-from prefect.settings.legacy import (
-    Setting,
-    _get_settings_fields,
-    _get_valid_setting_names,
-)
+from typing import TYPE_CHECKING
+
 from prefect.settings.models.root import Settings, canonical_environment_prefix
 
 from prefect.settings.profiles import (
@@ -29,11 +26,18 @@ from prefect.settings.profiles import (
 from prefect.settings.context import get_current_settings, temporary_settings
 from prefect.settings.constants import DEFAULT_PROFILES_PATH
 
+if TYPE_CHECKING:
+    from prefect.settings.legacy import Setting
 ############################################################################
 # Allow traditional env var access
 
 
-def __getattr__(name: str) -> Setting:
+def __getattr__(name: str) -> "Setting":
+    from prefect.settings.legacy import (
+        _get_settings_fields,
+        _get_valid_setting_names,
+    )
+
     if name in _get_valid_setting_names(Settings):
         return _get_settings_fields(Settings)[name]
     raise AttributeError(f"{name} is not a Prefect setting.")
@@ -42,7 +46,6 @@ def __getattr__(name: str) -> Setting:
 __all__ = [  # noqa: F822
     "Profile",
     "ProfilesCollection",
-    "Setting",
     "Settings",
     "load_current_profile",
     "update_current_profile",

{prefect_client-3.5.1.dev1 → prefect_client-3.5.1.dev3}/src/prefect/settings/base.py

@@ -26,7 +26,6 @@ from prefect.settings.sources import (
     PyprojectTomlConfigSettingsSource,
 )
 from prefect.utilities.collections import visit_collection
-from prefect.utilities.pydantic import handle_secret_render
 
 
 class PrefectBaseSettings(BaseSettings):
@@ -196,6 +195,8 @@ class PrefectBaseSettings(BaseSettings):
                 if child_jsonable:
                     jsonable_self[key] = child_jsonable
         if info.context and info.context.get("include_secrets") is True:
+            from prefect.utilities.pydantic import handle_secret_render
+
             jsonable_self.update(
                 {
                     field_name: visit_collection(

prefect_client-3.5.1.dev1/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.5.1.dev1"
-__build_date__ = "2025-11-04 08:09:25.417117+00:00"
-__git_commit__ = "d3218e695ce07446a1d20b5e458d3ab26fa1312a"
-__dirty__ = False

prefect_client-3.5.1.dev1/src/prefect/infrastructure/provisioners/__init__.py

@@ -1,56 +0,0 @@
-from typing import TYPE_CHECKING, Any, Dict, Optional, Protocol, Type
-
-from prefect.infrastructure.provisioners.coiled import CoiledPushProvisioner
-from prefect.infrastructure.provisioners.modal import ModalPushProvisioner
-from .cloud_run import CloudRunPushProvisioner
-from .container_instance import ContainerInstancePushProvisioner
-from .ecs import ElasticContainerServicePushProvisioner
-import rich.console
-
-if TYPE_CHECKING:
-    from prefect.client.orchestration import PrefectClient
-
-_provisioners = {
-    "cloud-run:push": CloudRunPushProvisioner,
-    "cloud-run-v2:push": CloudRunPushProvisioner,
-    "azure-container-instance:push": ContainerInstancePushProvisioner,
-    "ecs:push": ElasticContainerServicePushProvisioner,
-    "modal:push": ModalPushProvisioner,
-    "coiled:push": CoiledPushProvisioner,
-}
-
-
-class Provisioner(Protocol):
-    @property
-    def console(self) -> rich.console.Console: ...
-
-    @console.setter
-    def console(self, value: rich.console.Console) -> None: ...
-
-    async def provision(
-        self,
-        work_pool_name: str,
-        base_job_template: Dict[str, Any],
-        client: Optional["PrefectClient"] = None,
-    ) -> Dict[str, Any]: ...
-
-
-def get_infrastructure_provisioner_for_work_pool_type(
-    work_pool_type: str,
-) -> Type[Provisioner]:
-    """
-    Retrieve an instance of the infrastructure provisioner for the given work pool type.
-
-    Args:
-        work_pool_type: the work pool type
-
-    Returns:
-        an instance of the infrastructure provisioner for the given work pool type
-
-    Raises:
-        ValueError: if the work pool type is not supported
-    """
-    provisioner = _provisioners.get(work_pool_type)
-    if provisioner is None:
-        raise ValueError(f"Unsupported work pool type: {work_pool_type}")
-    return provisioner()