prefect 3.2.8.dev1__tar.gz → 3.2.8.dev3__tar.gz

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect
-Version: 3.2.8.dev1
+Version: 3.2.8.dev3
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -71,6 +71,7 @@ Requires-Dist: toml>=0.10.0
 Requires-Dist: typer!=0.12.2,<0.16.0,>=0.12.0
 Requires-Dist: typing-extensions<5.0.0,>=4.5.0
 Requires-Dist: ujson<6.0.0,>=5.8.0
+Requires-Dist: uv>=0.6.0
 Requires-Dist: uvicorn!=0.29.0,>=0.14.0
 Requires-Dist: websockets<14.0,>=10.4
 Provides-Extra: aws

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/pyproject.toml

@@ -80,12 +80,14 @@ dependencies = [
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
     "websockets>=10.4,<14.0",
+    "uv>=0.6.0",
 ]
 [project.urls]
 Changelog = "https://github.com/PrefectHQ/prefect/releases"
 Documentation = "https://docs.prefect.io"
 Source = "https://github.com/PrefectHQ/prefect"
 Tracker = "https://github.com/PrefectHQ/prefect/issues"
+
 [project.optional-dependencies]
 otel = [
     "opentelemetry-distro>=0.48b0,<1.0.0",

prefect-3.2.8.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.2.8.dev3"
+__build_date__ = "2025-02-26 08:08:47.549407+00:00"
+__git_commit__ = "6836cce13a1c7221e2b5e1093787112c1bbc4222"
+__dirty__ = False

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/src/prefect/_experimental/bundles.py

@@ -6,9 +6,12 @@ import gzip
 import multiprocessing
 import multiprocessing.context
 import os
+import subprocess
+import sys
 from typing import Any, TypedDict
 
 import cloudpickle
+import uv
 
 from prefect.client.schemas.objects import FlowRun
 from prefect.context import SettingsContext, get_settings_context, serialize_context
@@ -17,6 +20,7 @@ from prefect.flow_engine import run_flow
 from prefect.flows import Flow
 from prefect.settings.context import get_current_settings
 from prefect.settings.models.root import Settings
+from prefect.utilities.slugify import slugify
 
 
 class SerializedBundle(TypedDict):
@@ -28,6 +32,7 @@ class SerializedBundle(TypedDict):
     function: str
     context: str
     flow_run: dict[str, Any]
+    dependencies: str
 
 
 def _serialize_bundle_object(obj: Any) -> str:
@@ -66,6 +71,17 @@ def create_bundle_for_flow_run(
         "function": _serialize_bundle_object(flow),
         "context": _serialize_bundle_object(context),
         "flow_run": flow_run.model_dump(mode="json"),
+        "dependencies": subprocess.check_output(
+            [
+                uv.find_uv_bin(),
+                "pip",
+                "freeze",
+                # Exclude editable installs because we won't be able to install them in the execution environment
+                "--exclude-editable",
+            ]
+        )
+        .decode()
+        .strip(),
     }
 
 
@@ -129,6 +145,12 @@ def execute_bundle_in_subprocess(
 
     ctx = multiprocessing.get_context("spawn")
 
+    # Install dependencies if necessary
+    if dependencies := bundle.get("dependencies"):
+        subprocess.check_call(
+            [uv.find_uv_bin(), "pip", "install", *dependencies.split("\n")],
+        )
+
     process = ctx.Process(
         target=_extract_and_run_flow,
         kwargs={
@@ -141,3 +163,52 @@ def execute_bundle_in_subprocess(
     process.start()
 
     return process
+
+
+def convert_step_to_command(step: dict[str, Any], key: str) -> list[str]:
+    """
+    Converts a bundle upload or execution step to a command.
+
+    Args:
+        step: The step to convert.
+        key: The key to use for the remote file when downloading or uploading.
+
+    Returns:
+        A list of strings representing the command to run the step.
+    """
+    # Start with uv run
+    command = ["uv", "run"]
+
+    step_keys = list(step.keys())
+
+    if len(step_keys) != 1:
+        raise ValueError("Expected exactly one function in step")
+
+    function_fqn = step_keys[0]
+    function_args = step[function_fqn]
+
+    # Add the `--with` argument to handle dependencies for running the step
+    requires: list[str] | str = function_args.get("requires", [])
+    if isinstance(requires, str):
+        requires = [requires]
+    if requires:
+        command.extend(["--with", ",".join(requires)])
+
+    # Add the `--python` argument to handle the Python version for running the step
+    python_version = sys.version_info
+    command.extend(["--python", f"{python_version.major}.{python_version.minor}"])
+
+    # Add the `-m` argument to defined the function to run
+    command.extend(["-m", function_fqn])
+
+    # Add any arguments with values defined in the step
+    for arg_name, arg_value in function_args.items():
+        if arg_name == "requires":
+            continue
+
+        command.extend([f"--{slugify(arg_name)}", arg_value])
+
+    # Add the `--key` argument to specify the remote file name
+    command.extend(["--key", key])
+
+    return command

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/src/prefect/cli/deploy.py

@@ -746,7 +746,7 @@ async def _run_single_deploy(
 
     _schedules = deploy_config.pop("schedules")
 
-    deploy_config = apply_values(deploy_config, step_outputs)
+    deploy_config = apply_values(deploy_config, step_outputs, warn_on_notset=True)
     deploy_config["parameter_openapi_schema"] = _parameter_schema
     deploy_config["schedules"] = _schedules
 

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/src/prefect/utilities/templating.py

@@ -15,10 +15,13 @@ from typing import (
 )
 
 from prefect.client.utilities import inject_client
+from prefect.logging.loggers import get_logger
 from prefect.utilities.annotations import NotSet
 from prefect.utilities.collections import get_from_dict
 
 if TYPE_CHECKING:
+    import logging
+
     from prefect.client.orchestration import PrefectClient
 
 
@@ -30,6 +33,9 @@ VARIABLE_PLACEHOLDER_PREFIX = "prefect.variables."
 ENV_VAR_PLACEHOLDER_PREFIX = "$"
 
 
+logger: "logging.Logger" = get_logger("utilities.templating")
+
+
 class PlaceholderType(enum.Enum):
     STANDARD = "standard"
     BLOCK_DOCUMENT = "block_document"
@@ -92,24 +98,36 @@ def find_placeholders(template: T) -> set[Placeholder]:
 
 @overload
 def apply_values(
-    template: T, values: dict[str, Any], remove_notset: Literal[True] = True
+    template: T,
+    values: dict[str, Any],
+    remove_notset: Literal[True] = True,
+    warn_on_notset: bool = False,
 ) -> T: ...
 
 
 @overload
 def apply_values(
-    template: T, values: dict[str, Any], remove_notset: Literal[False] = False
+    template: T,
+    values: dict[str, Any],
+    remove_notset: Literal[False] = False,
+    warn_on_notset: bool = False,
 ) -> Union[T, type[NotSet]]: ...
 
 
 @overload
 def apply_values(
-    template: T, values: dict[str, Any], remove_notset: bool = False
+    template: T,
+    values: dict[str, Any],
+    remove_notset: bool = False,
+    warn_on_notset: bool = False,
 ) -> Union[T, type[NotSet]]: ...
 
 
 def apply_values(
-    template: T, values: dict[str, Any], remove_notset: bool = True
+    template: T,
+    values: dict[str, Any],
+    remove_notset: bool = True,
+    warn_on_notset: bool = False,
 ) -> Union[T, type[NotSet]]:
     """
     Replaces placeholders in a template with values from a supplied dictionary.
@@ -134,6 +152,7 @@ def apply_values(
         template: template to discover and replace values in
         values: The values to apply to placeholders in the template
         remove_notset: If True, remove keys with an unset value
+        warn_on_notset: If True, warn when a placeholder is not found in `values`
 
     Returns:
         The template with the values applied
@@ -153,7 +172,13 @@ def apply_values(
             # If there is only one variable with no surrounding text,
             # we can replace it. If there is no variable value, we
             # return NotSet to indicate that the value should not be included.
-            return get_from_dict(values, list(placeholders)[0].name, NotSet)
+            value = get_from_dict(values, list(placeholders)[0].name, NotSet)
+            if value is NotSet and warn_on_notset:
+                logger.warning(
+                    f"Value for placeholder {list(placeholders)[0].name!r} not found in provided values. Please ensure that "
+                    "the placeholder is spelled correctly and that the corresponding value is provided.",
+                )
+            return value
         else:
             for full_match, name, placeholder_type in placeholders:
                 if placeholder_type is PlaceholderType.STANDARD:
@@ -164,10 +189,14 @@ def apply_values(
                 else:
                     continue
 
-                if value is NotSet and not remove_notset:
-                    continue
-                elif value is NotSet:
-                    template = template.replace(full_match, "")
+                if value is NotSet:
+                    if warn_on_notset:
+                        logger.warning(
+                            f"Value for placeholder {full_match!r} not found in provided values. Please ensure that "
+                            "the placeholder is spelled correctly and that the corresponding value is provided.",
+                        )
+                    if remove_notset:
+                        template = template.replace(full_match, "")
                 else:
                     template = template.replace(full_match, str(value))
 
@@ -175,7 +204,12 @@ def apply_values(
     elif isinstance(template, dict):
         updated_template: dict[str, Any] = {}
         for key, value in template.items():
-            updated_value = apply_values(value, values, remove_notset=remove_notset)
+            updated_value = apply_values(
+                value,
+                values,
+                remove_notset=remove_notset,
+                warn_on_notset=warn_on_notset,
+            )
             if updated_value is not NotSet:
                 updated_template[key] = updated_value
             elif not remove_notset:
@@ -185,7 +219,12 @@ def apply_values(
     elif isinstance(template, list):
         updated_list: list[Any] = []
         for value in template:
-            updated_value = apply_values(value, values, remove_notset=remove_notset)
+            updated_value = apply_values(
+                value,
+                values,
+                remove_notset=remove_notset,
+                warn_on_notset=warn_on_notset,
+            )
             if updated_value is not NotSet:
                 updated_list.append(updated_value)
         return cast(T, updated_list)

{prefect-3.2.8.dev1 → prefect-3.2.8.dev3}/src/prefect/workers/base.py

@@ -566,8 +566,6 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         healthcheck_thread = None
         try:
             async with self as worker:
-                # wait for an initial heartbeat to configure the worker
-                await worker.sync_with_backend()
                 # schedule the scheduled flow run polling loop
                 async with anyio.create_task_group() as loops_task_group:
                     loops_task_group.start_soon(
@@ -655,6 +653,8 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
         await self._exit_stack.enter_async_context(self._client)
         await self._exit_stack.enter_async_context(self._runs_task_group)
 
+        await self.sync_with_backend()
+
         self.is_setup = True
 
     async def teardown(self, *exc_info: Any) -> None:

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

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.2.8.dev1"
-__build_date__ = "2025-02-22 08:07:30.280200+00:00"
-__git_commit__ = "fdc2b8a3c59ce6b5321269f9941039aa39d9190d"
-__dirty__ = False