prefect-client 3.4.1.dev5__tar.gz → 3.4.2.dev1__tar.gz

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.4.1.dev5
+Version: 3.4.2.dev1
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -60,6 +60,7 @@ Requires-Dist: sniffio<2.0.0,>=1.3.0
 Requires-Dist: toml>=0.10.0
 Requires-Dist: typing-extensions<5.0.0,>=4.10.0
 Requires-Dist: ujson<6.0.0,>=5.8.0
+Requires-Dist: uuid7>=0.1.0
 Requires-Dist: uvicorn!=0.29.0,>=0.14.0
 Requires-Dist: websockets<16.0,>=13.0
 Requires-Dist: whenever<0.9.0,>=0.7.3; python_version >= '3.13'

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/pyproject.toml

@@ -65,6 +65,7 @@ dependencies = [
     "typing_extensions>=4.10.0,<5.0.0",
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
+    "uuid7>=0.1.0",
     "websockets>=13.0,<16.0",
     "whenever>=0.7.3,<0.9.0; python_version>='3.13'",
 ]

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.2.dev1"
+__build_date__ = "2025-05-10 08:07:06.027110+00:00"
+__git_commit__ = "f9346cb6934abec911bf71b8a871eeb05300382f"
+__dirty__ = False

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/_internal/schemas/bases.py

@@ -10,6 +10,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from rich.repr import RichReprResult
 from typing_extensions import Self
 
+from prefect._internal.uuid7 import uuid7
 from prefect.types._datetime import (
     DateTime,
     human_friendly_diff,
@@ -100,7 +101,7 @@ class PrefectBaseModel(BaseModel):
 
 class IDBaseModel(PrefectBaseModel):
     """
-    A PrefectBaseModel with an auto-generated UUID ID value.
+    A PrefectBaseModel with a randomly-generated UUID ID value.
 
     The ID is reset on copy() and not included in equality comparisons.
     """
@@ -109,6 +110,15 @@ class IDBaseModel(PrefectBaseModel):
     id: UUID = Field(default_factory=uuid4)
 
 
+class TimeSeriesBaseModel(IDBaseModel):
+    """
+    A PrefectBaseModel with a time-oriented UUIDv7 ID value.  Used for models that
+    operate like timeseries, such as runs, states, and logs.
+    """
+
+    id: UUID = Field(default_factory=uuid7)
+
+
 class ObjectBaseModel(IDBaseModel):
     """
     A PrefectBaseModel with an auto-generated UUID ID value and created /

prefect_client-3.4.2.dev1/src/prefect/_internal/uuid7.py

@@ -0,0 +1,11 @@
+from typing import cast
+from uuid import UUID
+
+from uuid_extensions import uuid7 as _uuid7  # pyright: ignore[reportMissingTypeStubs]
+
+
+def uuid7() -> UUID:
+    return cast(UUID, _uuid7())
+
+
+__all__ = ["uuid7"]

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/client/schemas/objects.py

@@ -15,7 +15,7 @@ from typing import (
     Union,
     overload,
 )
-from uuid import UUID, uuid4
+from uuid import UUID
 
 import orjson
 from pydantic import (
@@ -36,7 +36,11 @@ from typing_extensions import Literal, Self, TypeVar
 
 from prefect._internal.compatibility.async_dispatch import async_dispatch
 from prefect._internal.compatibility.migration import getattr_migration
-from prefect._internal.schemas.bases import ObjectBaseModel, PrefectBaseModel
+from prefect._internal.schemas.bases import (
+    ObjectBaseModel,
+    PrefectBaseModel,
+    TimeSeriesBaseModel,
+)
 from prefect._internal.schemas.fields import CreatedBy, UpdatedBy
 from prefect._internal.schemas.validators import (
     get_or_create_run_name,
@@ -48,6 +52,7 @@ from prefect._internal.schemas.validators import (
     validate_not_negative,
     validate_parent_and_ref_diff,
 )
+from prefect._internal.uuid7 import uuid7
 from prefect._result_records import ResultRecordMetadata
 from prefect.client.schemas.schedules import SCHEDULE_TYPES
 from prefect.settings import PREFECT_CLOUD_API_URL, PREFECT_CLOUD_UI_URL
@@ -184,7 +189,7 @@ def data_discriminator(x: Any) -> str:
     return "Any"
 
 
-class State(ObjectBaseModel, Generic[R]):
+class State(TimeSeriesBaseModel, ObjectBaseModel, Generic[R]):
     """
     The state of a run.
     """
@@ -415,7 +420,7 @@ class State(ObjectBaseModel, Generic[R]):
         """
         return self.model_copy(
             update={
-                "id": uuid4(),
+                "id": uuid7(),
                 "created": now("UTC"),
                 "updated": now("UTC"),
                 "timestamp": now("UTC"),
@@ -511,7 +516,7 @@ class FlowRunPolicy(PrefectBaseModel):
         return values
 
 
-class FlowRun(ObjectBaseModel):
+class FlowRun(TimeSeriesBaseModel, ObjectBaseModel):
     name: str = Field(
         default_factory=lambda: generate_slug(2),
         description=(
@@ -767,7 +772,7 @@ class Constant(TaskRunInput):
     type: str
 
 
-class TaskRun(ObjectBaseModel):
+class TaskRun(TimeSeriesBaseModel, ObjectBaseModel):
     name: str = Field(
         default_factory=lambda: generate_slug(2), examples=["my-task-run"]
     )
@@ -1307,7 +1312,7 @@ class SavedSearch(ObjectBaseModel):
     )
 
 
-class Log(ObjectBaseModel):
+class Log(TimeSeriesBaseModel, ObjectBaseModel):
     """An ORM representation of log data."""
 
     name: str = Field(default=..., description="The logger name.")

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/events/filters.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import datetime
-from typing import Optional
+from typing import Optional, Union
 from uuid import UUID
 
 from pydantic import Field
@@ -43,11 +45,21 @@ class EventDataFilter(PrefectBaseModel, extra="forbid"):  # type: ignore[call-ar
     """A base class for filtering event data."""
 
     def get_filters(self) -> list["EventDataFilter"]:
-        filters: list["EventDataFilter"] = [
-            filter
-            for filter in [getattr(self, name) for name in type(self).model_fields]
-            if isinstance(filter, EventDataFilter)
-        ]
+        filters: list[EventDataFilter] = []
+        for filter in [
+            getattr(self, name) for name in self.__class__.model_fields.keys()
+        ]:
+            # Any embedded list of filters are flattened and thus ANDed together
+            subfilters: list[EventDataFilter] = (
+                filter if isinstance(filter, list) else [filter]
+            )
+
+            for subfilter in subfilters:
+                if not isinstance(subfilter, EventDataFilter):
+                    continue
+
+                filters.append(subfilter)
+
         return filters
 
     def includes(self, event: Event) -> bool:
@@ -233,18 +245,20 @@ class EventFilter(EventDataFilter):
         default=None,
         description="Filter criteria for the event name",
     )
-    any_resource: Optional[EventAnyResourceFilter] = Field(
-        default=None,
-        description="Filter criteria for any resource involved in the event",
-    )
     resource: Optional[EventResourceFilter] = Field(
         default=None,
         description="Filter criteria for the resource of the event",
     )
-    related: Optional[EventRelatedFilter] = Field(
+    related: Optional[Union[EventRelatedFilter, list[EventRelatedFilter]]] = Field(
         default=None,
         description="Filter criteria for the related resources of the event",
     )
+    any_resource: Optional[
+        Union[EventAnyResourceFilter, list[EventAnyResourceFilter]]
+    ] = Field(
+        default=None,
+        description="Filter criteria for any resource involved in the event",
+    )
     id: EventIDFilter = Field(
         default_factory=lambda: EventIDFilter(id=[]),
         description="Filter criteria for the events' ID",

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/events/schemas/automations.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import abc
 import textwrap
 from datetime import timedelta
@@ -103,7 +105,7 @@ class ResourceTrigger(Trigger, abc.ABC):
         default_factory=lambda: ResourceSpecification.model_validate({}),
         description="Labels for resources which this trigger will match.",
     )
-    match_related: ResourceSpecification = Field(
+    match_related: Union[ResourceSpecification, list[ResourceSpecification]] = Field(
         default_factory=lambda: ResourceSpecification.model_validate({}),
         description="Labels for related resources which this trigger will match.",
     )

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/events/schemas/events.py

@@ -13,7 +13,7 @@ from typing import (
     Tuple,
     Union,
 )
-from uuid import UUID, uuid4
+from uuid import UUID
 
 from pydantic import (
     AfterValidator,
@@ -26,6 +26,7 @@ from typing_extensions import Annotated, Self
 
 import prefect.types._datetime
 from prefect._internal.schemas.bases import PrefectBaseModel
+from prefect._internal.uuid7 import uuid7
 from prefect.logging import get_logger
 from prefect.settings import (
     PREFECT_EVENTS_MAXIMUM_LABELS_PER_RESOURCE,
@@ -135,7 +136,7 @@ class Event(PrefectBaseModel):
         description="An open-ended set of data describing what happened",
     )
     id: UUID = Field(
-        default_factory=uuid4,
+        default_factory=uuid7,
         description="The client-provided identifier of this event",
     )
     follows: Optional[UUID] = Field(

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/server/api/workers.py

@@ -3,7 +3,7 @@ Routes for interacting with work queue objects.
 """
 
 from typing import TYPE_CHECKING, List, Optional
-from uuid import UUID, uuid4
+from uuid import UUID
 
 import sqlalchemy as sa
 from fastapi import (
@@ -20,6 +20,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 import prefect.server.api.dependencies as dependencies
 import prefect.server.models as models
 import prefect.server.schemas as schemas
+from prefect._internal.uuid7 import uuid7
 from prefect.server.api.validation import validate_job_variable_defaults_for_work_pool
 from prefect.server.database import PrefectDBInterface, provide_database_interface
 from prefect.server.models.deployments import mark_deployments_ready
@@ -184,7 +185,7 @@ async def create_work_pool(
             )
 
             await emit_work_pool_status_event(
-                event_id=uuid4(),
+                event_id=uuid7(),
                 occurred=now("UTC"),
                 pre_update_work_pool=None,
                 work_pool=model,

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/task_runners.py

@@ -21,6 +21,7 @@ from typing import (
 
 from typing_extensions import ParamSpec, Self, TypeVar
 
+from prefect._internal.uuid7 import uuid7
 from prefect.client.schemas.objects import TaskRunInput
 from prefect.exceptions import MappingLengthMismatch, MappingMissingIterable
 from prefect.futures import (
@@ -290,7 +291,7 @@ class ThreadPoolTaskRunner(TaskRunner[PrefectConcurrentFuture[R]]):
         from prefect.context import FlowRunContext
         from prefect.task_engine import run_task_async, run_task_sync
 
-        task_run_id = uuid.uuid4()
+        task_run_id = uuid7()
         cancel_event = threading.Event()
         self._cancel_events[task_run_id] = cancel_event
         context = copy_context()

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/tasks.py

@@ -32,6 +32,7 @@ from uuid import UUID, uuid4
 from typing_extensions import Literal, ParamSpec, Self, TypeAlias, TypeIs
 
 import prefect.states
+from prefect._internal.uuid7 import uuid7
 from prefect.cache_policies import DEFAULT, NO_CACHE, CachePolicy
 from prefect.client.orchestration import get_client
 from prefect.client.schemas import TaskRun
@@ -953,7 +954,7 @@ class Task(Generic[P, R]):
                 if flow_run_context and flow_run_context.flow_run
                 else None
             )
-            task_run_id = id or uuid4()
+            task_run_id = id or uuid7()
             state = prefect.states.Pending(
                 state_details=StateDetails(
                     task_run_id=task_run_id,

{prefect_client-3.4.1.dev5 → prefect_client-3.4.2.dev1}/src/prefect/types/__init__.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import Annotated, Any, Optional, TypeVar, Union
+from typing import Annotated, Any, Optional, TypeVar, Union, cast
+from uuid import UUID
 from typing_extensions import Literal
 import orjson
 import pydantic
 
-
 from ._datetime import DateTime, Date
 from .names import (
     Name,

prefect_client-3.4.1.dev5/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.1.dev5"
-__build_date__ = "2025-05-08 08:08:59.726919+00:00"
-__git_commit__ = "7e7a18743f5fd0bd4e513ca22c5408e7176390b8"
-__dirty__ = False