PyPI - prefect - Versions diffs - 3.3.2.dev2__tar.gz → 3.3.3.dev1__tar.gz - Mend

Files changed (835) hide show

{prefect-3.3.2.dev2 → prefect-3.3.3.dev1}/src/prefect/client/orchestration/_deployments/client.py RENAMED Viewed

@@ -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/",

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.3.dev1"
+__build_date__ = "2025-04-04 08:08:57.586711+00:00"
+__git_commit__ = "cf8d1ca6f0eb2e922c48162b40454fd5b1cfb192"
+__dirty__ = False

@@ -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:

@@ -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,

@@ -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:

@@ -1,8 +1,9 @@
 from datetime import datetime
 from typing import TYPE_CHECKING, List, Optional
+from uuid import UUID
 import sqlalchemy as sa
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends, HTTPException, Path, status
 from pydantic import Field, model_serializer
 import prefect.server.schemas as schemas
@@ -173,3 +174,22 @@ async def read_task_run_counts_by_state(
             task_run_filter=task_runs,
             deployment_filter=deployments,
         )
+@router.get("/{id}")
+async def read_task_run_with_flow_run_name(
+    task_run_id: UUID = Path(..., description="The task run id", alias="id"),
+    db: PrefectDBInterface = Depends(provide_database_interface),
+) -> schemas.ui.UITaskRun:
+    """
+    Get a task run by id.
+    """
+    async with db.session_context() as session:
+        task_run = await models.task_runs.read_task_run_with_flow_run_name(
+            session=session, task_run_id=task_run_id
+        )
+    if not task_run:
+        raise HTTPException(status.HTTP_404_NOT_FOUND, detail="Task not found")
+    return schemas.ui.UITaskRun.model_validate(task_run)

@@ -152,14 +152,21 @@ async def _register_registry_blocks(session: AsyncSession) -> None:
     for block_class in block_registry.values():
         # each block schema gets its own transaction
         async with session.begin():
-            block_type_id = await register_block_type(
-                session=session,
-                block_type=block_class._to_block_type(),
-            )
-            await register_block_schema(
-                session=session,
-                block_schema=block_class._to_block_schema(block_type_id=block_type_id),
-            )
+            try:
+                block_type_id = await register_block_type(
+                    session=session,
+                    block_type=block_class._to_block_type(),
+                )
+                await register_block_schema(
+                    session=session,
+                    block_schema=block_class._to_block_schema(
+                        block_type_id=block_type_id
+                    ),
+                )
+            except Exception:
+                logger.exception(
+                    f"Failed to register block schema for block class {block_class}"
+                )
 async def _register_collection_blocks(session: AsyncSession) -> None:

@@ -195,6 +195,39 @@ async def read_task_run(
     return model
+@db_injector
+async def read_task_run_with_flow_run_name(
+    db: PrefectDBInterface, session: AsyncSession, task_run_id: UUID
+) -> Union[orm_models.TaskRun, None]:
+    """
+    Read a task run by id.
+    Args:
+        session: a database session
+        task_run_id: the task run id
+    Returns:
+        orm_models.TaskRun: the task run with the flow run name
+    """
+    result = await session.execute(
+        select(orm_models.TaskRun, orm_models.FlowRun.name.label("flow_run_name"))
+        .outerjoin(
+            orm_models.FlowRun, orm_models.TaskRun.flow_run_id == orm_models.FlowRun.id
+        )
+        .where(orm_models.TaskRun.id == task_run_id)
+    )
+    row = result.first()
+    if not row:
+        return None
+    task_run = row[0]
+    flow_run_name = row[1]
+    if flow_run_name:
+        setattr(task_run, "flow_run_name", flow_run_name)
+    return task_run
 async def _apply_task_run_filters(
     db: PrefectDBInterface,
     query: Select[T],

@@ -8,6 +8,7 @@ from . import (
     responses,
     actions,
     internal,
+    ui,
 )  # noqa
 __all__ = [
@@ -20,4 +21,5 @@ __all__ = [
     "states",
     "statuses",
     "internal",
+    "ui",
 ]

@@ -0,0 +1,11 @@
+"""Schemas for UI endpoints."""
+from typing import Optional
+from prefect.server.schemas.core import TaskRun as CoreTaskRun
+class UITaskRun(CoreTaskRun):
+    """A task run with additional details for display in the UI."""
+    flow_run_name: Optional[str] = None

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

prefect 3.3.2.dev2__tar.gz → 3.3.3.dev1__tar.gz

prefect 3.3.2.dev2tar.gz → 3.3.3.dev1tar.gz