prefect-client 3.2.13__tar.gz → 3.2.15.dev7__tar.gz

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.2.13
+Version: 3.2.15.dev7
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -48,13 +48,14 @@ Requires-Dist: pydantic-settings>2.2.1
 Requires-Dist: python-dateutil<3.0.0,>=2.8.2
 Requires-Dist: python-slugify<9.0,>=5.0
 Requires-Dist: python-socks[asyncio]<3.0,>=2.5.3
+Requires-Dist: pytz<2026,>=2021.1
 Requires-Dist: pyyaml<7.0.0,>=5.4.1
 Requires-Dist: rfc3339-validator<0.2.0,>=0.1.4
 Requires-Dist: rich<14.0,>=11.0
 Requires-Dist: ruamel-yaml>=0.17.0
 Requires-Dist: sniffio<2.0.0,>=1.3.0
 Requires-Dist: toml>=0.10.0
-Requires-Dist: typing-extensions<5.0.0,>=4.5.0
+Requires-Dist: typing-extensions<5.0.0,>=4.10.0
 Requires-Dist: ujson<6.0.0,>=5.8.0
 Requires-Dist: uvicorn!=0.29.0,>=0.14.0
 Requires-Dist: websockets<16.0,>=13.0

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/pyproject.toml

@@ -52,13 +52,14 @@ dependencies = [
     "python-dateutil>=2.8.2,<3.0.0",
     "python-slugify>=5.0,<9.0",
     "python-socks[asyncio]>=2.5.3,<3.0",
+    "pytz>=2021.1,<2026",
     "pyyaml>=5.4.1,<7.0.0",
     "rfc3339-validator>=0.1.4,<0.2.0",
     "rich>=11.0,<14.0",
     "ruamel.yaml>=0.17.0",
     "sniffio>=1.3.0,<2.0.0",
     "toml>=0.10.0",
-    "typing_extensions>=4.5.0,<5.0.0",
+    "typing_extensions>=4.10.0,<5.0.0",
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
     "websockets>=13.0,<16.0",

prefect_client-3.2.15.dev7/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.2.15.dev7"
+__build_date__ = "2025-03-26 18:43:23.716248+00:00"
+__git_commit__ = "d56a01ceb58880a27246bb0c4a075e5b28bfafd4"
+__dirty__ = False

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/_experimental/bundles.py

@@ -173,13 +173,16 @@ def execute_bundle_in_subprocess(
     return process
 
 
-def convert_step_to_command(step: dict[str, Any], key: str) -> list[str]:
+def convert_step_to_command(
+    step: dict[str, Any], key: str, quiet: bool = False
+) -> 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.
+        quiet: Whether to suppress `uv` output from the command.
 
     Returns:
         A list of strings representing the command to run the step.
@@ -187,6 +190,9 @@ def convert_step_to_command(step: dict[str, Any], key: str) -> list[str]:
     # Start with uv run
     command = ["uv", "run"]
 
+    if quiet:
+        command.append("--quiet")
+
     step_keys = list(step.keys())
 
     if len(step_keys) != 1:

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/_internal/concurrency/services.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import abc
 import asyncio
 import concurrent.futures
@@ -375,6 +377,14 @@ class BatchedQueueService(QueueService[T]):
     _max_batch_size: int
     _min_interval: Optional[float] = None
 
+    @property
+    def min_interval(self) -> float | None:
+        return self.__class__._min_interval
+
+    @property
+    def max_batch_size(self) -> int:
+        return self.__class__._max_batch_size
+
     async def _main_loop(self):
         done = False
 
@@ -383,8 +393,8 @@ class BatchedQueueService(QueueService[T]):
             batch_size = 0
 
             # Pull items from the queue until we reach the batch size
-            deadline = get_deadline(self._min_interval)
-            while batch_size < self._max_batch_size:
+            deadline = get_deadline(self.min_interval)
+            while batch_size < self.max_batch_size:
                 try:
                     item = await self._queue_get_thread.submit(
                         create_call(self._queue.get, timeout=get_timeout(deadline))
@@ -401,7 +411,7 @@ class BatchedQueueService(QueueService[T]):
                         self,
                         item,
                         batch_size,
-                        self._max_batch_size,
+                        self.max_batch_size,
                     )
                 except queue.Empty:
                     # Process the batch after `min_interval` even if it is smaller than

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/client/orchestration/_flow_runs/client.py

@@ -46,6 +46,9 @@ class FlowRunClient(BaseClient):
         tags: "Iterable[str] | None" = None,
         parent_task_run_id: "UUID | None" = None,
         state: "State[R] | None" = None,
+        work_pool_name: str | None = None,
+        work_queue_name: str | None = None,
+        job_variables: dict[str, Any] | None = None,
     ) -> "FlowRun":
         """
         Create a flow run for a flow.
@@ -59,7 +62,10 @@ class FlowRunClient(BaseClient):
             parent_task_run_id: if a subflow run is being created, the placeholder task
                 run identifier in the parent flow
             state: The initial state for the run. If not provided, defaults to
-                `Scheduled` for now. Should always be a `Scheduled` type.
+                `Pending`.
+            work_pool_name: The name of the work pool to run the flow run in.
+            work_queue_name: The name of the work queue to place the flow run in.
+            job_variables: The job variables to use when setting up flow run infrastructure.
 
         Raises:
             httpx.RequestError: if the Prefect API does not successfully create a run for any reason
@@ -100,7 +106,16 @@ class FlowRunClient(BaseClient):
             ),
         )
 
-        flow_run_create_json = flow_run_create.model_dump(mode="json")
+        if work_pool_name is not None:
+            flow_run_create.work_pool_name = work_pool_name
+        if work_queue_name is not None:
+            flow_run_create.work_queue_name = work_queue_name
+        if job_variables is not None:
+            flow_run_create.job_variables = job_variables
+
+        flow_run_create_json = flow_run_create.model_dump(
+            mode="json", exclude_unset=True
+        )
         response = self.request("POST", "/flow_runs/", json=flow_run_create_json)
 
         flow_run = FlowRun.model_validate(response.json())
@@ -480,6 +495,9 @@ class FlowRunAsyncClient(BaseAsyncClient):
         tags: "Iterable[str] | None" = None,
         parent_task_run_id: "UUID | None" = None,
         state: "State[R] | None" = None,
+        work_pool_name: str | None = None,
+        work_queue_name: str | None = None,
+        job_variables: dict[str, Any] | None = None,
     ) -> "FlowRun":
         """
         Create a flow run for a flow.
@@ -493,7 +511,10 @@ class FlowRunAsyncClient(BaseAsyncClient):
             parent_task_run_id: if a subflow run is being created, the placeholder task
                 run identifier in the parent flow
             state: The initial state for the run. If not provided, defaults to
-                `Scheduled` for now. Should always be a `Scheduled` type.
+                `Pending`.
+            work_pool_name: The name of the work pool to run the flow run in.
+            work_queue_name: The name of the work queue to place the flow run in.
+            job_variables: The job variables to use when setting up flow run infrastructure.
 
         Raises:
             httpx.RequestError: if the Prefect API does not successfully create a run for any reason
@@ -534,7 +555,16 @@ class FlowRunAsyncClient(BaseAsyncClient):
             ),
         )
 
-        flow_run_create_json = flow_run_create.model_dump(mode="json")
+        if work_pool_name is not None:
+            flow_run_create.work_pool_name = work_pool_name
+        if work_queue_name is not None:
+            flow_run_create.work_queue_name = work_queue_name
+        if job_variables is not None:
+            flow_run_create.job_variables = job_variables
+
+        flow_run_create_json = flow_run_create.model_dump(
+            mode="json", exclude_unset=True
+        )
         response = await self.request("POST", "/flow_runs/", json=flow_run_create_json)
 
         flow_run = FlowRun.model_validate(response.json())

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/client/schemas/actions.py

@@ -23,6 +23,7 @@ from prefect._internal.schemas.validators import (
 from prefect.client.schemas.objects import (
     StateDetails,
     StateType,
+    WorkPoolStorageConfiguration,
 )
 from prefect.client.schemas.schedules import (
     SCHEDULE_TYPES,
@@ -38,6 +39,7 @@ from prefect.types import (
     DateTime,
     KeyValueLabelsField,
     Name,
+    NameOrEmpty,
     NonEmptyishName,
     NonNegativeFloat,
     NonNegativeInteger,
@@ -211,7 +213,7 @@ class DeploymentCreate(ActionBaseModel):
     ) -> Union[str, list[str]]:
         return convert_to_strings(values)
 
-    name: str = Field(..., description="The name of the deployment.")
+    name: NameOrEmpty = Field(..., description="The name of the deployment.")
     flow_id: UUID = Field(..., description="The ID of the flow to deploy.")
     paused: Optional[bool] = Field(default=None)
     schedules: list[DeploymentScheduleCreate] = Field(
@@ -443,6 +445,9 @@ class FlowRunCreate(ActionBaseModel):
     idempotency_key: Optional[str] = Field(default=None)
 
     labels: KeyValueLabelsField = Field(default_factory=dict)
+    work_pool_name: Optional[str] = Field(default=None)
+    work_queue_name: Optional[str] = Field(default=None)
+    job_variables: Optional[dict[str, Any]] = Field(default=None)
 
 
 class DeploymentFlowRunCreate(ActionBaseModel):
@@ -684,6 +689,10 @@ class WorkPoolCreate(ActionBaseModel):
     concurrency_limit: Optional[NonNegativeInteger] = Field(
         default=None, description="A concurrency limit for the work pool."
     )
+    storage_configuration: WorkPoolStorageConfiguration = Field(
+        default_factory=WorkPoolStorageConfiguration,
+        description="A storage configuration for the work pool.",
+    )
 
 
 class WorkPoolUpdate(ActionBaseModel):
@@ -693,6 +702,10 @@ class WorkPoolUpdate(ActionBaseModel):
     is_paused: Optional[bool] = Field(default=None)
     base_job_template: Optional[dict[str, Any]] = Field(default=None)
     concurrency_limit: Optional[int] = Field(default=None)
+    storage_configuration: Optional[WorkPoolStorageConfiguration] = Field(
+        default=None,
+        description="A storage configuration for the work pool.",
+    )
 
 
 class WorkQueueCreate(ActionBaseModel):

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/client/schemas/objects.py

@@ -1445,6 +1445,19 @@ class Agent(ObjectBaseModel):
     )
 
 
+class WorkPoolStorageConfiguration(PrefectBaseModel):
+    """A work pool storage configuration"""
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+    bundle_upload_step: Optional[dict[str, Any]] = Field(
+        default=None, description="The bundle upload step for the work pool."
+    )
+    bundle_execution_step: Optional[dict[str, Any]] = Field(
+        default=None, description="The bundle execution step for the work pool."
+    )
+
+
 class WorkPool(ObjectBaseModel):
     """An ORM representation of a work pool"""
 
@@ -1469,6 +1482,11 @@ class WorkPool(ObjectBaseModel):
         default=None, description="The current status of the work pool."
     )
 
+    storage_configuration: WorkPoolStorageConfiguration = Field(
+        default_factory=WorkPoolStorageConfiguration,
+        description="The storage configuration for the work pool.",
+    )
+
     # this required field has a default of None so that the custom validator
     # below will be called and produce a more helpful error message. Because
     # the field metadata is attached via an annotation, the default is hidden

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/deployments/runner.py

@@ -676,15 +676,7 @@ class RunnerDeployment(BaseModel):
                     try:
                         module = importlib.import_module(mod_name)
                         flow_file = getattr(module, "__file__", None)
-                    except ModuleNotFoundError as exc:
-                        # 16458 adds an identifier to the module name, so checking
-                        # for "__prefect_loader__" (2 underscores) will not match
-                        if "__prefect_loader_" in str(exc):
-                            raise ValueError(
-                                "Cannot create a RunnerDeployment from a flow that has been"
-                                " loaded from an entrypoint. To deploy a flow via"
-                                " entrypoint, use RunnerDeployment.from_entrypoint instead."
-                            )
+                    except ModuleNotFoundError:
                         raise ValueError(no_file_location_error)
                     if not flow_file:
                         raise ValueError(no_file_location_error)

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/docker/docker_image.py

@@ -64,7 +64,8 @@ class DockerImage:
     def build(self) -> None:
         full_image_name = self.reference
         build_kwargs = self.build_kwargs.copy()
-        build_kwargs["context"] = Path.cwd()
+        if "context" not in build_kwargs:
+            build_kwargs["context"] = Path.cwd()
         build_kwargs["tag"] = full_image_name
         build_kwargs["pull"] = build_kwargs.get("pull", True)
 

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/flow_engine.py

@@ -707,7 +707,11 @@ class FlowRunEngine(BaseFlowRunEngine[P, R]):
                 except Exception:
                     # regular exceptions are caught and re-raised to the user
                     raise
-                except (Abort, Pause):
+                except (Abort, Pause) as exc:
+                    if getattr(exc, "state", None):
+                        # we set attribute explicitly because
+                        # internals will have already called the state change API
+                        self.flow_run.state = exc.state
                     raise
                 except GeneratorExit:
                     # Do not capture generator exits as crashes
@@ -722,9 +726,7 @@ class FlowRunEngine(BaseFlowRunEngine[P, R]):
                         repr(self.state) if PREFECT_DEBUG_MODE else str(self.state)
                     )
                     self.logger.log(
-                        level=logging.INFO
-                        if self.state.is_completed()
-                        else logging.ERROR,
+                        level=logging.INFO,
                         msg=f"Finished in state {display_state}",
                     )
 
@@ -1277,7 +1279,11 @@ class AsyncFlowRunEngine(BaseFlowRunEngine[P, R]):
                 except Exception:
                     # regular exceptions are caught and re-raised to the user
                     raise
-                except (Abort, Pause):
+                except (Abort, Pause) as exc:
+                    if getattr(exc, "state", None):
+                        # we set attribute explicitly because
+                        # internals will have already called the state change API
+                        self.flow_run.state = exc.state
                     raise
                 except GeneratorExit:
                     # Do not capture generator exits as crashes

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/flow_runs.py

@@ -454,7 +454,7 @@ async def suspend_flow_run(
 
     if suspending_current_flow_run:
         # Exit this process so the run can be resubmitted later
-        raise Pause()
+        raise Pause(state=state)
 
 
 @sync_compatible

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/flows.py

@@ -196,7 +196,7 @@ class Flow(Generic[P, R]):
     #       exactly in the @flow decorator
     def __init__(
         self,
-        fn: Callable[P, R],
+        fn: Callable[P, R] | "classmethod[Any, P, R]" | "staticmethod[P, R]",
         name: Optional[str] = None,
         version: Optional[str] = None,
         flow_run_name: Optional[Union[Callable[[], str], str]] = None,
@@ -270,6 +270,13 @@ class Flow(Generic[P, R]):
                             " my_flow():\n\tpass"
                         )
 
+        if isinstance(fn, classmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+
+        if isinstance(fn, staticmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+            setattr(fn, "__prefect_static__", True)
+
         if not callable(fn):
             raise TypeError("'fn' must be callable")
 
@@ -396,16 +403,28 @@ class Flow(Generic[P, R]):
     def ismethod(self) -> bool:
         return hasattr(self.fn, "__prefect_self__")
 
+    @property
+    def isclassmethod(self) -> bool:
+        return hasattr(self.fn, "__prefect_cls__")
+
+    @property
+    def isstaticmethod(self) -> bool:
+        return getattr(self.fn, "__prefect_static__", False)
+
     def __get__(self, instance: Any, owner: Any) -> "Flow[P, R]":
         """
-        Implement the descriptor protocol so that the flow can be used as an instance method.
+        Implement the descriptor protocol so that the flow can be used as an instance or class method.
         When an instance method is loaded, this method is called with the "self" instance as
         an argument. We return a copy of the flow with that instance bound to the flow's function.
         """
+        if self.isstaticmethod:
+            return self
 
-        # if no instance is provided, it's being accessed on the class
+        # wrapped function is a classmethod
         if instance is None:
-            return self
+            bound_flow = copy(self)
+            setattr(bound_flow.fn, "__prefect_cls__", owner)
+            return bound_flow
 
         # if the flow is being accessed on an instance, bind the instance to the __prefect_self__ attribute
         # of the flow's function. This will allow it to be automatically added to the flow's parameters
@@ -636,6 +655,10 @@ class Flow(Generic[P, R]):
             # do not serialize the bound self object
             if self.ismethod and value is getattr(self.fn, "__prefect_self__", None):
                 continue
+            if self.isclassmethod and value is getattr(
+                self.fn, "__prefect_cls__", None
+            ):
+                continue
             if isinstance(value, (PrefectFuture, State)):
                 # Don't call jsonable_encoder() on a PrefectFuture or State to
                 # avoid triggering a __getitem__ call
@@ -1895,11 +1918,6 @@ class FlowDecorator:
             >>>     pass
         """
         if __fn:
-            if isinstance(__fn, (classmethod, staticmethod)):
-                method_decorator = type(__fn).__name__
-                raise TypeError(
-                    f"@{method_decorator} should be applied on top of @flow"
-                )
             return Flow(
                 fn=__fn,
                 name=name,

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/locking/memory.py

@@ -193,23 +193,31 @@ class MemoryLockManager(LockManager):
         )
 
     def wait_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
-        if lock := self._locks.get(key, {}).get("lock"):
+        lock_info: _LockInfo | None = self._locks.get(key)
+        if lock_info is None:
+            return True
+        if lock_info["lock"].locked():
             if timeout is not None:
-                lock_acquired = lock.acquire(timeout=timeout)
+                lock_acquired = lock_info["lock"].acquire(timeout=timeout)
             else:
-                lock_acquired = lock.acquire()
+                lock_acquired = lock_info["lock"].acquire()
             if lock_acquired:
-                lock.release()
+                lock_info["lock"].release()
             return lock_acquired
         return True
 
     async def await_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
-        if lock := self._locks.get(key, {}).get("lock"):
+        lock_info: _LockInfo | None = self._locks.get(key, None)
+        if lock_info is None:
+            return True
+        if lock_info["lock"].locked():
             if timeout is not None:
-                lock_acquired = await asyncio.to_thread(lock.acquire, timeout=timeout)
+                lock_acquired = await asyncio.to_thread(
+                    lock_info["lock"].acquire, timeout=timeout
+                )
             else:
-                lock_acquired = await asyncio.to_thread(lock.acquire)
+                lock_acquired = await asyncio.to_thread(lock_info["lock"].acquire)
             if lock_acquired:
-                lock.release()
+                lock_info["lock"].release()
             return lock_acquired
         return True

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/logging/__init__.py

@@ -1,3 +1,3 @@
 from .loggers import disable_run_logger, get_logger, get_run_logger, LogEavesdropper
 
-__all__ = ["get_logger", "get_run_logger", "LogEavesdropper"]
+__all__ = ["get_logger", "get_run_logger", "LogEavesdropper", "disable_run_logger"]

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/logging/configuration.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import logging.config
 import os
@@ -6,7 +8,7 @@ import string
 import warnings
 from functools import partial
 from pathlib import Path
-from typing import Any, Callable, Dict, Optional
+from typing import Any, Callable
 
 import yaml
 
@@ -21,7 +23,7 @@ from prefect.utilities.collections import dict_to_flatdict, flatdict_to_dict
 DEFAULT_LOGGING_SETTINGS_PATH = Path(__file__).parent / "logging.yml"
 
 # Stores the configuration used to setup logging in this Python process
-PROCESS_LOGGING_CONFIG: Optional[Dict[str, Any]] = None
+PROCESS_LOGGING_CONFIG: dict[str, Any] = {}
 
 # Regex call to replace non-alphanumeric characters to '_' to create a valid env var
 to_envvar: Callable[[str], str] = partial(re.sub, re.compile(r"[^0-9a-zA-Z]+"), "_")
@@ -60,7 +62,7 @@ def load_logging_config(path: Path) -> dict[str, Any]:
     return flatdict_to_dict(flat_config)
 
 
-def setup_logging(incremental: Optional[bool] = None) -> dict[str, Any]:
+def setup_logging(incremental: bool | None = None) -> dict[str, Any]:
     """
     Sets up logging.
 
@@ -100,6 +102,6 @@ def setup_logging(incremental: Optional[bool] = None) -> dict[str, Any]:
             for handler in extra_config.handlers:
                 logger.addHandler(handler)
 
-    PROCESS_LOGGING_CONFIG = config
+    PROCESS_LOGGING_CONFIG.update(config)
 
     return config

{prefect_client-3.2.13 → prefect_client-3.2.15.dev7}/src/prefect/logging/formatters.py

@@ -78,7 +78,7 @@ class PrefectFormatter(logging.Formatter):
         self,
         format: str | None = None,
         datefmt: str | None = None,
-        style: str = "%",
+        style: Literal["%", "{", "$"] = "%",
         validate: bool = True,
         *,
         defaults: dict[str, Any] | None = None,
@@ -93,8 +93,8 @@ class PrefectFormatter(logging.Formatter):
         # See https://github.com/python/cpython/blob/c8c6113398ee9a7867fe9b08bc539cceb61e2aaa/Lib/logging/__init__.py#L546
         # for implementation details
 
-        init_kwargs = {}
-        style_kwargs = {}
+        init_kwargs: dict[str, Any] = {}
+        style_kwargs: dict[str, Any] = {}
 
         # defaults added in 3.10
         if sys.version_info >= (3, 10):