prefect 3.1.9.dev2__tar.gz → 3.1.9.dev3__tar.gz

{prefect-3.1.9.dev2/src/prefect.egg-info → prefect-3.1.9.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect
-Version: 3.1.9.dev2
+Version: 3.1.9.dev3
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -95,6 +95,7 @@ Requires-Dist: pytest-benchmark; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pytest-env; extra == "dev"
 Requires-Dist: pytest-flakefinder; extra == "dev"
+Requires-Dist: pytest-mypy-plugins>=3.1.0; extra == "dev"
 Requires-Dist: pytest-timeout; extra == "dev"
 Requires-Dist: pytest-xdist>=3.6.1; extra == "dev"
 Requires-Dist: pyyaml; extra == "dev"

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/requirements-dev.txt

@@ -15,6 +15,7 @@ pytest-benchmark
 pytest-cov
 pytest-env
 pytest-flakefinder
+pytest-mypy-plugins >= 3.1.0
 pytest-timeout
 pytest-xdist >= 3.6.1
 pyyaml

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/setup.cfg

@@ -1,6 +1,6 @@
 [tool:pytest]
 testpaths = tests
-addopts = -rfEs
+addopts = -rfEs --mypy-only-local-stub
 norecursedirs = *.egg-info .git .mypy_cache node_modules .pytest_cache .vscode
 python_files = 
 	test_*.py

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-12-18T18:22:32-0500",
+ "date": "2024-12-19T19:30:39-0800",
  "dirty": false,
  "error": null,
- "full-revisionid": "634303681c4fbec9df8c129fbe4eb788f6e2c807",
- "version": "3.1.9.dev2"
+ "full-revisionid": "7bf76976ecd20b439aa30e22631224c51323474d",
+ "version": "3.1.9.dev3"
 }
 '''  # END VERSION_JSON
 

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/agent.py

@@ -1,6 +1,8 @@
 """
 2024-06-27: This surfaces an actionable error message for moved or removed objects in Prefect 3.0 upgrade.
 """
+from typing import Any, Callable
+
 from prefect._internal.compatibility.migration import getattr_migration
 
-__getattr__ = getattr_migration(__name__)
+__getattr__: Callable[[str], Any] = getattr_migration(__name__)

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/cli/server.py

@@ -340,7 +340,7 @@ async def stop():
 @database_app.command()
 async def reset(yes: bool = typer.Option(False, "--yes", "-y")):
     """Drop and recreate all Prefect database tables"""
-    from prefect.server.database.dependencies import provide_database_interface
+    from prefect.server.database import provide_database_interface
 
     db = provide_database_interface()
     engine = await db.engine()
@@ -378,8 +378,8 @@ async def upgrade(
     ),
 ):
     """Upgrade the Prefect database"""
+    from prefect.server.database import provide_database_interface
     from prefect.server.database.alembic_commands import alembic_upgrade
-    from prefect.server.database.dependencies import provide_database_interface
 
     db = provide_database_interface()
     engine = await db.engine()
@@ -418,8 +418,8 @@ async def downgrade(
     ),
 ):
     """Downgrade the Prefect database"""
+    from prefect.server.database import provide_database_interface
     from prefect.server.database.alembic_commands import alembic_downgrade
-    from prefect.server.database.dependencies import provide_database_interface
 
     db = provide_database_interface()
 

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/client/cloud.py

@@ -1,6 +1,5 @@
 import re
 from typing import Any, NoReturn, Optional, cast
-from uuid import UUID
 
 import anyio
 import httpx
@@ -23,7 +22,6 @@ from prefect.settings import (
     PREFECT_CLOUD_API_URL,
     PREFECT_TESTING_UNIT_TEST_MODE,
 )
-from prefect.types import KeyValueLabels
 
 PARSE_API_URL_REGEX = re.compile(r"accounts/(.{36})/workspaces/(.{36})")
 
@@ -160,25 +158,6 @@ class CloudClient:
         response = await self.get(f"{self.account_base_url}/ip_allowlist/my_access")
         return IPAllowlistMyAccessResponse.model_validate(response)
 
-    async def update_flow_run_labels(
-        self, flow_run_id: UUID, labels: KeyValueLabels
-    ) -> httpx.Response:
-        """
-        Update the labels for a flow run.
-
-        Args:
-            flow_run_id: The identifier for the flow run to update.
-            labels: A dictionary of labels to update for the flow run.
-
-        Returns:
-            an `httpx.Response` object from the PATCH request
-        """
-
-        return await self._client.patch(
-            f"{self.workspace_base_url}/flow_runs/{flow_run_id}/labels",
-            json=labels,
-        )
-
     async def __aenter__(self) -> Self:
         await self._client.__aenter__()
         return self

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/client/schemas/objects.py

@@ -190,6 +190,9 @@ class StateDetails(PrefectBaseModel):
     retriable: Optional[bool] = None
     transition_id: Optional[UUID] = None
     task_parameters_id: Optional[UUID] = None
+    # Captures the trace_id and span_id of the span where this state was created
+    trace_id: Optional[int] = None
+    span_id: Optional[int] = None
 
 
 def data_discriminator(x: Any) -> str:
@@ -237,6 +240,15 @@ class State(ObjectBaseModel, Generic[R]):
     ) -> Union[R, Exception]:
         ...
 
+    @overload
+    def result(
+        self: "State[R]",
+        raise_on_failure: bool = ...,
+        fetch: bool = ...,
+        retry_result_failure: bool = ...,
+    ) -> Union[R, Exception]:
+        ...
+
     @deprecated.deprecated_parameter(
         "fetch",
         when=lambda fetch: fetch is not True,

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/prefect/client/utilities.py

@@ -7,7 +7,7 @@ Utilities for working with clients.
 
 from collections.abc import Awaitable, Coroutine
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union, overload
+from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
 from typing_extensions import Concatenate, ParamSpec, TypeGuard, TypeVar
 
@@ -71,23 +71,9 @@ def client_injector(
     return wrapper
 
 
-@overload
 def inject_client(
     fn: Callable[P, Coroutine[Any, Any, R]],
 ) -> Callable[P, Coroutine[Any, Any, R]]:
-    ...
-
-
-@overload
-def inject_client(
-    fn: Callable[P, R],
-) -> Callable[P, R]:
-    ...
-
-
-def inject_client(
-    fn: Callable[P, Union[Coroutine[Any, Any, R], R]],
-) -> Callable[P, Union[Coroutine[Any, Any, R], R]]:
     """
     Simple helper to provide a context managed client to an asynchronous function.
 

prefect-3.1.9.dev3/src/prefect/deployments/deployments.py

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

{prefect-3.1.9.dev2 → prefect-3.1.9.dev3}/src/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-3.1.9.dev2 → prefect-3.1.9.dev3}/src/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-3.1.9.dev2 → prefect-3.1.9.dev3}/src/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-3.1.9.dev2 → prefect-3.1.9.dev3}/src/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-3.1.9.dev2 → prefect-3.1.9.dev3}/src/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