prefect 3.3.7.dev1__tar.gz → 3.3.8.dev2__tar.gz

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/PKG-INFO

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

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/pyproject.toml

@@ -137,6 +137,7 @@ dev = [
     "jinja2>=3.1.6",
     "moto>=5",
     "numpy",
+    "pendulum[test]>=3.0.0,<4; python_version<'3.13'",
     "pillow>=11.1.0",
     "pre-commit>=4.1.0",
     "pluggy>=1.5.0",

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.8.dev2"
+__build_date__ = "2025-04-30 08:09:01.210921+00:00"
+__git_commit__ = "07107c3e1fd50fb76288b0107efaac6df4f57d2d"
+__dirty__ = False

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/src/prefect/_experimental/bundles/execute.py

@@ -1,6 +1,5 @@
 import json
-
-import typer
+import sys
 
 from prefect.utilities.asyncutils import run_coro_as_sync
 
@@ -20,15 +19,9 @@ def execute_bundle_from_file(key: str):
     run_coro_as_sync(Runner().execute_bundle(bundle))
 
 
-def _execute_bundle_from_file(key: str = typer.Option(...)):
-    """
-    Loads a bundle from a file and executes it.
-
-    Args:
-        key: The key of the bundle to execute.
-    """
-    execute_bundle_from_file(key)
-
-
 if __name__ == "__main__":
-    typer.run(_execute_bundle_from_file)
+    if len(sys.argv) < 3 and sys.argv[1] != "--key":
+        print("Please provide a key representing a path to a bundle")
+        sys.exit(1)
+    key = sys.argv[2]
+    execute_bundle_from_file(key)

prefect-3.3.8.dev2/src/prefect/_versioning.py

@@ -0,0 +1,438 @@
+from __future__ import annotations
+
+import os
+from enum import Enum
+from typing import Any, Callable, Coroutine, Dict, Literal, Optional
+from urllib.parse import urlparse
+
+from anyio import run_process
+from pydantic import Field
+
+from prefect.client.schemas.objects import VersionInfo
+
+
+async def get_commit_message_first_line() -> str:
+    result = await run_process(["git", "log", "-1", "--pretty=%B"])
+    return result.stdout.decode().strip().splitlines()[0]
+
+
+class SimpleVersionInfo(VersionInfo):
+    type: Literal["prefect:simple"] = "prefect:simple"
+    version: str = Field(default="")
+    branch: Optional[str] = Field(default=None)
+    url: Optional[str] = Field(default=None)
+
+
+class GithubVersionInfo(VersionInfo):
+    type: Literal["vcs:github"] = "vcs:github"
+    version: str
+    commit_sha: str
+    message: str
+    branch: str
+    repository: str
+    url: str
+
+
+class GitlabVersionInfo(VersionInfo):
+    type: Literal["vcs:gitlab"] = "vcs:gitlab"
+    version: str
+    commit_sha: str
+    message: str
+    branch: str
+    repository: str
+    url: str
+
+
+class BitbucketVersionInfo(VersionInfo):
+    type: Literal["vcs:bitbucket"] = "vcs:bitbucket"
+    version: str
+    commit_sha: str
+    message: str
+    branch: str
+    repository: str
+    url: str
+
+
+class AzureDevopsVersionInfo(VersionInfo):
+    type: Literal["vcs:azuredevops"] = "vcs:azuredevops"
+    version: str
+    commit_sha: str
+    message: str
+    branch: str
+    repository: str
+    url: str
+
+
+class GitVersionInfo(VersionInfo):
+    type: Literal["vcs:git"] = "vcs:git"
+    version: str
+    commit_sha: str
+    message: str
+    branch: str
+    repository: str
+    url: str
+
+
+async def get_github_version_info(
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
+    branch: Optional[str] = None,
+    repository: Optional[str] = None,
+    url: Optional[str] = None,
+) -> GithubVersionInfo:
+    """Create a GithubVersionInfo object from provided values or environment variables.
+
+    Args:
+        commit_sha: The commit SHA, falls back to GITHUB_SHA env var
+        message: The commit message, falls back to git log -1 --pretty=%B
+        branch: The git branch, falls back to GITHUB_REF_NAME env var
+        repository: The repository name, falls back to GITHUB_REPOSITORY env var
+        url: The repository URL, constructed from GITHUB_SERVER_URL/GITHUB_REPOSITORY/tree/GITHUB_SHA if not provided
+
+    Returns:
+        A GithubVersionInfo
+
+    Raises:
+        ValueError: If any required fields cannot be determined
+    """
+    try:
+        commit_sha = commit_sha or os.getenv("GITHUB_SHA")
+        branch = branch or os.getenv("GITHUB_REF_NAME")
+        repository = repository or os.getenv("GITHUB_REPOSITORY")
+        url = url or f"{os.getenv('GITHUB_SERVER_URL')}/{repository}/tree/{commit_sha}"
+
+        if not message:
+            message = await get_commit_message_first_line()
+
+        if not commit_sha:
+            raise ValueError(
+                "commit_sha is required - must be provided or set in GITHUB_SHA"
+            )
+        if not branch:
+            raise ValueError(
+                "branch is required - must be provided or set in GITHUB_REF_NAME"
+            )
+        if not repository:
+            raise ValueError(
+                "repository is required - must be provided or set in GITHUB_REPOSITORY"
+            )
+
+    except Exception as e:
+        raise ValueError(
+            f"Error getting git version info: {e}. You may not be in a Github repository."
+        )
+
+    return GithubVersionInfo(
+        type="vcs:github",
+        version=commit_sha[:8],
+        commit_sha=commit_sha,
+        message=message,
+        branch=branch,
+        repository=repository,
+        url=url,
+    )
+
+
+async def get_gitlab_version_info(
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
+    branch: Optional[str] = None,
+    repository: Optional[str] = None,
+    url: Optional[str] = None,
+) -> GitlabVersionInfo:
+    """Create a GitlabVersionInfo object from provided values or environment variables.
+
+    Args:
+        commit_sha: The commit SHA, falls back to CI_COMMIT_SHA env var
+        message: The commit message, falls back to git log -1 --pretty=%B
+        branch: The git branch, falls back to CI_COMMIT_REF_NAME env var
+        repository: The repository name, falls back to CI_PROJECT_NAME env var
+        url: The repository URL, constructed from CI_PROJECT_URL/-/tree/CI_COMMIT_SHA if not provided
+
+    Returns:
+        A GitlabVersionInfo
+
+    Raises:
+        ValueError: If any required fields cannot be determined
+    """
+    try:
+        commit_sha = commit_sha or os.getenv("CI_COMMIT_SHA")
+        branch = branch or os.getenv("CI_COMMIT_REF_NAME")
+        repository = repository or os.getenv("CI_PROJECT_NAME")
+        url = url or f"{os.getenv('CI_PROJECT_URL')}/-/tree/{commit_sha}"
+
+        if not message:
+            message = await get_commit_message_first_line()
+
+        if not commit_sha:
+            raise ValueError(
+                "commit_sha is required - must be provided or set in CI_COMMIT_SHA"
+            )
+        if not branch:
+            raise ValueError(
+                "branch is required - must be provided or set in CI_COMMIT_REF_NAME"
+            )
+        if not repository:
+            raise ValueError(
+                "repository is required - must be provided or set in CI_PROJECT_NAME"
+            )
+        if not url:
+            raise ValueError(
+                "url is required - must be provided or set in CI_PROJECT_URL"
+            )
+
+    except Exception as e:
+        raise ValueError(
+            f"Error getting git version info: {e}. You may not be in a Gitlab repository."
+        )
+
+    return GitlabVersionInfo(
+        type="vcs:gitlab",
+        version=commit_sha[:8],
+        commit_sha=commit_sha,
+        message=message,
+        branch=branch,
+        repository=repository,
+        url=url,
+    )
+
+
+async def get_bitbucket_version_info(
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
+    branch: Optional[str] = None,
+    repository: Optional[str] = None,
+    url: Optional[str] = None,
+) -> BitbucketVersionInfo:
+    """Create a BitbucketVersionInfo object from provided values or environment variables.
+
+    Args:
+        commit_sha: The commit SHA, falls back to BITBUCKET_COMMIT env var
+        message: The commit message, falls back to git log -1 --pretty=%B
+        branch: The git branch, falls back to BITBUCKET_BRANCH env var
+        repository: The repository name, falls back to BITBUCKET_REPO_SLUG env var
+        url: The repository URL, constructed from BITBUCKET_GIT_HTTP_ORIGIN/BITBUCKET_REPO_SLUG/src/BITBUCKET_COMMIT if not provided
+
+    Returns:
+        A BitbucketVersionInfo
+
+    Raises:
+        ValueError: If any required fields cannot be determined
+    """
+    try:
+        commit_sha = commit_sha or os.getenv("BITBUCKET_COMMIT")
+        branch = branch or os.getenv("BITBUCKET_BRANCH")
+        repository = repository or os.getenv("BITBUCKET_REPO_SLUG")
+        url = url or f"{os.getenv('BITBUCKET_GIT_HTTP_ORIGIN')}/src/{commit_sha}"
+
+        if not message:
+            message = await get_commit_message_first_line()
+
+        if not commit_sha:
+            raise ValueError(
+                "commit_sha is required - must be provided or set in BITBUCKET_COMMIT"
+            )
+        if not branch:
+            raise ValueError(
+                "branch is required - must be provided or set in BITBUCKET_BRANCH"
+            )
+        if not repository:
+            raise ValueError(
+                "repository is required - must be provided or set in BITBUCKET_REPO_SLUG"
+            )
+        if not url:
+            raise ValueError(
+                "url is required - must be provided or set in BITBUCKET_GIT_HTTP_ORIGIN"
+            )
+
+    except Exception as e:
+        raise ValueError(
+            f"Error getting git version info: {e}. You may not be in a Bitbucket repository."
+        )
+
+    return BitbucketVersionInfo(
+        type="vcs:bitbucket",
+        version=commit_sha[:8],
+        commit_sha=commit_sha,
+        message=message,
+        branch=branch,
+        repository=repository,
+        url=url,
+    )
+
+
+async def get_azuredevops_version_info(
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
+    branch: Optional[str] = None,
+    repository: Optional[str] = None,
+    url: Optional[str] = None,
+) -> AzureDevopsVersionInfo:
+    """Create an AzureDevopsVersionInfo object from provided values or environment variables.
+
+    Args:
+        commit_sha: The commit SHA, falls back to BUILD_SOURCEVERSION env var
+        message: The commit message, falls back to git log -1 --pretty=%B
+        branch: The git branch, falls back to BUILD_SOURCEBRANCHNAME env var
+        repository: The repository name, falls back to BUILD_REPOSITORY_NAME env var
+        url: The repository URL, constructed from BUILD_REPOSITORY_URI?version=GCBUILD_SOURCEVERSION if not provided
+
+    Returns:
+        An AzureDevopsVersionInfo
+
+    Raises:
+        ValueError: If any required fields cannot be determined
+    """
+    try:
+        commit_sha = commit_sha or os.getenv("BUILD_SOURCEVERSION")
+        branch = branch or os.getenv("BUILD_SOURCEBRANCHNAME")
+        repository = repository or os.getenv("BUILD_REPOSITORY_NAME")
+        url = url or f"{os.getenv('BUILD_REPOSITORY_URI')}?version=GC{commit_sha}"
+
+        if not message:
+            message = await get_commit_message_first_line()
+
+        if not commit_sha:
+            raise ValueError(
+                "commit_sha is required - must be provided or set in BUILD_SOURCEVERSION"
+            )
+        if not branch:
+            raise ValueError(
+                "branch is required - must be provided or set in BUILD_SOURCEBRANCHNAME"
+            )
+        if not repository:
+            raise ValueError(
+                "repository is required - must be provided or set in BUILD_REPOSITORY_NAME"
+            )
+        if not url:
+            raise ValueError(
+                "url is required - must be provided or set in BUILD_REPOSITORY_URI"
+            )
+
+    except Exception as e:
+        raise ValueError(
+            f"Error getting git version info: {e}. You may not be in an Azure DevOps repository."
+        )
+
+    return AzureDevopsVersionInfo(
+        type="vcs:azuredevops",
+        version=commit_sha[:8],
+        commit_sha=commit_sha,
+        message=message,
+        branch=branch,
+        repository=repository,
+        url=url,
+    )
+
+
+async def get_git_version_info(
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
+    branch: Optional[str] = None,
+    url: Optional[str] = None,
+    repository: Optional[str] = None,
+) -> GitVersionInfo:
+    try:
+        if not commit_sha:
+            # Run git command and get stdout
+            result = await run_process(["git", "rev-parse", "HEAD"])
+            # Decode bytes to string and strip whitespace
+            commit_sha = result.stdout.decode().strip()
+
+        if not branch:
+            result = await run_process(["git", "rev-parse", "--abbrev-ref", "HEAD"])
+            branch = result.stdout.decode().strip()
+
+        if not repository:
+            result = await run_process(["git", "config", "--get", "remote.origin.url"])
+            remote_url = result.stdout.decode().strip()
+
+            # Extract just the repository name (last part of the path)
+            repo_url = urlparse(remote_url)
+            repository = repo_url.path.strip("/")
+            if repository.endswith(".git"):
+                repository = repository[:-4]
+
+        if not message:
+            message = await get_commit_message_first_line()
+
+        if not url and repository:
+            # Use the full remote URL as the URL
+            result = await run_process(["git", "config", "--get", "remote.origin.url"])
+            url = result.stdout.decode().strip()
+    except Exception as e:
+        raise ValueError(
+            f"Error getting git version info: {e}. You may not be in a git repository."
+        )
+
+    if not url:
+        raise ValueError("Could not determine git repository URL")
+
+    return GitVersionInfo(
+        type="vcs:git",
+        version=commit_sha[:8],
+        branch=branch,
+        url=url,
+        repository=repository,
+        commit_sha=commit_sha,
+        message=message,
+    )
+
+
+class VersionType(str, Enum):
+    SIMPLE = "prefect:simple"
+    GITHUB = "vcs:github"
+    GITLAB = "vcs:gitlab"
+    BITBUCKET = "vcs:bitbucket"
+    AZUREDEVOPS = "vcs:azuredevops"
+    GIT = "vcs:git"
+
+
+async def get_inferred_version_info(
+    version_type: Optional[str] = None,
+) -> VersionInfo | None:
+    """
+    Attempts to infer version information from the environment.
+
+    Args:
+        version_type: Optional type of version info to get. If provided, only that
+                     type will be attempted.
+
+    Returns:
+        VersionInfo: The inferred version information
+
+    Raises:
+        ValueError: If unable to infer version info from any source
+    """
+    # Map version types to their getter functions
+    type_to_getter: Dict[str, Callable[..., Coroutine[Any, Any, Any]]] = {
+        VersionType.GITHUB: get_github_version_info,
+        VersionType.GITLAB: get_gitlab_version_info,
+        VersionType.BITBUCKET: get_bitbucket_version_info,
+        VersionType.AZUREDEVOPS: get_azuredevops_version_info,
+        VersionType.GIT: get_git_version_info,
+    }
+
+    # Default order of getters to try
+    default_getters = [
+        get_github_version_info,
+        get_gitlab_version_info,
+        get_bitbucket_version_info,
+        get_azuredevops_version_info,
+        get_git_version_info,
+    ]
+
+    if version_type:
+        if version_type not in type_to_getter:
+            raise ValueError(f"Unknown version type: {version_type}")
+        getters = [type_to_getter[version_type]]
+    else:
+        getters = default_getters
+
+    for getter in getters:
+        try:
+            return await getter()
+        except ValueError:
+            continue
+
+    return None

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/src/prefect/cli/deploy.py

@@ -865,12 +865,16 @@ async def _run_single_deploy(
 async def _version_info_from_options(
     options: dict[str, Any], deploy_config: dict[str, Any]
 ) -> VersionInfo | None:
-    if version := options.get("version"):
-        return VersionInfo(type="prefect:simple", version=version)
-
     version_type = options.get("version_type") or deploy_config.get("version_type")
     if version_info := await get_inferred_version_info(version_type):
-        return version_info
+        if version := options.get("version") or deploy_config.get("version"):
+            version_info.version = (
+                version  # use the supplied version as the version name
+            )
+        return version_info  # otherwise the version name is the first line of the commit message
+
+    if version := options.get("version") or deploy_config.get("version"):
+        return VersionInfo(type="prefect:simple", version=version)
 
     return None
 

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/src/prefect/client/schemas/actions.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
 from uuid import UUID, uuid4
 
 import jsonschema
-from pydantic import Field, field_validator, model_validator
+from pydantic import BaseModel, Field, field_validator, model_validator
 
 import prefect.client.schemas.objects as objects
 from prefect._internal.schemas.bases import ActionBaseModel
@@ -46,7 +46,7 @@ from prefect.types import (
     PositiveInteger,
     StrictVariableValue,
 )
-from prefect.utilities.collections import listrepr
+from prefect.utilities.collections import listrepr, visit_collection
 from prefect.utilities.pydantic import get_class_fields_only
 
 if TYPE_CHECKING:
@@ -518,6 +518,20 @@ class DeploymentFlowRunCreate(ActionBaseModel):
     job_variables: Optional[dict[str, Any]] = Field(default=None)
     labels: KeyValueLabelsField = Field(default_factory=dict)
 
+    @model_validator(mode="before")
+    def convert_parameters_to_plain_data(cls, values: dict[str, Any]) -> dict[str, Any]:
+        if "parameters" in values:
+
+            def convert_value(value: Any) -> Any:
+                if isinstance(value, BaseModel):
+                    return value.model_dump(mode="json")
+                return value
+
+            values["parameters"] = visit_collection(
+                values["parameters"], convert_value, return_data=True
+            )
+        return values
+
 
 class SavedSearchCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a saved search."""

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/src/prefect/flow_runs.py

@@ -141,7 +141,10 @@ async def wait_for_flow_run(
                 return flow_run
 
             async for event in subscriber:
-                state_type = StateType(event.resource["prefect.state-type"])
+                if not (state_type := event.resource.get("prefect.state-type")):
+                    logger.debug(f"Received {event.event!r} event")
+                    continue
+                state_type = StateType(state_type)
                 state = State(type=state_type)
 
                 if log_states:

{prefect-3.3.7.dev1 → prefect-3.3.8.dev2}/src/prefect/types/_datetime.py

@@ -5,7 +5,7 @@ import sys
 from contextlib import contextmanager
 from typing import Any, cast
 from unittest import mock
-from zoneinfo import ZoneInfo, available_timezones
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError, available_timezones
 
 import humanize
 from dateutil.parser import parse
@@ -76,27 +76,38 @@ def human_friendly_diff(
     if dt is None:
         return ""
 
-    # Handle naive datetimes consistently across Python versions
-    if dt.tzinfo is None:
-        local_tz = datetime.datetime.now().astimezone().tzinfo
-        dt = dt.replace(tzinfo=local_tz).astimezone(ZoneInfo("UTC"))
-    elif hasattr(dt.tzinfo, "name"):
-        dt = dt.replace(tzinfo=ZoneInfo(getattr(dt.tzinfo, "name")))
+    def _normalize(ts: datetime.datetime) -> datetime.datetime:
+        """Return *ts* with a valid ZoneInfo; fall back to UTC if needed."""
+        if ts.tzinfo is None:
+            local_tz = datetime.datetime.now().astimezone().tzinfo
+            return ts.replace(tzinfo=local_tz).astimezone(ZoneInfo("UTC"))
+
+        if isinstance(ts.tzinfo, ZoneInfo):
+            return ts  # already valid
+
+        if tz_name := getattr(ts.tzinfo, "name", None):
+            try:
+                return ts.replace(tzinfo=ZoneInfo(tz_name))
+            except ZoneInfoNotFoundError:
+                pass
+
+        return ts.astimezone(ZoneInfo("UTC"))
+
+    dt = _normalize(dt)
 
-    # Handle other parameter if provided
     if other is not None:
-        if other.tzinfo is None:
-            local_tz = datetime.datetime.now().astimezone().tzinfo
-            other = other.replace(tzinfo=local_tz).astimezone(ZoneInfo("UTC"))
-        elif hasattr(other.tzinfo, "name"):
-            other = other.replace(tzinfo=ZoneInfo(getattr(other.tzinfo, "name")))
+        other = _normalize(other)
 
     if sys.version_info >= (3, 13):
+        # humanize expects ZoneInfo or None
         return humanize.naturaltime(dt, when=other)
 
-    return DateTime.instance(dt).diff_for_humans(
-        other=DateTime.instance(other) if other else None
+    # Ensure consistency for pendulum path by using UTC
+    pendulum_dt = DateTime.instance(dt.astimezone(ZoneInfo("UTC")))
+    pendulum_other = (
+        DateTime.instance(other.astimezone(ZoneInfo("UTC"))) if other else None
     )
+    return pendulum_dt.diff_for_humans(other=pendulum_other)
 
 
 def now(

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

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.3.7.dev1"
-__build_date__ = "2025-04-26 08:07:53.022993+00:00"
-__git_commit__ = "cd10dc7dbb1bf043aeec4d2b21cd3e68742f474a"
-__dirty__ = False