prefect-client 3.3.6.dev2__tar.gz → 3.3.6.dev4__tar.gz

{prefect_client-3.3.6.dev2 → prefect_client-3.3.6.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.3.6.dev2
+Version: 3.3.6.dev4
 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.6.dev4/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.6.dev4"
+__build_date__ = "2025-04-24 08:08:45.298549+00:00"
+__git_commit__ = "cd2bf96d18276663c433a99c1e0f1191c100de5f"
+__dirty__ = False

prefect_client-3.3.6.dev2/src/prefect/_experimental/bundles.py → prefect_client-3.3.6.dev4/src/prefect/_experimental/bundles/__init__.py

@@ -11,7 +11,7 @@ import sys
 from pathlib import Path
 from typing import Any, TypedDict
 
-import cloudpickle
+import cloudpickle  # pyright: ignore[reportMissingTypeStubs]
 
 from prefect.client.schemas.objects import FlowRun
 from prefect.context import SettingsContext, get_settings_context, serialize_context
@@ -22,12 +22,18 @@ from prefect.settings.context import get_current_settings
 from prefect.settings.models.root import Settings
 from prefect.utilities.slugify import slugify
 
-try:
-    import uv
+from .execute import execute_bundle_from_file
 
-    uv_path = uv.find_uv_bin()
-except (ImportError, ModuleNotFoundError):
-    uv_path = "uv"
+
+def _get_uv_path() -> str:
+    try:
+        import uv
+
+        uv_path = uv.find_uv_bin()
+    except (ImportError, ModuleNotFoundError):
+        uv_path = "uv"
+
+    return uv_path
 
 
 class SerializedBundle(TypedDict):
@@ -46,7 +52,7 @@ def _serialize_bundle_object(obj: Any) -> str:
     """
     Serializes an object to a string.
     """
-    return base64.b64encode(gzip.compress(cloudpickle.dumps(obj))).decode()
+    return base64.b64encode(gzip.compress(cloudpickle.dumps(obj))).decode()  # pyright: ignore[reportUnknownMemberType]
 
 
 def _deserialize_bundle_object(serialized_obj: str) -> Any:
@@ -80,7 +86,7 @@ def create_bundle_for_flow_run(
         "flow_run": flow_run.model_dump(mode="json"),
         "dependencies": subprocess.check_output(
             [
-                uv_path,
+                _get_uv_path(),
                 "pip",
                 "freeze",
                 # Exclude editable installs because we won't be able to install them in the execution environment
@@ -164,7 +170,7 @@ def execute_bundle_in_subprocess(
     # Install dependencies if necessary
     if dependencies := bundle.get("dependencies"):
         subprocess.check_call(
-            [uv_path, "pip", "install", *dependencies.split("\n")],
+            [_get_uv_path(), "pip", "install", *dependencies.split("\n")],
             # Copy the current environment to ensure we install into the correct venv
             env=os.environ,
         )
@@ -238,3 +244,13 @@ def convert_step_to_command(
     command.extend(["--key", key])
 
     return command
+
+
+__all__ = [
+    "execute_bundle_from_file",
+    "convert_step_to_command",
+    "create_bundle_for_flow_run",
+    "extract_flow_from_bundle",
+    "execute_bundle_in_subprocess",
+    "SerializedBundle",
+]

prefect_client-3.3.6.dev4/src/prefect/_experimental/bundles/execute.py

@@ -0,0 +1,34 @@
+import json
+
+import typer
+
+from prefect.utilities.asyncutils import run_coro_as_sync
+
+
+def execute_bundle_from_file(key: str):
+    """
+    Loads a bundle from a file and executes it.
+
+    Args:
+        key: The key of the bundle to execute.
+    """
+    with open(key, "r") as f:
+        bundle = json.load(f)
+
+    from prefect.runner.runner import Runner
+
+    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)

prefect_client-3.3.6.dev4/src/prefect/_versioning.py

@@ -0,0 +1,175 @@
+from __future__ import annotations
+
+import os
+from enum import Enum
+from typing import Any, Callable, Coroutine, Dict, Literal, Optional
+
+from anyio import run_process
+from pydantic import Field, model_validator
+
+from prefect.client.schemas.objects import VersionInfo
+
+
+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
+    branch: str
+    url: str
+    repository: 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 GitVersionInfo(VersionInfo):
+    type: Literal["vcs:git"] = "vcs:git"
+    version: str
+    branch: str
+    url: str
+    repository: str
+
+
+async def get_github_version_info(
+    version: 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:
+        version: The commit SHA, falls back to GITHUB_SHA env var
+        branch: The git branch, falls back to GITHUB_REF 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
+
+    Returns:
+        A GithubVersionInfo
+
+    Raises:
+        ValueError: If any required fields cannot be determined
+    """
+    version = version or os.getenv("GITHUB_SHA")
+    branch = branch or os.getenv("GITHUB_REF")
+    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")
+    if not repository:
+        raise ValueError(
+            "repository is required - must be provided or set in GITHUB_REPOSITORY"
+        )
+
+    return GithubVersionInfo(
+        type="vcs:github",
+        version=version,
+        branch=branch,
+        repository=repository,
+        url=url,
+    )
+
+
+async def get_git_version_info(
+    version: Optional[str] = None,
+    branch: Optional[str] = None,
+    url: Optional[str] = None,
+    repository: Optional[str] = None,
+) -> GitVersionInfo:
+    try:
+        if not version:
+            # 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()
+
+        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_name = os.path.basename(remote_url.split(":")[1].rstrip(".git"))
+            repository = repo_name
+
+        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=version, branch=branch, url=url, repository=repository
+    )
+
+
+class VersionType(str, Enum):
+    SIMPLE = "prefect:simple"
+    GITHUB = "vcs:github"
+    GIT = "vcs:git"
+    DOCKER = "container:docker"
+
+
+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.GIT: get_git_version_info,
+    }
+
+    # Default order of getters to try
+    default_getters = [
+        get_github_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_client-3.3.6.dev2 → prefect_client-3.3.6.dev4}/src/prefect/client/orchestration/_deployments/client.py

@@ -153,13 +153,14 @@ class DeploymentClient(BaseClient):
             if getattr(deployment_create, field) is None:
                 exclude.add(field)
 
-        json = deployment_create.model_dump(mode="json", exclude=exclude)
+        payload = deployment_create.model_dump(mode="json", exclude=exclude)
+        if deployment_create.version_info:
+            payload["version_info"] = deployment_create.version_info.model_dump(
+                mode="json"
+            )
+
+        response = self.request("POST", "/deployments/", json=payload)
 
-        response = self.request(
-            "POST",
-            "/deployments/",
-            json=json,
-        )
         deployment_id = response.json().get("id")
         if not deployment_id:
             raise RequestError(f"Malformed response: {response}")
@@ -179,15 +180,28 @@ class DeploymentClient(BaseClient):
         deployment_id: UUID,
         deployment: "DeploymentUpdate",
     ) -> None:
+        exclude_if_none = [
+            "version_info",
+        ]
+
+        exclude = {"name", "flow_name", "triggers"}
+        for field in exclude_if_none:
+            if getattr(deployment, field) is None:
+                exclude.add(field)
+
+        payload = deployment.model_dump(
+            mode="json",
+            exclude_unset=True,
+            exclude=exclude,
+        )
+        if deployment.version_info:
+            payload["version_info"] = deployment.version_info.model_dump(mode="json")
+
         self.request(
             "PATCH",
             "/deployments/{id}",
             path_params={"id": deployment_id},
-            json=deployment.model_dump(
-                mode="json",
-                exclude_unset=True,
-                exclude={"name", "flow_name", "triggers"},
-            ),
+            json=payload,
         )
 
     def _create_deployment_from_schema(self, schema: "DeploymentCreate") -> UUID:
@@ -733,13 +747,13 @@ class DeploymentAsyncClient(BaseAsyncClient):
             if getattr(deployment_create, field) is None:
                 exclude.add(field)
 
-        json = deployment_create.model_dump(mode="json", exclude=exclude)
+        payload = deployment_create.model_dump(mode="json", exclude=exclude)
+        if deployment_create.version_info:
+            payload["version_info"] = deployment_create.version_info.model_dump(
+                mode="json"
+            )
 
-        response = await self.request(
-            "POST",
-            "/deployments/",
-            json=json,
-        )
+        response = await self.request("POST", "/deployments/", json=payload)
         deployment_id = response.json().get("id")
         if not deployment_id:
             raise RequestError(f"Malformed response: {response}")
@@ -761,15 +775,28 @@ class DeploymentAsyncClient(BaseAsyncClient):
         deployment_id: UUID,
         deployment: "DeploymentUpdate",
     ) -> None:
+        exclude_if_none = [
+            "version_info",
+        ]
+
+        exclude = {"name", "flow_name", "triggers"}
+        for field in exclude_if_none:
+            if getattr(deployment, field) is None:
+                exclude.add(field)
+
+        payload = deployment.model_dump(
+            mode="json",
+            exclude_unset=True,
+            exclude=exclude,
+        )
+        if deployment.version_info:
+            payload["version_info"] = deployment.version_info.model_dump(mode="json")
+
         await self.request(
             "PATCH",
             "/deployments/{id}",
             path_params={"id": deployment_id},
-            json=deployment.model_dump(
-                mode="json",
-                exclude_unset=True,
-                exclude={"name", "flow_name", "triggers"},
-            ),
+            json=payload,
         )
 
     async def _create_deployment_from_schema(self, schema: "DeploymentCreate") -> UUID:

{prefect_client-3.3.6.dev2 → prefect_client-3.3.6.dev4}/src/prefect/deployments/runner.py

@@ -29,6 +29,8 @@ Example:
 
 """
 
+from __future__ import annotations
+
 import importlib
 import tempfile
 from datetime import datetime, timedelta
@@ -63,6 +65,7 @@ from prefect.client.schemas.filters import WorkerFilter, WorkerFilterStatus
 from prefect.client.schemas.objects import (
     ConcurrencyLimitConfig,
     ConcurrencyOptions,
+    VersionInfo,
 )
 from prefect.client.schemas.schedules import (
     SCHEDULE_TYPES,
@@ -281,7 +284,10 @@ class RunnerDeployment(BaseModel):
         return reconcile_schedules_runner(values)
 
     async def _create(
-        self, work_pool_name: Optional[str] = None, image: Optional[str] = None
+        self,
+        work_pool_name: Optional[str] = None,
+        image: Optional[str] = None,
+        version_info: VersionInfo | None = None,
     ) -> UUID:
         work_pool_name = work_pool_name or self.work_pool_name
 
@@ -312,6 +318,7 @@ class RunnerDeployment(BaseModel):
                 work_queue_name=self.work_queue_name,
                 work_pool_name=work_pool_name,
                 version=self.version,
+                version_info=version_info,
                 paused=self.paused,
                 schedules=self.schedules,
                 concurrency_limit=self.concurrency_limit,
@@ -367,7 +374,12 @@ class RunnerDeployment(BaseModel):
 
             return deployment_id
 
-    async def _update(self, deployment_id: UUID, client: PrefectClient):
+    async def _update(
+        self,
+        deployment_id: UUID,
+        client: PrefectClient,
+        version_info: VersionInfo | None,
+    ):
         parameter_openapi_schema = self._parameter_openapi_schema.model_dump(
             exclude_unset=True
         )
@@ -388,6 +400,7 @@ class RunnerDeployment(BaseModel):
             deployment_id,
             deployment=DeploymentUpdate(
                 **update_payload,
+                version_info=version_info,
                 parameter_openapi_schema=parameter_openapi_schema,
             ),
         )
@@ -428,7 +441,10 @@ class RunnerDeployment(BaseModel):
 
     @sync_compatible
     async def apply(
-        self, work_pool_name: Optional[str] = None, image: Optional[str] = None
+        self,
+        work_pool_name: Optional[str] = None,
+        image: Optional[str] = None,
+        version_info: VersionInfo | None = None,
     ) -> UUID:
         """
         Registers this deployment with the API and returns the deployment's ID.
@@ -439,7 +455,7 @@ class RunnerDeployment(BaseModel):
             image: The registry, name, and tag of the Docker image to
                 use for this deployment. Only used when the deployment is
                 deployed to a work pool.
-
+            version_info: Version information for the deployment.
         Returns:
             The ID of the created deployment.
         """
@@ -448,13 +464,13 @@ class RunnerDeployment(BaseModel):
             try:
                 deployment = await client.read_deployment_by_name(self.full_name)
             except ObjectNotFound:
-                return await self._create(work_pool_name, image)
+                return await self._create(work_pool_name, image, version_info)
             else:
                 if image:
                     self.job_variables["image"] = image
                 if work_pool_name:
                     self.work_pool_name = work_pool_name
-                return await self._update(deployment.id, client)
+                return await self._update(deployment.id, client, version_info)
 
     async def _create_slas(self, deployment_id: UUID, client: PrefectClient):
         if not isinstance(self._sla, list):

{prefect_client-3.3.6.dev2 → prefect_client-3.3.6.dev4}/src/prefect/server/api/deployments.py

@@ -98,9 +98,31 @@ async def create_deployment(
             )
 
         # hydrate the input model into a full model
-        deployment_dict = deployment.model_dump(
-            exclude={"work_pool_name"}, exclude_unset=True
+        deployment_dict: dict = deployment.model_dump(
+            exclude={"work_pool_name"},
+            exclude_unset=True,
         )
+
+        requested_concurrency_limit = deployment_dict.pop(
+            "global_concurrency_limit_id", "unset"
+        )
+        if requested_concurrency_limit != "unset":
+            if requested_concurrency_limit:
+                concurrency_limit = (
+                    await models.concurrency_limits_v2.read_concurrency_limit(
+                        session=session,
+                        concurrency_limit_id=requested_concurrency_limit,
+                    )
+                )
+
+                if not concurrency_limit:
+                    raise HTTPException(
+                        status_code=status.HTTP_404_NOT_FOUND,
+                        detail="Concurrency limit not found",
+                    )
+
+            deployment_dict["concurrency_limit_id"] = requested_concurrency_limit
+
         if deployment.work_pool_name and deployment.work_queue_name:
             # If a specific pool name/queue name combination was provided, get the
             # ID for that work pool queue.
@@ -300,8 +322,24 @@ async def update_deployment(
                     detail="Invalid schema: Unable to validate schema with circular references.",
                 )
 
+        if deployment.global_concurrency_limit_id:
+            concurrency_limit = (
+                await models.concurrency_limits_v2.read_concurrency_limit(
+                    session=session,
+                    concurrency_limit_id=deployment.global_concurrency_limit_id,
+                )
+            )
+
+            if not concurrency_limit:
+                raise HTTPException(
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail="Concurrency limit not found",
+                )
+
         result = await models.deployments.update_deployment(
-            session=session, deployment_id=deployment_id, deployment=deployment
+            session=session,
+            deployment_id=deployment_id,
+            deployment=deployment,
         )
 
         for schedule in schedules_to_patch:

{prefect_client-3.3.6.dev2 → prefect_client-3.3.6.dev4}/src/prefect/workers/base.py

@@ -48,6 +48,7 @@ from prefect.client.schemas.objects import (
     WorkPool,
 )
 from prefect.client.utilities import inject_client
+from prefect.context import FlowRunContext, TagsContext
 from prefect.events import Event, RelatedResource, emit_event
 from prefect.events.related import object_as_related_resource, tags_as_related_resources
 from prefect.exceptions import (
@@ -75,6 +76,7 @@ from prefect.states import (
     Pending,
     exception_to_failed_state,
 )
+from prefect.tasks import Task
 from prefect.types import KeyValueLabels
 from prefect.utilities.dispatch import get_registry_for_type, register_base_type
 from prefect.utilities.engine import propose_state
@@ -720,6 +722,15 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         if self._runs_task_group is None:
             raise RuntimeError("Worker not properly initialized")
 
+        from prefect.results import get_result_store
+
+        current_result_store = get_result_store()
+        if current_result_store.result_storage is None and flow.result_storage is None:
+            self._logger.warning(
+                f"Flow {flow.name!r} has no result storage configured. Please configure "
+                "result storage for the flow if you want to retrieve the result for the flow run."
+            )
+
         flow_run = await self._runs_task_group.start(
             partial(
                 self._submit_adhoc_run,
@@ -766,12 +777,28 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         )
 
         job_variables = (job_variables or {}) | {"command": " ".join(execute_command)}
+        parameters = parameters or {}
+        parent_task_run = None
+
+        if flow_run_ctx := FlowRunContext.get():
+            parent_task = Task[Any, Any](
+                name=flow.name,
+                fn=flow.fn,
+                version=flow.version,
+            )
+            parent_task_run = await parent_task.create_run(
+                flow_run_context=flow_run_ctx,
+                parameters=parameters,
+            )
+
         flow_run = await self.client.create_flow_run(
             flow,
-            parameters=parameters,
+            parameters=flow.serialize_parameters(parameters),
             state=Pending(),
             job_variables=job_variables,
             work_pool_name=self.work_pool.name,
+            tags=TagsContext.get().current_tags,
+            parent_task_run_id=getattr(parent_task_run, "id", None),
         )
         if task_status is not None:
             # Emit the flow run object to .submit to allow it to return a future as soon as possible

prefect_client-3.3.6.dev2/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.3.6.dev2"
-__build_date__ = "2025-04-22 08:08:25.558469+00:00"
-__git_commit__ = "562b964535b46f586b9b12808462956ed2f90c5a"
-__dirty__ = False