prefect-client 3.3.0__tar.gz → 3.3.2__tar.gz

{prefect_client-3.3.0 → prefect_client-3.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.3.0
+Version: 3.3.2
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -26,6 +26,7 @@ Requires-Dist: asgi-lifespan<3.0,>=1.0
 Requires-Dist: cachetools<6.0,>=5.3
 Requires-Dist: cloudpickle<4.0,>=2.0
 Requires-Dist: coolname<3.0.0,>=1.0.4
+Requires-Dist: dateparser<2.0.0,>=1.1.1
 Requires-Dist: exceptiongroup>=1.0.0
 Requires-Dist: fastapi<1.0.0,>=0.111.0
 Requires-Dist: fsspec>=2022.5.0

{prefect_client-3.3.0 → prefect_client-3.3.2}/pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "cachetools>=5.3,<6.0",
     "cloudpickle>=2.0,<4.0",
     "coolname>=1.0.4,<3.0.0",
+    "dateparser>=1.1.1,<2.0.0",
     "exceptiongroup>=1.0.0",
     "fastapi>=0.111.0,<1.0.0",
     "fsspec>=2022.5.0",

prefect_client-3.3.2/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.2"
+__build_date__ = "2025-04-03 21:24:32.871912+00:00"
+__git_commit__ = "e49e31850463a0c0db93b4798856247a6d1669a6"
+__dirty__ = False

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/_internal/compatibility/deprecated.py

@@ -10,12 +10,15 @@ will be calculated 6 months later. Start and end dates are always in the format
 e.g. Jan 2023.
 """
 
+from __future__ import annotations
+
 import datetime
 import functools
 import sys
 import warnings
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
+import dateparser
 from pydantic import BaseModel
 from typing_extensions import ParamSpec, TypeAlias, TypeVar
 
@@ -32,6 +35,9 @@ R = TypeVar("R", infer_variance=True)
 M = TypeVar("M", bound=BaseModel)
 T = TypeVar("T")
 
+# Note: A datetime is strongly preferred over a string, but a string is acceptable for
+# backwards compatibility until support is dropped from dateparser in Python 3.15.
+_AcceptableDate: TypeAlias = Optional[Union[datetime.datetime, str]]
 
 DEPRECATED_WARNING = (
     "{name} has been deprecated{when}. It will not be available in new releases after {end_date}."
@@ -51,18 +57,25 @@ class PrefectDeprecationWarning(DeprecationWarning):
     """
 
 
+def _coerce_datetime(
+    dt: Optional[_AcceptableDate],
+) -> Optional[datetime.datetime]:
+    if dt is None or isinstance(dt, datetime.datetime):
+        return dt
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", category=DeprecationWarning)
+        return dateparser.parse(dt)
+
+
 def generate_deprecation_message(
     name: str,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     help: str = "",
     when: str = "",
 ) -> str:
-    if start_date is not None and not isinstance(start_date, datetime.datetime):
-        raise ValueError("Must provide start_date as a datetime")
-
-    if end_date is not None and not isinstance(end_date, datetime.datetime):
-        raise ValueError("Must provide end_date as a datetime")
+    start_date = _coerce_datetime(start_date)
+    end_date = _coerce_datetime(end_date)
 
     if start_date is None and end_date is None:
         raise ValueError(
@@ -87,8 +100,8 @@ def generate_deprecation_message(
 
 def deprecated_callable(
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
@@ -112,8 +125,8 @@ def deprecated_callable(
 
 def deprecated_class(
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
 ) -> Callable[[type[T]], type[T]]:
@@ -141,8 +154,8 @@ def deprecated_class(
 def deprecated_parameter(
     name: str,
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
     when: Optional[Callable[[Any], bool]] = None,
@@ -197,8 +210,8 @@ JsonDict: TypeAlias = dict[str, JsonValue]
 def deprecated_field(
     name: str,
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     when_message: str = "",
     help: str = "",
     when: Optional[Callable[[Any], bool]] = None,
@@ -242,7 +255,7 @@ def deprecated_field(
 
             cls_init(__pydantic_self__, **data)
 
-            field = __pydantic_self__.model_fields.get(name)
+            field = __pydantic_self__.__class__.model_fields.get(name)
             if field is not None:
                 json_schema_extra = field.json_schema_extra or {}
 
@@ -279,9 +292,7 @@ def inject_renamed_module_alias_finder():
     sys.meta_path.insert(0, AliasedModuleFinder(DEPRECATED_MODULE_ALIASES))
 
 
-def register_renamed_module(
-    old_name: str, new_name: str, start_date: datetime.datetime
-):
+def register_renamed_module(old_name: str, new_name: str, start_date: _AcceptableDate):
     """
     Register a renamed module.
 

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/_internal/concurrency/calls.py

@@ -374,8 +374,11 @@ class Call(Generic[T]):
 
         except CancelledError:
             # Report cancellation
-            if TYPE_CHECKING:
-                assert cancel_scope is not None
+            # in rare cases, enforce_sync_deadline raises CancelledError
+            # prior to yielding
+            if cancel_scope is None:
+                self.future.cancel()
+                return None
             if cancel_scope.timedout():
                 setattr(self.future, "_timed_out", True)
                 self.future.cancel()

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/_internal/pydantic/v2_schema.py

@@ -106,4 +106,5 @@ def create_v2_schema(
     # ensure backwards compatibility by copying $defs into definitions
     if "$defs" in schema:
         schema["definitions"] = schema["$defs"]
+
     return schema

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/_internal/schemas/bases.py

@@ -64,7 +64,7 @@ class PrefectBaseModel(BaseModel):
 
     def __rich_repr__(self) -> RichReprResult:
         # Display all of the fields in the model if they differ from the default value
-        for name, field in self.model_fields.items():
+        for name, field in type(self).model_fields.items():
             value = getattr(self, name)
 
             # Simplify the display of some common fields
@@ -90,7 +90,9 @@ class PrefectBaseModel(BaseModel):
         """
         return self.model_copy(
             update={
-                field: self.model_fields[field].get_default(call_default_factory=True)
+                field: type(self)
+                .model_fields[field]
+                .get_default(call_default_factory=True)
                 for field in self._reset_fields
             }
         )

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/blocks/core.py

@@ -18,6 +18,7 @@ from typing import (
     Optional,
     TypeVar,
     Union,
+    cast,
     get_origin,
 )
 from uuid import UUID, uuid4
@@ -169,14 +170,13 @@ def _collect_secret_fields(
         return
 
     if type_ in (SecretStr, SecretBytes) or (
-        isinstance(type_, type)
+        isinstance(type_, type)  # type: ignore[unnecessaryIsInstance]
         and getattr(type_, "__module__", None) == "pydantic.types"
         and getattr(type_, "__name__", None) == "Secret"
     ):
         secrets.append(name)
     elif type_ == SecretDict:
-        # Append .* to field name to signify that all values under this
-        # field are secret and should be obfuscated.
+        # Append .* to field name to signify that all values under a given key are secret and should be obfuscated.
         secrets.append(f"{name}.*")
     elif Block.is_block_class(type_):
         secrets.extend(
@@ -371,7 +371,7 @@ class Block(BaseModel, ABC):
                         visit_fn=partial(handle_secret_render, context=ctx),
                         return_data=True,
                     )
-                    for field_name in self.model_fields
+                    for field_name in type(self).model_fields
                 }
             )
         if extra_fields := {
@@ -1501,14 +1501,7 @@ class Block(BaseModel, ABC):
         if "$defs" in schema:
             schema["definitions"] = schema.pop("$defs")
 
-        # we aren't expecting these additional fields in the schema
-        if "additionalProperties" in schema:
-            schema.pop("additionalProperties")
-
-        for _, definition in schema.get("definitions", {}).items():
-            if "additionalProperties" in definition:
-                definition.pop("additionalProperties")
-
+        schema = remove_nested_keys(["additionalProperties"], schema)
         return schema
 
     @classmethod
@@ -1521,6 +1514,7 @@ class Block(BaseModel, ABC):
         context: dict[str, Any] | None = None,
     ) -> Self:
         if isinstance(obj, dict):
+            obj = cast(dict[str, Any], obj)
             extra_serializer_fields = {
                 "_block_document_id",
                 "_block_document_name",
@@ -1530,7 +1524,10 @@ class Block(BaseModel, ABC):
                 obj.pop(field, None)
 
         return super().model_validate(
-            obj, strict=strict, from_attributes=from_attributes, context=context
+            obj,
+            strict=strict,
+            from_attributes=from_attributes,
+            context=context,
         )
 
     def model_dump(

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/base.py

@@ -222,6 +222,10 @@ class PrefectHttpxAsyncClient(httpx.AsyncClient):
         if the request either raises an exception listed in `retry_exceptions` or
         receives a response with a status code listed in `retry_codes`.
 
+        Retries are not counted against the limit if the response headers contains
+        a reserved value, indicating that the server is undergoing maintenance. These
+        requests will retry indefinitely until the header is no longer returned.
+
         Retries will be delayed based on either the retry header (preferred) or
         exponential backoff if a retry header is not provided.
         """
@@ -239,18 +243,21 @@ class PrefectHttpxAsyncClient(httpx.AsyncClient):
             await self._add_csrf_headers(request=request)
 
         while try_count <= PREFECT_CLIENT_MAX_RETRIES.value():
-            try_count += 1
             retry_seconds = None
             exc_info = None
 
             try:
                 response = await send(request, *send_args, **send_kwargs)
             except retry_exceptions:  # type: ignore
+                try_count += 1
                 if try_count > PREFECT_CLIENT_MAX_RETRIES.value():
                     raise
                 # Otherwise, we will ignore this error but capture the info for logging
                 exc_info = sys.exc_info()
             else:
+                if response.headers.get("Prefect-Maintenance") != "true":
+                    try_count += 1
+
                 # We got a response; check if it's a CSRF error, otherwise
                 # return immediately if it is not retryable
                 if (
@@ -441,6 +448,10 @@ class PrefectHttpxSyncClient(httpx.Client):
         if the request either raises an exception listed in `retry_exceptions` or
         receives a response with a status code listed in `retry_codes`.
 
+        Retries are not counted against the limit if the response headers contains
+        a reserved value, indicating that the server is undergoing maintenance. These
+        requests will retry indefinitely until the header is no longer returned.
+
         Retries will be delayed based on either the retry header (preferred) or
         exponential backoff if a retry header is not provided.
         """
@@ -458,18 +469,21 @@ class PrefectHttpxSyncClient(httpx.Client):
             self._add_csrf_headers(request=request)
 
         while try_count <= PREFECT_CLIENT_MAX_RETRIES.value():
-            try_count += 1
             retry_seconds = None
             exc_info = None
 
             try:
                 response = send(request, *send_args, **send_kwargs)
             except retry_exceptions:  # type: ignore
+                try_count += 1
                 if try_count > PREFECT_CLIENT_MAX_RETRIES.value():
                     raise
                 # Otherwise, we will ignore this error but capture the info for logging
                 exc_info = sys.exc_info()
             else:
+                if response.headers.get("Prefect-Maintenance") != "true":
+                    try_count += 1
+
                 # We got a response; check if it's a CSRF error, otherwise
                 # return immediately if it is not retryable
                 if (

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/orchestration/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import asyncio
 import base64
 import datetime
@@ -1164,6 +1165,10 @@ class PrefectClient(
     def client_version(self) -> str:
         return prefect.__version__
 
+    @property
+    def loop(self) -> asyncio.AbstractEventLoop | None:
+        return self._loop
+
     async def raise_for_api_version_mismatch(self) -> None:
         # Cloud is always compatible as a server
         if self.server_type == ServerType.CLOUD:

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/orchestration/_deployments/client.py

@@ -29,6 +29,7 @@ if TYPE_CHECKING:
     from prefect.client.schemas.objects import (
         ConcurrencyOptions,
         DeploymentSchedule,
+        VersionInfo,
     )
     from prefect.client.schemas.responses import (
         DeploymentResponse,
@@ -48,6 +49,7 @@ class DeploymentClient(BaseClient):
         flow_id: "UUID",
         name: str,
         version: str | None = None,
+        version_info: "VersionInfo | None" = None,
         schedules: list["DeploymentScheduleCreate"] | None = None,
         concurrency_limit: int | None = None,
         concurrency_options: "ConcurrencyOptions | None" = None,
@@ -65,6 +67,9 @@ class DeploymentClient(BaseClient):
         pull_steps: list[dict[str, Any]] | None = None,
         enforce_parameter_schema: bool | None = None,
         job_variables: dict[str, Any] | None = None,
+        branch: str | None = None,
+        base: UUID | None = None,
+        root: UUID | None = None,
     ) -> "UUID":
         """
         Create a deployment.
@@ -99,6 +104,7 @@ class DeploymentClient(BaseClient):
             flow_id=flow_id,
             name=name,
             version=version,
+            version_info=version_info,
             parameters=dict(parameters or {}),
             tags=list(tags or []),
             work_queue_name=work_queue_name,
@@ -115,6 +121,9 @@ class DeploymentClient(BaseClient):
             concurrency_options=concurrency_options,
             pull_steps=pull_steps,
             enforce_parameter_schema=enforce_parameter_schema,
+            branch=branch,
+            base=base,
+            root=root,
         )
 
         if work_pool_name is not None:
@@ -123,20 +132,29 @@ class DeploymentClient(BaseClient):
         # Exclude newer fields that are not set to avoid compatibility issues
         exclude = {
             field
-            for field in ["work_pool_name", "work_queue_name"]
+            for field in [
+                "work_pool_name",
+                "work_queue_name",
+            ]
             if field not in deployment_create.model_fields_set
         }
 
-        if deployment_create.paused is None:
-            exclude.add("paused")
-
-        if deployment_create.pull_steps is None:
-            exclude.add("pull_steps")
+        exclude_if_none = [
+            "paused",
+            "pull_steps",
+            "enforce_parameter_schema",
+            "version_info",
+            "branch",
+            "base",
+            "root",
+        ]
 
-        if deployment_create.enforce_parameter_schema is None:
-            exclude.add("enforce_parameter_schema")
+        for field in exclude_if_none:
+            if getattr(deployment_create, field) is None:
+                exclude.add(field)
 
         json = deployment_create.model_dump(mode="json", exclude=exclude)
+
         response = self.request(
             "POST",
             "/deployments/",
@@ -593,6 +611,7 @@ class DeploymentAsyncClient(BaseAsyncClient):
         flow_id: "UUID",
         name: str,
         version: str | None = None,
+        version_info: "VersionInfo | None" = None,
         schedules: list["DeploymentScheduleCreate"] | None = None,
         concurrency_limit: int | None = None,
         concurrency_options: "ConcurrencyOptions | None" = None,
@@ -610,6 +629,9 @@ class DeploymentAsyncClient(BaseAsyncClient):
         pull_steps: list[dict[str, Any]] | None = None,
         enforce_parameter_schema: bool | None = None,
         job_variables: dict[str, Any] | None = None,
+        branch: str | None = None,
+        base: UUID | None = None,
+        root: UUID | None = None,
     ) -> "UUID":
         """
         Create a deployment.
@@ -644,6 +666,7 @@ class DeploymentAsyncClient(BaseAsyncClient):
             flow_id=flow_id,
             name=name,
             version=version,
+            version_info=version_info,
             parameters=dict(parameters or {}),
             tags=list(tags or []),
             work_queue_name=work_queue_name,
@@ -660,6 +683,9 @@ class DeploymentAsyncClient(BaseAsyncClient):
             concurrency_options=concurrency_options,
             pull_steps=pull_steps,
             enforce_parameter_schema=enforce_parameter_schema,
+            branch=branch,
+            base=base,
+            root=root,
         )
 
         if work_pool_name is not None:
@@ -668,20 +694,29 @@ class DeploymentAsyncClient(BaseAsyncClient):
         # Exclude newer fields that are not set to avoid compatibility issues
         exclude = {
             field
-            for field in ["work_pool_name", "work_queue_name"]
+            for field in [
+                "work_pool_name",
+                "work_queue_name",
+            ]
             if field not in deployment_create.model_fields_set
         }
 
-        if deployment_create.paused is None:
-            exclude.add("paused")
-
-        if deployment_create.pull_steps is None:
-            exclude.add("pull_steps")
+        exclude_if_none = [
+            "paused",
+            "pull_steps",
+            "enforce_parameter_schema",
+            "version_info",
+            "branch",
+            "base",
+            "root",
+        ]
 
-        if deployment_create.enforce_parameter_schema is None:
-            exclude.add("enforce_parameter_schema")
+        for field in exclude_if_none:
+            if getattr(deployment_create, field) is None:
+                exclude.add(field)
 
         json = deployment_create.model_dump(mode="json", exclude=exclude)
+
         response = await self.request(
             "POST",
             "/deployments/",

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/schemas/actions.py

@@ -253,13 +253,29 @@ class DeploymentCreate(ActionBaseModel):
     infrastructure_document_id: Optional[UUID] = Field(default=None)
     description: Optional[str] = Field(default=None)
     path: Optional[str] = Field(default=None)
-    version: Optional[str] = Field(default=None)
     entrypoint: Optional[str] = Field(default=None)
     job_variables: dict[str, Any] = Field(
         default_factory=dict,
         description="Overrides to apply to flow run infrastructure at runtime.",
     )
 
+    # Versionining
+    version: Optional[str] = Field(default=None)
+    version_info: Optional[objects.VersionInfo] = Field(
+        default=None, description="Version information for the deployment."
+    )
+
+    # Branching
+    branch: Optional[str] = Field(
+        default=None, description="The branch of the deployment."
+    )
+    base: Optional[UUID] = Field(
+        default=None, description="The base deployment of the deployment."
+    )
+    root: Optional[UUID] = Field(
+        default=None, description="The root deployment of the deployment."
+    )
+
     def check_valid_configuration(self, base_job_template: dict[str, Any]) -> None:
         """Check that the combination of base_job_template defaults
         and job_variables conforms to the specified schema.
@@ -289,6 +305,9 @@ class DeploymentUpdate(ActionBaseModel):
         return remove_old_deployment_fields(values)
 
     version: Optional[str] = Field(default=None)
+    version_info: Optional[objects.VersionInfo] = Field(
+        default=None, description="Version information for the deployment."
+    )
     description: Optional[str] = Field(default=None)
     parameters: Optional[dict[str, Any]] = Field(
         default=None,

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/schemas/objects.py

@@ -414,7 +414,7 @@ class State(ObjectBaseModel, Generic[R]):
         database again. The 'timestamp' is reset using the default factory.
         """
         update = {
-            "timestamp": self.model_fields["timestamp"].get_default(),
+            "timestamp": type(self).model_fields["timestamp"].get_default(),
             **(update or {}),
         }
         return super().model_copy(update=update, deep=deep)
@@ -1102,6 +1102,11 @@ class DeploymentSchedule(ObjectBaseModel):
     )
 
 
+class VersionInfo(PrefectBaseModel, extra="allow"):
+    type: str = Field(default=..., description="The type of version info.")
+    version: str = Field(default=..., description="The version of the deployment.")
+
+
 class Deployment(ObjectBaseModel):
     """An ORM representation of deployment data."""
 
@@ -1109,6 +1114,12 @@ class Deployment(ObjectBaseModel):
     version: Optional[str] = Field(
         default=None, description="An optional version for the deployment."
     )
+    version_id: Optional[UUID] = Field(
+        default=None, description="The ID of the current version of the deployment."
+    )
+    version_info: Optional[VersionInfo] = Field(
+        default=None, description="A description of this version of the deployment."
+    )
     description: Optional[str] = Field(
         default=None, description="A description for the deployment."
     )

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/client/schemas/responses.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Any, ClassVar, Generic, Optional, TypeVar, Union
+from typing import TYPE_CHECKING, Any, ClassVar, Generic, Optional, TypeVar, Union
 from uuid import UUID
 
 from pydantic import ConfigDict, Field
@@ -12,6 +12,9 @@ from prefect.types import DateTime, KeyValueLabelsField
 from prefect.utilities.collections import AutoEnum
 from prefect.utilities.names import generate_slug
 
+if TYPE_CHECKING:
+    from prefect.events.schemas.events import RelatedResource
+
 T = TypeVar("T")
 
 
@@ -308,6 +311,12 @@ class DeploymentResponse(ObjectBaseModel):
     version: Optional[str] = Field(
         default=None, description="An optional version for the deployment."
     )
+    version_id: Optional[UUID] = Field(
+        default=None, description="The ID of the current version of the deployment."
+    )
+    version_info: Optional[objects.VersionInfo] = Field(
+        default=None, description="A description of this version of the deployment."
+    )
     description: Optional[str] = Field(
         default=None, description="A description for the deployment."
     )
@@ -420,6 +429,22 @@ class DeploymentResponse(ObjectBaseModel):
         description="Current status of the deployment.",
     )
 
+    def as_related_resource(self, role: str = "deployment") -> "RelatedResource":
+        from prefect.events.schemas.events import RelatedResource
+
+        labels = {
+            "prefect.resource.id": f"prefect.deployment.{self.id}",
+            "prefect.resource.role": role,
+            "prefect.resource.name": self.name,
+        }
+
+        if self.version_id and self.version_info:
+            labels["prefect.deployment.version-id"] = str(self.version_id)
+            labels["prefect.deployment.version-type"] = self.version_info.type
+            labels["prefect.deployment.version"] = self.version_info.version
+
+        return RelatedResource(labels)
+
 
 class MinimalConcurrencyLimitResponse(PrefectBaseModel):
     model_config: ClassVar[ConfigDict] = ConfigDict(extra="ignore")

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/context.py

@@ -6,6 +6,7 @@ These contexts should never be directly mutated by the user.
 For more user-accessible information about the current run, see [`prefect.runtime`](../runtime/flow_run).
 """
 
+import asyncio
 import os
 import sys
 import warnings
@@ -294,7 +295,7 @@ class AsyncClientContext(ContextModel):
     @asynccontextmanager
     async def get_or_create(cls) -> AsyncGenerator[Self, None]:
         ctx = cls.get()
-        if ctx:
+        if ctx and asyncio.get_running_loop() is ctx.client.loop:
             yield ctx
         else:
             async with cls() as ctx:

{prefect_client-3.3.0 → prefect_client-3.3.2}/src/prefect/events/filters.py

@@ -45,7 +45,7 @@ class EventDataFilter(PrefectBaseModel, extra="forbid"):  # type: ignore[call-ar
     def get_filters(self) -> list["EventDataFilter"]:
         filters: list["EventDataFilter"] = [
             filter
-            for filter in [getattr(self, name) for name in self.model_fields]
+            for filter in [getattr(self, name) for name in type(self).model_fields]
             if isinstance(filter, EventDataFilter)
         ]
         return filters