prefect-client 3.3.7__py3-none-any.whl → 3.3.8.dev1__py3-none-any.whl

prefect/_build_info.py

@@ -1,5 +1,5 @@
 # Generated by versioningit
-__version__ = "3.3.7"
-__build_date__ = "2025-04-28 15:03:08.716974+00:00"
-__git_commit__ = "8f86aaeee460bab1184336bf2f9cf62fef73d7bb"
+__version__ = "3.3.8.dev1"
+__build_date__ = "2025-04-29 08:08:59.733773+00:00"
+__git_commit__ = "f517be0bbfa10a7fdd2b715048061f33ed0fbac9"
 __dirty__ = False

prefect/_versioning.py

@@ -6,11 +6,16 @@ from typing import Any, Callable, Coroutine, Dict, Literal, Optional
 from urllib.parse import urlparse
 
 from anyio import run_process
-from pydantic import Field, model_validator
+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="")
@@ -21,27 +26,56 @@ class SimpleVersionInfo(VersionInfo):
 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
 
-    @model_validator(mode="after")
-    def validate_branch(self):
-        if not self.branch:
-            raise ValueError("branch is required when type is 'vcs:github'")
-        return self
+
+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
-    url: str
     repository: str
+    url: str
 
 
 async def get_github_version_info(
-    version: Optional[str] = None,
+    commit_sha: Optional[str] = None,
+    message: Optional[str] = None,
     branch: Optional[str] = None,
     repository: Optional[str] = None,
     url: Optional[str] = None,
@@ -49,10 +83,11 @@ async def get_github_version_info(
     """Create a GithubVersionInfo object from provided values or environment variables.
 
     Args:
-        version: The commit SHA, falls back to GITHUB_SHA env var
+        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 if not provided
+        url: The repository URL, constructed from GITHUB_SERVER_URL/GITHUB_REPOSITORY/tree/GITHUB_SHA if not provided
 
     Returns:
         A GithubVersionInfo
@@ -60,25 +95,230 @@ async def get_github_version_info(
     Raises:
         ValueError: If any required fields cannot be determined
     """
-    version = version 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}"
-
-    if not version:
-        raise ValueError("version 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:
+    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(
-            "repository is required - must be provided or set in GITHUB_REPOSITORY"
+            f"Error getting git version info: {e}. You may not be in a Github repository."
         )
 
     return GithubVersionInfo(
         type="vcs:github",
-        version=version,
+        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,
@@ -86,17 +326,18 @@ async def get_github_version_info(
 
 
 async def get_git_version_info(
-    version: Optional[str] = None,
+    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 version:
+        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
-            version = result.stdout.decode().strip()
+            commit_sha = result.stdout.decode().strip()
 
         if not branch:
             result = await run_process(["git", "rev-parse", "--abbrev-ref", "HEAD"])
@@ -112,6 +353,9 @@ async def get_git_version_info(
             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"])
@@ -125,15 +369,23 @@ async def get_git_version_info(
         raise ValueError("Could not determine git repository URL")
 
     return GitVersionInfo(
-        type="vcs:git", version=version, branch=branch, url=url, repository=repository
+        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"
-    DOCKER = "container:docker"
 
 
 async def get_inferred_version_info(
@@ -155,12 +407,18 @@ async def get_inferred_version_info(
     # 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,
     ]
 

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_client-3.3.7.dist-info → prefect_client-3.3.8.dev1.dist-info}/METADATA

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

{prefect_client-3.3.7.dist-info → prefect_client-3.3.8.dev1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 prefect/.prefectignore,sha256=awSprvKT0vI8a64mEOLrMxhxqcO-b0ERQeYpA2rNKVQ,390
 prefect/__init__.py,sha256=iCdcC5ZmeewikCdnPEP6YBAjPNV5dvfxpYCTpw30Hkw,3685
 prefect/__main__.py,sha256=WFjw3kaYJY6pOTA7WDOgqjsz8zUEUZHCcj3P5wyVa-g,66
-prefect/_build_info.py,sha256=yFQx2GfGnZezTWU1rGjrvTOpehcZtB9Gm3FIGU3w33k,180
+prefect/_build_info.py,sha256=NBARPtakQcbgZhytfkEjryqyuM23Ah1-de8sfRoP7eA,185
 prefect/_result_records.py,sha256=S6QmsODkehGVSzbMm6ig022PYbI6gNKz671p_8kBYx4,7789
-prefect/_versioning.py,sha256=Bm2EwEODvMe_kLkeVXy32BaTA_4ijBZl9eFbdtXEV4w,5498
+prefect/_versioning.py,sha256=nRawjhBY2XpAzS5dHm4ajj8GlSNCr_YOjg2Zbez69j0,14069
 prefect/_waiters.py,sha256=Ia2ITaXdHzevtyWIgJoOg95lrEXQqNEOquHvw3T33UQ,9026
 prefect/agent.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/artifacts.py,sha256=dMBUOAWnUamzjb5HSqwB5-GR2Qb-Gxee26XG5NDCUuw,22720
@@ -14,7 +14,7 @@ prefect/engine.py,sha256=uB5JN4l045i5JTlRQNT1x7MwlSiGQ5Bop2Q6jHHOgxY,3699
 prefect/exceptions.py,sha256=wZLQQMRB_DyiYkeEdIC5OKwbba5A94Dlnics-lrWI7A,11581
 prefect/filesystems.py,sha256=v5YqGB4uXf9Ew2VuB9VCSkawvYMMVvEtZf7w1VmAmr8,18036
 prefect/flow_engine.py,sha256=hZpTYEtwTPMtwVoTCrfD93igN7rlKeG_0kyCvdU4aYE,58876
-prefect/flow_runs.py,sha256=dbHcXsOq1UsNM7vyJV9gboCTylmdUwQ_-W4NQt4R4ds,17267
+prefect/flow_runs.py,sha256=d3jfmrIPP3C19IJREvpkuN6fxksX3Lzo-LlHOB-_E2I,17419
 prefect/flows.py,sha256=UCBwsb99wtPTGPu2PneKCfAMlMBA2GhXJb5rzMBxw1s,118041
 prefect/futures.py,sha256=F4eplqRcqw5-aMNKu6-lOFOWdDNr0RGrPso4C4G02bU,24248
 prefect/main.py,sha256=8V-qLB4GjEVCkGRgGXeaIk-JIXY8Z9FozcNluj4Sm9E,2589
@@ -319,7 +319,7 @@ prefect/workers/cloud.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/workers/process.py,sha256=Yi5D0U5AQ51wHT86GdwtImXSefe0gJf3LGq4r4z9zwM,11090
 prefect/workers/server.py,sha256=2pmVeJZiVbEK02SO6BEZaBIvHMsn6G8LzjW8BXyiTtk,1952
 prefect/workers/utilities.py,sha256=VfPfAlGtTuDj0-Kb8WlMgAuOfgXCdrGAnKMapPSBrwc,2483
-prefect_client-3.3.7.dist-info/METADATA,sha256=YBJhkMhcGJYgPdGEvAUr6sKNdBQOcX6-tSiShqqj2H0,7466
-prefect_client-3.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-prefect_client-3.3.7.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
-prefect_client-3.3.7.dist-info/RECORD,,
+prefect_client-3.3.8.dev1.dist-info/METADATA,sha256=gFKUyJDQYtjrukaMaj8xfLVZusjBrro8KRhwVj35sVw,7471
+prefect_client-3.3.8.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+prefect_client-3.3.8.dev1.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
+prefect_client-3.3.8.dev1.dist-info/RECORD,,