prefect-client 3.1.8__py3-none-any.whl → 3.1.10__py3-none-any.whl

prefect/context.py

@@ -9,21 +9,10 @@ For more user-accessible information about the current run, see [`prefect.runtim
 import os
 import sys
 import warnings
+from collections.abc import AsyncGenerator, Generator, Mapping
 from contextlib import ExitStack, asynccontextmanager, contextmanager
 from contextvars import ContextVar, Token
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    AsyncGenerator,
-    Dict,
-    Generator,
-    Mapping,
-    Optional,
-    Set,
-    Type,
-    TypeVar,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union
 
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
 from typing_extensions import Self
@@ -64,7 +53,7 @@ if TYPE_CHECKING:
 GLOBAL_SETTINGS_CONTEXT = None  # type: ignore
 
 
-def serialize_context() -> Dict[str, Any]:
+def serialize_context() -> dict[str, Any]:
     """
     Serialize the current context for use in a remote execution environment.
     """
@@ -84,7 +73,7 @@ def serialize_context() -> Dict[str, Any]:
 
 @contextmanager
 def hydrated_context(
-    serialized_context: Optional[Dict[str, Any]] = None,
+    serialized_context: Optional[dict[str, Any]] = None,
     client: Union[PrefectClient, SyncPrefectClient, None] = None,
 ):
     with ExitStack() as stack:
@@ -148,7 +137,7 @@ class ContextModel(BaseModel):
         self._token = None
 
     @classmethod
-    def get(cls: Type[Self]) -> Optional[Self]:
+    def get(cls: type[Self]) -> Optional[Self]:
         """Get the current context instance"""
         return cls.__var__.get(None)
 
@@ -173,7 +162,7 @@ class ContextModel(BaseModel):
         new._token = None
         return new
 
-    def serialize(self, include_secrets: bool = True) -> Dict[str, Any]:
+    def serialize(self, include_secrets: bool = True) -> dict[str, Any]:
         """
         Serialize the context model to a dictionary that can be pickled with cloudpickle.
         """
@@ -314,10 +303,10 @@ class RunContext(ContextModel):
         start_client_metrics_server()
 
     start_time: DateTime = Field(default_factory=lambda: DateTime.now("UTC"))
-    input_keyset: Optional[Dict[str, Dict[str, str]]] = None
+    input_keyset: Optional[dict[str, dict[str, str]]] = None
     client: Union[PrefectClient, SyncPrefectClient]
 
-    def serialize(self: Self, include_secrets: bool = True) -> Dict[str, Any]:
+    def serialize(self: Self, include_secrets: bool = True) -> dict[str, Any]:
         return self.model_dump(
             include={"start_time", "input_keyset"},
             exclude_unset=True,
@@ -344,7 +333,7 @@ class EngineContext(RunContext):
     flow_run: Optional[FlowRun] = None
     task_runner: TaskRunner[Any]
     log_prints: bool = False
-    parameters: Optional[Dict[str, Any]] = None
+    parameters: Optional[dict[str, Any]] = None
 
     # Flag signaling if the flow run context has been serialized and sent
     # to remote infrastructure.
@@ -355,10 +344,10 @@ class EngineContext(RunContext):
     persist_result: bool = Field(default_factory=get_default_persist_setting)
 
     # Counter for task calls allowing unique
-    task_run_dynamic_keys: Dict[str, Union[str, int]] = Field(default_factory=dict)
+    task_run_dynamic_keys: dict[str, Union[str, int]] = Field(default_factory=dict)
 
     # Counter for flow pauses
-    observed_flow_pauses: Dict[str, int] = Field(default_factory=dict)
+    observed_flow_pauses: dict[str, int] = Field(default_factory=dict)
 
     # Tracking for result from task runs in this flow run for dependency tracking
     # Holds the ID of the object returned by the task run and task run state
@@ -369,7 +358,7 @@ class EngineContext(RunContext):
 
     __var__: ContextVar[Self] = ContextVar("flow_run")
 
-    def serialize(self: Self, include_secrets: bool = True) -> Dict[str, Any]:
+    def serialize(self: Self, include_secrets: bool = True) -> dict[str, Any]:
         return self.model_dump(
             include={
                 "flow_run",
@@ -403,7 +392,7 @@ class TaskRunContext(RunContext):
     task: "Task[Any, Any]"
     task_run: TaskRun
     log_prints: bool = False
-    parameters: Dict[str, Any]
+    parameters: dict[str, Any]
 
     # Result handling
     result_store: ResultStore
@@ -411,7 +400,7 @@ class TaskRunContext(RunContext):
 
     __var__ = ContextVar("task_run")
 
-    def serialize(self: Self, include_secrets: bool = True) -> Dict[str, Any]:
+    def serialize(self: Self, include_secrets: bool = True) -> dict[str, Any]:
         return self.model_dump(
             include={
                 "task_run",
@@ -437,7 +426,7 @@ class TagsContext(ContextModel):
         current_tags: A set of current tags in the context
     """
 
-    current_tags: Set[str] = Field(default_factory=set)
+    current_tags: set[str] = Field(default_factory=set)
 
     @classmethod
     def get(cls) -> "TagsContext":
@@ -512,7 +501,7 @@ def get_settings_context() -> SettingsContext:
 
 
 @contextmanager
-def tags(*new_tags: str) -> Generator[Set[str], None, None]:
+def tags(*new_tags: str) -> Generator[set[str], None, None]:
     """
     Context manager to add tags to flow and task run calls.
 

prefect/deployments/deployments.py

@@ -1,3 +1,5 @@
-from .._internal.compatibility.migration import getattr_migration
+from typing import Any, Callable
 
-__getattr__ = getattr_migration(__name__)
+from prefect._internal.compatibility.migration import getattr_migration
+
+__getattr__: Callable[[str], Any] = getattr_migration(__name__)

prefect/deployments/runner.py

@@ -549,7 +549,9 @@ class RunnerDeployment(BaseModel):
                         module = importlib.import_module(mod_name)
                         flow_file = getattr(module, "__file__", None)
                     except ModuleNotFoundError as exc:
-                        if "__prefect_loader__" in str(exc):
+                        # 16458 adds an identifier to the module name, so checking
+                        # for "__prefect_loader__" (2 underscores) will not match
+                        if "__prefect_loader_" in str(exc):
                             raise ValueError(
                                 "Cannot create a RunnerDeployment from a flow that has been"
                                 " loaded from an entrypoint. To deploy a flow via"

prefect/engine.py

@@ -1,5 +1,6 @@
 import os
 import sys
+from typing import Any, Callable
 from uuid import UUID
 
 from prefect._internal.compatibility.migration import getattr_migration
@@ -72,4 +73,4 @@ if __name__ == "__main__":
         # Let the exit code be determined by the base exception type
         raise
 
-__getattr__ = getattr_migration(__name__)
+__getattr__: Callable[[str], Any] = getattr_migration(__name__)

prefect/events/filters.py

@@ -2,7 +2,7 @@ from typing import List, Optional, Tuple, cast
 from uuid import UUID
 
 import pendulum
-from pydantic import Field, PrivateAttr
+from pydantic import Field
 
 from prefect._internal.schemas.bases import PrefectBaseModel
 from prefect.types import DateTime
@@ -41,18 +41,12 @@ class AutomationFilter(PrefectBaseModel):
 class EventDataFilter(PrefectBaseModel, extra="forbid"):  # type: ignore[call-arg]
     """A base class for filtering event data."""
 
-    _top_level_filter: Optional["EventFilter"] = PrivateAttr(None)
-
     def get_filters(self) -> List["EventDataFilter"]:
         filters: List["EventDataFilter"] = [
             filter
-            for filter in [
-                getattr(self, name) for name, field in self.model_fields.items()
-            ]
+            for filter in [getattr(self, name) for name in self.model_fields]
             if isinstance(filter, EventDataFilter)
         ]
-        for filter in filters:
-            filter._top_level_filter = self._top_level_filter
         return filters
 
     def includes(self, event: Event) -> bool:

prefect/exceptions.py

@@ -4,19 +4,20 @@ Prefect-specific exceptions.
 
 import inspect
 import traceback
+from collections.abc import Iterable
 from types import ModuleType, TracebackType
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, Type
+from typing import TYPE_CHECKING, Any, Callable, Optional
 
 from httpx._exceptions import HTTPStatusError
 from pydantic import ValidationError
-from rich.traceback import Traceback
 from typing_extensions import Self
 
-import prefect
+if TYPE_CHECKING:
+    from prefect.states import State
 
 
 def _trim_traceback(
-    tb: TracebackType, remove_modules: Iterable[ModuleType]
+    tb: Optional[TracebackType], remove_modules: Iterable[ModuleType]
 ) -> Optional[TracebackType]:
     """
     Utility to remove frames from specific modules from a traceback.
@@ -32,8 +33,9 @@ def _trim_traceback(
         A traceback, or `None` if all traceback frames originate from an excluded module
 
     """
-    strip_paths = [module.__file__ for module in remove_modules]
-
+    strip_paths = [
+        module.__file__ for module in remove_modules if module.__file__ is not None
+    ]
     while tb and any(
         module_path in str(tb.tb_frame.f_globals.get("__file__", ""))
         for module_path in strip_paths
@@ -91,7 +93,9 @@ class PausedRun(PrefectException):
     Raised when the result from a paused run is retrieved.
     """
 
-    def __init__(self, *args, state=None, **kwargs):
+    def __init__(
+        self, *args: Any, state: Optional["State[Any]"] = None, **kwargs: Any
+    ) -> None:
         super().__init__(*args, **kwargs)
         self.state = state
 
@@ -133,6 +137,8 @@ class ScriptError(PrefectException):
         user_exc: Exception,
         path: str,
     ) -> None:
+        import prefect.utilities.importtools
+
         message = f"Script at {str(path)!r} encountered an exception: {user_exc!r}"
         super().__init__(message)
         self.user_exc = user_exc
@@ -144,30 +150,6 @@ class ScriptError(PrefectException):
         )
 
 
-class FlowScriptError(PrefectException):
-    """
-    Raised when a script errors during evaluation while attempting to load a flow.
-    """
-
-    def __init__(
-        self,
-        user_exc: Exception,
-        script_path: str,
-    ) -> None:
-        message = f"Flow script at {script_path!r} encountered an exception"
-        super().__init__(message)
-
-        self.user_exc = user_exc
-
-    def rich_user_traceback(self, **kwargs):
-        trace = Traceback.extract(
-            type(self.user_exc),
-            self.user_exc,
-            self.user_exc.__traceback__.tb_next.tb_next.tb_next.tb_next,
-        )
-        return Traceback(trace, **kwargs)
-
-
 class ParameterTypeError(PrefectException):
     """
     Raised when a parameter does not pass Pydantic type validation.
@@ -196,7 +178,11 @@ class ParameterBindError(TypeError, PrefectException):
 
     @classmethod
     def from_bind_failure(
-        cls, fn: Callable, exc: TypeError, call_args: List, call_kwargs: Dict
+        cls,
+        fn: Callable[..., Any],
+        exc: TypeError,
+        call_args: tuple[Any, ...],
+        call_kwargs: dict[str, Any],
     ) -> Self:
         fn_signature = str(inspect.signature(fn)).strip("()")
 
@@ -214,7 +200,9 @@ class SignatureMismatchError(PrefectException, TypeError):
         super().__init__(msg)
 
     @classmethod
-    def from_bad_params(cls, expected_params: List[str], provided_params: List[str]):
+    def from_bad_params(
+        cls, expected_params: list[str], provided_params: list[str]
+    ) -> Self:
         msg = (
             f"Function expects parameters {expected_params} but was provided with"
             f" parameters {provided_params}"
@@ -231,14 +219,14 @@ class ObjectNotFound(PrefectException):
         self,
         http_exc: Exception,
         help_message: Optional[str] = None,
-        *args,
-        **kwargs,
-    ):
+        *args: Any,
+        **kwargs: Any,
+    ) -> None:
         self.http_exc = http_exc
         self.help_message = help_message
         super().__init__(help_message, *args, **kwargs)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.help_message or super().__str__()
 
 
@@ -247,7 +235,7 @@ class ObjectAlreadyExists(PrefectException):
     Raised when the client receives a 409 (conflict) from the API.
     """
 
-    def __init__(self, http_exc: Exception, *args, **kwargs):
+    def __init__(self, http_exc: Exception, *args: Any, **kwargs: Any) -> None:
         self.http_exc = http_exc
         super().__init__(*args, **kwargs)
 
@@ -304,7 +292,9 @@ class Pause(PrefectSignal):
     Raised when a flow run is PAUSED and needs to exit for resubmission.
     """
 
-    def __init__(self, *args, state=None, **kwargs):
+    def __init__(
+        self, *args: Any, state: Optional["State[Any]"] = None, **kwargs: Any
+    ) -> None:
         super().__init__(*args, **kwargs)
         self.state = state
 
@@ -332,7 +322,7 @@ class PrefectHTTPStatusError(HTTPStatusError):
     """
 
     @classmethod
-    def from_httpx_error(cls: Type[Self], httpx_error: HTTPStatusError) -> Self:
+    def from_httpx_error(cls: type[Self], httpx_error: HTTPStatusError) -> Self:
         """
         Generate a `PrefectHTTPStatusError` from an `httpx.HTTPStatusError`.
         """
@@ -441,7 +431,7 @@ class ProfileSettingsValidationError(PrefectException):
     Raised when a profile settings are invalid.
     """
 
-    def __init__(self, errors: List[Tuple[Any, ValidationError]]) -> None:
+    def __init__(self, errors: list[tuple[Any, ValidationError]]) -> None:
         self.errors = errors
 
 

prefect/filesystems.py

@@ -2,7 +2,7 @@ import abc
 import urllib.parse
 from pathlib import Path
 from shutil import copytree
-from typing import Any, Dict, Optional
+from typing import Any, Callable, Dict, Optional
 
 import anyio
 import fsspec
@@ -544,4 +544,4 @@ class NullFileSystem(BaseModel):
         pass
 
 
-__getattr__ = getattr_migration(__name__)
+__getattr__: Callable[[str], Any] = getattr_migration(__name__)

prefect/flow_engine.py

@@ -221,7 +221,7 @@ class FlowRunEngine(BaseFlowRunEngine[P, R]):
                     return_data=True,
                     max_depth=-1,
                     remove_annotations=True,
-                    context={},
+                    context={"parameter_name": parameter},
                 )
             except UpstreamTaskError:
                 raise
@@ -784,7 +784,7 @@ class AsyncFlowRunEngine(BaseFlowRunEngine[P, R]):
                     return_data=True,
                     max_depth=-1,
                     remove_annotations=True,
-                    context={},
+                    context={"parameter_name": parameter},
                 )
             except UpstreamTaskError:
                 raise