prefect-client 2.20.2__py3-none-any.whl → 3.0.0__py3-none-any.whl

prefect/runtime/flow_run.py

@@ -40,6 +40,7 @@ __all__ = [
     "parameters",
     "parent_flow_run_id",
     "parent_deployment_id",
+    "root_flow_run_id",
     "run_count",
     "api_url",
     "ui_url",
@@ -120,7 +121,7 @@ async def _get_flow_from_run(flow_run_id):
         return await client.read_flow(flow_run.flow_id)
 
 
-def get_id() -> str:
+def get_id() -> Optional[str]:
     flow_run_ctx = FlowRunContext.get()
     task_run_ctx = TaskRunContext.get()
     if flow_run_ctx is not None:
@@ -254,11 +255,12 @@ def get_parent_flow_run_id() -> Optional[str]:
         parent_task_run = from_sync.call_soon_in_loop_thread(
             create_call(_get_task_run, parent_task_run_id)
         ).result()
-        return parent_task_run.flow_run_id
+        return str(parent_task_run.flow_run_id) if parent_task_run.flow_run_id else None
+
     return None
 
 
-def get_parent_deployment_id() -> Dict[str, Any]:
+def get_parent_deployment_id() -> Optional[str]:
     parent_flow_run_id = get_parent_flow_run_id()
     if parent_flow_run_id is None:
         return None
@@ -266,7 +268,39 @@ def get_parent_deployment_id() -> Dict[str, Any]:
     parent_flow_run = from_sync.call_soon_in_loop_thread(
         create_call(_get_flow_run, parent_flow_run_id)
     ).result()
-    return parent_flow_run.deployment_id if parent_flow_run else None
+
+    if parent_flow_run:
+        return (
+            str(parent_flow_run.deployment_id)
+            if parent_flow_run.deployment_id
+            else None
+        )
+
+    return None
+
+
+def get_root_flow_run_id() -> str:
+    run_id = get_id()
+    parent_flow_run_id = get_parent_flow_run_id()
+    if parent_flow_run_id is None:
+        return run_id
+
+    def _get_root_flow_run_id(flow_run_id):
+        flow_run = from_sync.call_soon_in_loop_thread(
+            create_call(_get_flow_run, flow_run_id)
+        ).result()
+
+        if flow_run.parent_task_run_id is None:
+            return str(flow_run_id)
+        else:
+            parent_task_run = from_sync.call_soon_in_loop_thread(
+                create_call(_get_task_run, flow_run.parent_task_run_id)
+            ).result()
+            return _get_root_flow_run_id(parent_task_run.flow_run_id)
+
+    root_flow_run_id = _get_root_flow_run_id(parent_flow_run_id)
+
+    return root_flow_run_id
 
 
 def get_flow_run_api_url() -> Optional[str]:
@@ -289,11 +323,12 @@ FIELDS = {
     "scheduled_start_time": get_scheduled_start_time,
     "name": get_name,
     "flow_name": get_flow_name,
-    "flow_version": get_flow_version,
     "parameters": get_parameters,
     "parent_flow_run_id": get_parent_flow_run_id,
     "parent_deployment_id": get_parent_deployment_id,
+    "root_flow_run_id": get_root_flow_run_id,
     "run_count": get_run_count,
     "api_url": get_flow_run_api_url,
     "ui_url": get_flow_run_ui_url,
+    "flow_version": get_flow_version,
 }

prefect/runtime/task_run.py

@@ -14,6 +14,7 @@ Available attributes:
     - `run_count`: the number of times this task run has been run
     - `task_name`: the name of the task
 """
+
 import os
 from typing import Any, Dict, List, Optional
 

prefect/serializers.py

@@ -13,9 +13,17 @@ bytes to an object respectively.
 
 import abc
 import base64
-from typing import Any, Dict, Generic, Optional, Type, TypeVar
-
-from typing_extensions import Literal, Self
+from typing import Any, Dict, Generic, Optional, Type
+
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    TypeAdapter,
+    ValidationError,
+    field_validator,
+)
+from typing_extensions import Literal, Self, TypeVar
 
 from prefect._internal.schemas.validators import (
     cast_type_names_to_serializers,
@@ -23,33 +31,12 @@ from prefect._internal.schemas.validators import (
     validate_dump_kwargs,
     validate_load_kwargs,
     validate_picklelib,
-    validate_picklelib_version,
 )
-from prefect.pydantic import HAS_PYDANTIC_V2
 from prefect.utilities.dispatch import get_dispatch_key, lookup_type, register_base_type
 from prefect.utilities.importtools import from_qualified_name, to_qualified_name
 from prefect.utilities.pydantic import custom_pydantic_encoder
 
-if HAS_PYDANTIC_V2:
-    from pydantic.v1 import (
-        BaseModel,
-        Field,
-        ValidationError,
-        parse_obj_as,
-        root_validator,
-        validator,
-    )
-else:
-    from pydantic import (
-        BaseModel,
-        Field,
-        ValidationError,
-        parse_obj_as,
-        root_validator,
-        validator,
-    )
-
-D = TypeVar("D")
+D = TypeVar("D", default=Any)
 
 
 def prefect_json_object_encoder(obj: Any) -> Any:
@@ -73,7 +60,9 @@ def prefect_json_object_decoder(result: dict):
     with `prefect_json_object_encoder`
     """
     if "__class__" in result:
-        return parse_obj_as(from_qualified_name(result["__class__"]), result["data"])
+        return TypeAdapter(from_qualified_name(result["__class__"])).validate_python(
+            result["data"]
+        )
     elif "__exc_type__" in result:
         return from_qualified_name(result["__exc_type__"])(result["message"])
     else:
@@ -112,12 +101,12 @@ class Serializer(BaseModel, Generic[D], abc.ABC):
     def loads(self, blob: bytes) -> D:
         """Decode the blob of bytes into an object."""
 
-    class Config:
-        extra = "forbid"
+    model_config = ConfigDict(extra="forbid")
 
     @classmethod
-    def __dispatch_key__(cls):
-        return cls.__fields__.get("type").get_default()
+    def __dispatch_key__(cls) -> str:
+        type_str = cls.model_fields["type"].default
+        return type_str if isinstance(type_str, str) else None
 
 
 class PickleSerializer(Serializer):
@@ -133,15 +122,15 @@ class PickleSerializer(Serializer):
     type: Literal["pickle"] = "pickle"
 
     picklelib: str = "cloudpickle"
-    picklelib_version: str = None
+    picklelib_version: Optional[str] = None
 
-    @validator("picklelib")
+    @field_validator("picklelib")
     def check_picklelib(cls, value):
         return validate_picklelib(value)
 
-    @root_validator
-    def check_picklelib_version(cls, values):
-        return validate_picklelib_version(values)
+    # @model_validator(mode="before")
+    # def check_picklelib_version(cls, values):
+    #     return validate_picklelib_version(values)
 
     def dumps(self, obj: Any) -> bytes:
         pickler = from_qualified_name(self.picklelib)
@@ -185,11 +174,11 @@ class JSONSerializer(Serializer):
     dumps_kwargs: Dict[str, Any] = Field(default_factory=dict)
     loads_kwargs: Dict[str, Any] = Field(default_factory=dict)
 
-    @validator("dumps_kwargs")
+    @field_validator("dumps_kwargs")
     def dumps_kwargs_cannot_contain_default(cls, value):
         return validate_dump_kwargs(value)
 
-    @validator("loads_kwargs")
+    @field_validator("loads_kwargs")
     def loads_kwargs_cannot_contain_object_hook(cls, value):
         return validate_load_kwargs(value)
 
@@ -229,11 +218,11 @@ class CompressedSerializer(Serializer):
     serializer: Serializer
     compressionlib: str = "lzma"
 
-    @validator("serializer", pre=True)
+    @field_validator("serializer", mode="before")
     def validate_serializer(cls, value):
         return cast_type_names_to_serializers(value)
 
-    @validator("compressionlib")
+    @field_validator("compressionlib")
     def check_compressionlib(cls, value):
         return validate_compressionlib(value)
 

prefect/server/api/collections_data/views/aggregate-worker-metadata.json

@@ -1,14 +1,5 @@
 {
   "prefect": {
-    "prefect-agent": {
-      "type": "prefect-agent",
-      "documentation_url": "https://docs.prefect.io/latest/concepts/work-pools/#agent-overview",
-      "display_name": "Prefect Agent",
-      "logo_url": "https://cdn.sanity.io/images/3ugk85nk/production/c771bb53894c877e169c8db158c5598558b8f175-24x24.svg",
-      "install_command": "pip install prefect",
-      "default_base_job_configuration": {},
-      "description": "Execute flow runs on heterogeneous infrastructure using infrastructure blocks."
-    },
     "process": {
       "default_base_job_configuration": {
         "job_configuration": {
@@ -806,7 +797,7 @@
             "image": {
               "title": "Image",
               "description": "The image reference of a container image to use for created jobs. If not set, the latest Prefect image will be used.",
-              "example": "docker.io/prefecthq/prefect:2-latest",
+              "example": "docker.io/prefecthq/prefect:3-latest",
               "type": "string"
             },
             "registry_credentials": {
@@ -1040,7 +1031,7 @@
             "image": {
               "title": "Image Name",
               "description": "The image to use for a new Cloud Run Job. If not set, the latest Prefect image will be used. See https://cloud.google.com/run/docs/deploying#images.",
-              "example": "docker.io/prefecthq/prefect:2-latest",
+              "example": "docker.io/prefecthq/prefect:3-latest",
               "type": "string"
             },
             "cpu": {
@@ -1211,7 +1202,7 @@
             "image": {
               "title": "Image Name",
               "description": "The image to use for the Cloud Run job. If not provided the default Prefect image will be used.",
-              "default": "prefecthq/prefect:2-latest",
+              "default": "prefecthq/prefect:3-latest",
               "type": "string"
             },
             "args": {
@@ -1600,7 +1591,7 @@
             "image": {
               "title": "Image",
               "description": "The image reference of a container image to use for created jobs. If not set, the latest Prefect image will be used.",
-              "example": "docker.io/prefecthq/prefect:2-latest",
+              "example": "docker.io/prefecthq/prefect:3-latest",
               "type": "string"
             },
             "service_account_name": {
@@ -1688,4 +1679,4 @@
       "type": "kubernetes"
     }
   }
-}
+}