prefect-client 3.3.1__tar.gz → 3.3.2.dev2__tar.gz

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/PKG-INFO

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

prefect_client-3.3.2.dev2/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.2.dev2"
+__build_date__ = "2025-04-03 08:08:10.651077+00:00"
+__git_commit__ = "6d3d12cfe81fa08c1b14f99867e2e621816d1a89"
+__dirty__ = False

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

@@ -255,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 {}
 

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/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.1 → prefect_client-3.3.2.dev2}/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.1 → prefect_client-3.3.2.dev2}/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.1 → prefect_client-3.3.2.dev2}/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.1 → prefect_client-3.3.2.dev2}/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.1 → prefect_client-3.3.2.dev2}/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

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/events/related.py

@@ -33,7 +33,7 @@ RESOURCE_CACHE: RelatedResourceCache = {}
 
 def tags_as_related_resources(tags: Iterable[str]) -> List[RelatedResource]:
     return [
-        RelatedResource.model_validate(
+        RelatedResource(
             {
                 "prefect.resource.id": f"prefect.tag.{tag}",
                 "prefect.resource.role": "tag",
@@ -44,9 +44,11 @@ def tags_as_related_resources(tags: Iterable[str]) -> List[RelatedResource]:
 
 
 def object_as_related_resource(kind: str, role: str, object: Any) -> RelatedResource:
-    resource_id = f"prefect.{kind}.{object.id}"
+    if as_related_resource := getattr(object, "as_related_resource", None):
+        return as_related_resource(role=role)
 
-    return RelatedResource.model_validate(
+    resource_id = f"prefect.{kind}.{object.id}"
+    return RelatedResource(
         {
             "prefect.resource.id": resource_id,
             "prefect.resource.role": role,

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/flows.py

@@ -636,7 +636,8 @@ class Flow(Generic[P, R]):
         cast_parameters = {
             k: v
             for k, v in dict(iter(model)).items()
-            if k in model.model_fields_set or model.model_fields[k].default_factory
+            if k in model.model_fields_set
+            or type(model).model_fields[k].default_factory
         }
         return cast_parameters
 

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/runner/runner.py

@@ -1158,15 +1158,7 @@ class Runner:
 
         flow, deployment = await self._get_flow_and_deployment(flow_run)
         if deployment:
-            related.append(
-                RelatedResource(
-                    {
-                        "prefect.resource.id": f"prefect.deployment.{deployment.id}",
-                        "prefect.resource.role": "deployment",
-                        "prefect.resource.name": deployment.name,
-                    }
-                )
-            )
+            related.append(deployment.as_related_resource())
             tags.extend(deployment.tags)
         if flow:
             related.append(
@@ -1211,15 +1203,7 @@ class Runner:
         related: list[RelatedResource] = []
         tags: list[str] = []
         if deployment:
-            related.append(
-                RelatedResource(
-                    {
-                        "prefect.resource.id": f"prefect.deployment.{deployment.id}",
-                        "prefect.resource.role": "deployment",
-                        "prefect.resource.name": deployment.name,
-                    }
-                )
-            )
+            related.append(deployment.as_related_resource())
             tags.extend(deployment.tags)
         if flow:
             related.append(

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/schedules.py

@@ -47,7 +47,7 @@ class Schedule:
     anchor_date: datetime.datetime = dataclasses.field(
         default_factory=partial(datetime.datetime.now, tz=datetime.timezone.utc)
     )
-    day_or: bool = False
+    day_or: bool = True
     active: bool = True
     parameters: dict[str, Any] = dataclasses.field(default_factory=dict)
     slug: str | None = None
@@ -73,7 +73,7 @@ def Cron(
     cron: str,
     /,
     timezone: str | None = None,
-    day_or: bool = False,
+    day_or: bool = True,
     active: bool = True,
     parameters: dict[str, Any] | None = None,
     slug: str | None = None,

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/server/api/flow_runs.py

@@ -181,12 +181,12 @@ async def update_flow_run(
 
 @router.post("/count")
 async def count_flow_runs(
-    flows: schemas.filters.FlowFilter = None,
-    flow_runs: schemas.filters.FlowRunFilter = None,
-    task_runs: schemas.filters.TaskRunFilter = None,
-    deployments: schemas.filters.DeploymentFilter = None,
-    work_pools: schemas.filters.WorkPoolFilter = None,
-    work_pool_queues: schemas.filters.WorkQueueFilter = None,
+    flows: Optional[schemas.filters.FlowFilter] = None,
+    flow_runs: Optional[schemas.filters.FlowRunFilter] = None,
+    task_runs: Optional[schemas.filters.TaskRunFilter] = None,
+    deployments: Optional[schemas.filters.DeploymentFilter] = None,
+    work_pools: Optional[schemas.filters.WorkPoolFilter] = None,
+    work_pool_queues: Optional[schemas.filters.WorkQueueFilter] = None,
     db: PrefectDBInterface = Depends(provide_database_interface),
 ) -> int:
     """
@@ -279,12 +279,12 @@ async def flow_run_history(
         json_schema_extra={"format": "time-delta"},
         alias="history_interval_seconds",
     ),
-    flows: schemas.filters.FlowFilter = None,
-    flow_runs: schemas.filters.FlowRunFilter = None,
-    task_runs: schemas.filters.TaskRunFilter = None,
-    deployments: schemas.filters.DeploymentFilter = None,
-    work_pools: schemas.filters.WorkPoolFilter = None,
-    work_queues: schemas.filters.WorkQueueFilter = None,
+    flows: Optional[schemas.filters.FlowFilter] = None,
+    flow_runs: Optional[schemas.filters.FlowRunFilter] = None,
+    task_runs: Optional[schemas.filters.TaskRunFilter] = None,
+    deployments: Optional[schemas.filters.DeploymentFilter] = None,
+    work_pools: Optional[schemas.filters.WorkPoolFilter] = None,
+    work_queues: Optional[schemas.filters.WorkQueueFilter] = None,
     db: PrefectDBInterface = Depends(provide_database_interface),
 ) -> List[schemas.responses.HistoryResponse]:
     """
@@ -293,6 +293,7 @@ async def flow_run_history(
     if isinstance(history_interval, float):
         history_interval = datetime.timedelta(seconds=history_interval)
 
+    assert isinstance(history_interval, datetime.timedelta)
     if history_interval < datetime.timedelta(seconds=1):
         raise HTTPException(
             status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -351,8 +352,8 @@ async def read_flow_run_graph_v1(
 @router.get("/{id:uuid}/graph-v2", tags=["Flow Run Graph"])
 async def read_flow_run_graph_v2(
     flow_run_id: UUID = Path(..., description="The flow run id", alias="id"),
-    since: DateTime = Query(
-        default=jsonable_encoder(DateTime.min),
+    since: datetime.datetime = Query(
+        default=jsonable_encoder(datetime.datetime.min),
         description="Only include runs that start or end after this time.",
     ),
     db: PrefectDBInterface = Depends(provide_database_interface),

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/server/api/run_history.py

@@ -36,7 +36,7 @@ async def run_history(
     deployments: Optional[schemas.filters.DeploymentFilter] = None,
     work_pools: Optional[schemas.filters.WorkPoolFilter] = None,
     work_queues: Optional[schemas.filters.WorkQueueFilter] = None,
-) -> List[schemas.responses.HistoryResponse]:
+) -> list[schemas.responses.HistoryResponse]:
     """
     Produce a history of runs aggregated by interval and state
     """

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/settings/base.py

@@ -101,7 +101,7 @@ class PrefectBaseSettings(BaseSettings):
             context={"include_secrets": include_secrets},
         )
         env_variables: dict[str, str] = {}
-        for key in self.model_fields.keys():
+        for key in type(self).model_fields.keys():
             if isinstance(child_settings := getattr(self, key), PrefectBaseSettings):
                 child_env = child_settings.to_environment_variables(
                     exclude_unset=exclude_unset,
@@ -110,7 +110,7 @@ class PrefectBaseSettings(BaseSettings):
                 )
                 env_variables.update(child_env)
             elif (value := env.get(key)) is not None:
-                validation_alias = self.model_fields[key].validation_alias
+                validation_alias = type(self).model_fields[key].validation_alias
                 if include_aliases and validation_alias is not None:
                     if isinstance(validation_alias, AliasChoices):
                         for alias in validation_alias.choices:
@@ -134,9 +134,9 @@ class PrefectBaseSettings(BaseSettings):
     def ser_model(
         self, handler: SerializerFunctionWrapHandler, info: SerializationInfo
     ) -> Any:
-        jsonable_self = handler(self)
+        jsonable_self: dict[str, Any] = handler(self)
         # iterate over fields to ensure child models that have been updated are also included
-        for key in self.model_fields.keys():
+        for key in type(self).model_fields.keys():
             if info.exclude and key in info.exclude:
                 continue
             if info.include and key not in info.include:

{prefect_client-3.3.1 → prefect_client-3.3.2.dev2}/src/prefect/settings/models/root.py

@@ -276,12 +276,17 @@ class Settings(PrefectBaseSettings):
         for r in restore_defaults or []:
             path = r.accessor.split(".")
             model = self
+            model_cls = model.__class__
+            model_fields = model_cls.model_fields
             for key in path[:-1]:
-                model = model.model_fields[key].annotation
-                assert model is not None, f"Invalid setting path: {r.accessor}"
-
-            model_field = model.model_fields[path[-1]]
-            assert model is not None, f"Invalid setting path: {r.accessor}"
+                model_field = model_fields[key]
+                model_cls = model_field.annotation
+                if model_cls is None:
+                    raise ValueError(f"Invalid setting path: {r.accessor}")
+                model_fields = model_cls.model_fields
+
+            model_field = model_fields[path[-1]]
+            assert model_field is not None, f"Invalid setting path: {r.accessor}"
             if hasattr(model_field, "default"):
                 default = model_field.default
             elif (

prefect_client-3.3.1/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.3.1"
-__build_date__ = "2025-04-01 02:38:39.208039+00:00"
-__git_commit__ = "6a1646202888ea59a3493f30ee9eaed6aea07960"
-__dirty__ = False