prefect 3.4.19.dev1__tar.gz → 3.4.19.dev2__tar.gz

{prefect-3.4.19.dev1 → prefect-3.4.19.dev2}/PKG-INFO

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

prefect-3.4.19.dev2/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.19.dev2"
+__build_date__ = "2025-09-16 08:09:40.090462+00:00"
+__git_commit__ = "2aecdfa19a21b04b25191f92b388c71037ddd08a"
+__dirty__ = False

{prefect-3.4.19.dev1 → prefect-3.4.19.dev2}/src/prefect/cli/deploy/_config.py

@@ -7,12 +7,15 @@ from pathlib import Path
 from typing import Any, Optional
 
 import yaml
+from pydantic import ValidationError
 from yaml.error import YAMLError
 
 import prefect.cli.root as root
 from prefect.cli.root import app
 from prefect.utilities.annotations import NotSet
 
+from ._models import PrefectYamlModel
+
 
 def _merge_with_default_deploy_config(deploy_config: dict[str, Any]) -> dict[str, Any]:
     deploy_config = deepcopy(deploy_config)
@@ -46,28 +49,55 @@ def _merge_with_default_deploy_config(deploy_config: dict[str, Any]) -> dict[str
 def _load_deploy_configs_and_actions(
     prefect_file: Path,
 ) -> tuple[list[dict[str, Any]], dict[str, Any]]:
+    """
+    Load and validate a prefect.yaml using Pydantic models.
+
+    Returns a tuple of (deployment_configs, actions_dict) where deployments are
+    dictionaries compatible with existing CLI code and actions contains
+    top-level build/push/pull lists from the file.
+    """
+    raw: dict[str, Any] = {}
     try:
         with prefect_file.open("r") as f:
-            prefect_yaml_contents = yaml.safe_load(f)
+            loaded = yaml.safe_load(f)
     except (FileNotFoundError, IsADirectoryError, YAMLError) as exc:
         app.console.print(
             f"Unable to read the specified config file. Reason: {exc}. Skipping.",
             style="yellow",
         )
-        prefect_yaml_contents: dict[str, Any] = {}
-    if not isinstance(prefect_yaml_contents, dict):
+        loaded = {}
+
+    if isinstance(loaded, dict):
+        raw = loaded
+    else:
         app.console.print(
             "Unable to parse the specified config file. Skipping.",
             style="yellow",
         )
-        prefect_yaml_contents = {}
+
+    try:
+        model = PrefectYamlModel.model_validate(raw)
+    except ValidationError as exc:
+        # Match prior behavior: warn and continue with empty configuration
+        app.console.print(
+            (
+                "The specified config file contains invalid fields. "
+                "Validation error: " + str(exc.errors()[0].get("msg", exc))
+            ),
+            style="yellow",
+        )
+        model = PrefectYamlModel()
 
     actions: dict[str, Any] = {
-        "build": prefect_yaml_contents.get("build", []),
-        "push": prefect_yaml_contents.get("push", []),
-        "pull": prefect_yaml_contents.get("pull", []),
+        "build": model.build or [],
+        "push": model.push or [],
+        "pull": model.pull or [],
     }
-    deploy_configs = prefect_yaml_contents.get("deployments", [])
+    # Convert Pydantic models to plain dicts for downstream consumption,
+    # excluding keys that were not provided by users to preserve legacy semantics
+    deploy_configs: list[dict[str, Any]] = [
+        d.model_dump(exclude_unset=True, mode="json") for d in model.deployments
+    ]
     return deploy_configs, actions
 
 

{prefect-3.4.19.dev1 → prefect-3.4.19.dev2}/src/prefect/cli/deploy/_core.py

@@ -168,7 +168,11 @@ async def _run_single_deploy(
 
     update_work_pool_image = False
 
-    build_step_set_to_null = "build" in deploy_config and deploy_config["build"] is None
+    build_step_set_to_null = "build" in deploy_config and (
+        deploy_config["build"] is None
+        or deploy_config["build"] == {}
+        or deploy_config["build"] == []
+    )
 
     work_pool = await client.read_work_pool(deploy_config["work_pool"]["name"])
 

prefect-3.4.19.dev2/src/prefect/cli/deploy/_models.py

@@ -0,0 +1,136 @@
+from __future__ import annotations
+
+from typing import Any, Dict, List, Optional, Union
+
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
+
+from prefect._experimental.sla.objects import SlaTypes
+from prefect.client.schemas.actions import DeploymentScheduleCreate
+from prefect.client.schemas.schedules import SCHEDULE_TYPES
+from prefect.events import DeploymentTriggerTypes
+
+
+class WorkPoolConfig(BaseModel):
+    model_config = ConfigDict(extra="ignore")
+
+    name: Optional[str] = None
+    work_queue_name: Optional[str] = None
+    job_variables: Dict[str, Any] = Field(default_factory=dict)
+
+
+class DeploymentConfig(BaseModel):
+    model_config = ConfigDict(extra="ignore")
+
+    # base metadata
+    name: Optional[str] = None
+    version: Optional[str] = None
+    version_type: Optional[str] = None
+    tags: Optional[Union[str, list[Any]]] = (
+        None  # allow raw templated string or list; templating will normalize
+    )
+    description: Optional[str] = None
+
+    # schedule metadata
+    schedule: Optional["ScheduleItem"] = None
+    schedules: Optional[List["ScheduleItem"]] = None
+    paused: Optional[bool] = None
+    concurrency_limit: Optional[Union[int, "ConcurrencyLimitSpec"]] = None
+
+    # flow-specific
+    flow_name: Optional[str] = None
+    entrypoint: Optional[str] = None
+    parameters: Dict[str, Any] = Field(default_factory=dict)
+    enforce_parameter_schema: Optional[bool] = None
+
+    # per-deployment actions (optional overrides)
+    # Accept list, mapping (empty or step), or null for flexibility
+    build: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+    push: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+    pull: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+
+    # infra-specific
+    work_pool: Optional[WorkPoolConfig] = None
+
+    # automations metadata
+    triggers: Optional[List[DeploymentTriggerTypes]] = None
+    sla: Optional[List[SlaTypes]] = None
+
+
+class PrefectYamlModel(BaseModel):
+    model_config = ConfigDict(populate_by_name=True, extra="ignore")
+
+    # generic metadata (currently unused by CLI but allowed)
+    prefect_version: Optional[str] = Field(default=None, alias="prefect-version")
+    name: Optional[str] = None
+
+    # global actions
+    build: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+    push: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+    pull: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = None
+
+    # deployments
+    deployments: List[DeploymentConfig] = Field(default_factory=list)
+
+    @staticmethod
+    def _validate_action_steps(steps: Optional[List[Dict[str, Any]]]) -> None:
+        # Light validation: allow any mapping; prefer single-key style but do not enforce
+        if not steps:
+            return
+        for step in steps:
+            if not isinstance(step, dict):
+                raise TypeError("Each action step must be a mapping")
+            # empty or multi-key steps will be passed through unchanged
+
+    @field_validator("build", "push", "pull")
+    @classmethod
+    def _validate_actions(cls, v: Optional[List[Dict[str, Any]]]):
+        cls._validate_action_steps(v)
+        return v
+
+    @field_validator("deployments")
+    @classmethod
+    def _validate_deployments(cls, v: List[DeploymentConfig]):
+        # Ensure deployments is a list
+        return v or []
+
+
+class ConcurrencyLimitSpec(BaseModel):
+    model_config = ConfigDict(extra="ignore")
+
+    limit: Optional[int] = None
+    collision_strategy: Optional[str] = None
+
+
+class RawScheduleConfig(BaseModel):
+    """
+    Strongly-typed schedule config that mirrors the CLI's accepted YAML shape.
+    Exactly one of cron, interval, or rrule must be provided.
+    """
+
+    model_config = ConfigDict(extra="ignore")
+
+    # One-of schedule selectors
+    cron: Optional[str] = None
+    interval: Optional[int] = None
+    rrule: Optional[str] = None
+
+    # Common extras
+    timezone: Optional[str] = None
+    anchor_date: Optional[str] = None
+    active: Optional[bool] = None
+    parameters: Dict[str, Any] = Field(default_factory=dict)
+    slug: Optional[str] = None
+
+    @model_validator(mode="after")
+    def _one_of_schedule(self):
+        provided = [v is not None for v in (self.cron, self.interval, self.rrule)]
+        if sum(provided) != 1:
+            raise ValueError(
+                "Exactly one of 'cron', 'interval', or 'rrule' must be provided"
+            )
+        return self
+
+
+ScheduleItem = Union[
+    RawScheduleConfig, DeploymentScheduleCreate, SCHEDULE_TYPES, Dict[str, Any]
+]

{prefect-3.4.19.dev1 → prefect-3.4.19.dev2}/src/prefect/deployments/steps/pull.py

@@ -30,10 +30,10 @@ def set_working_directory(directory: str) -> dict[str, str]:
 
     Returns:
         dict: a dictionary containing a `directory` key of the
-            directory that was set
+            absolute path of the directory that was set
     """
     os.chdir(directory)
-    return dict(directory=directory)
+    return dict(directory=os.getcwd())
 
 
 @retry_async_fn(

prefect-3.4.19.dev1/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.19.dev1"
-__build_date__ = "2025-09-14 08:08:03.725471+00:00"
-__git_commit__ = "11be90003cae25f2f64fa2830fcae14bb27cc451"
-__dirty__ = False