prefect-client 3.8.2.dev6__tar.gz → 3.8.3.dev2__tar.gz

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: prefect-client
-Version: 3.8.2.dev6
+Version: 3.8.3.dev2
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.8.3.dev2"
+__build_date__ = "2026-08-12 08:33:16.979241+00:00"
+__git_commit__ = "20bc90f1ab99db9c1c236840f12576b2faea6a14"
+__dirty__ = False

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/_internal/concurrency/services.py

@@ -408,10 +408,21 @@ class FutureQueueService(
             # If the request to the increment endpoint fails in a non-standard
             # way, we need to set the future's result so it'll be re-raised in
             # the context of the caller.
-            future.set_exception(exc)
+            if future.set_running_or_notify_cancel():
+                future.set_exception(exc)
             raise exc
         else:
-            future.set_result(response)
+            # Transitioning the future to running before setting its result closes
+            # the window where the caller cancels it while `acquire` is in flight:
+            # after this point `cancel()` fails, and if the caller got there first
+            # the acquired resource is nobody's and must be discarded.
+            if future.set_running_or_notify_cancel():
+                future.set_result(response)
+            else:
+                await self._discard(response)
+
+    async def _discard(self, response: R) -> None:
+        """Dispose of a result whose caller is no longer waiting for it."""
 
     @abc.abstractmethod
     async def acquire(self, *args: Unpack[Ts]) -> R:

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/concurrency/_asyncio.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import concurrent.futures
 import logging
 from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING, AsyncGenerator, Literal, Optional
@@ -150,6 +151,9 @@ async def aacquire_concurrency_slots_with_lease(
     )
     try:
         response = await asyncio.wrap_future(future)
+    except asyncio.CancelledError:
+        _release_lease_when_granted(service, future)
+        raise
     except TimeoutError as timeout:
         raise AcquireConcurrencySlotTimeoutError(
             f"Attempt to acquire concurrency slots timed out after {timeout_seconds} second(s)"
@@ -225,6 +229,28 @@ def _discard_cleanup_lease(lease_id: UUID) -> None:
         ctx.cleanup_lease_ids.remove(lease_id)
 
 
+def _release_lease_when_granted(
+    service: ConcurrencySlotAcquisitionWithLeaseService,
+    future: "concurrent.futures.Future[httpx.Response]",
+) -> None:
+    """Release the lease for an acquisition whose caller has been cancelled.
+
+    The acquisition may still be granted after the caller is gone, and the lease
+    id never reaches the `ConcurrencyContext`, so the slots would stay occupied
+    until the lease expires. The cancelled caller cannot do the release itself, so
+    the service that acquired the slots is asked to release them.
+    """
+
+    def _release(completed: "concurrent.futures.Future[httpx.Response]") -> None:
+        if completed.cancelled() or completed.exception() is not None:
+            # Nothing was granted, so there is nothing to release.
+            return
+
+        service.release_orphaned_lease(completed.result())
+
+    future.add_done_callback(_release)
+
+
 def _response_to_minimal_concurrency_limit_response(
     response: httpx.Response,
 ) -> list[MinimalConcurrencyLimitResponse]:

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/concurrency/services.py

@@ -1,10 +1,11 @@
 import asyncio
+import concurrent.futures
 import json
 from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
 from threading import Lock
 from typing import TYPE_CHECKING, Literal, Optional
-from uuid import uuid4
+from uuid import UUID, uuid4
 
 import cachetools
 import httpx
@@ -104,12 +105,25 @@ class ConcurrencySlotAcquisitionWithLeaseService(
         super().__init__(concurrency_limit_names)
         self._client: PrefectClient
         self.concurrency_limit_names: list[str] = sorted(list(concurrency_limit_names))
+        self._pending_releases: set[concurrent.futures.Future[None]] = set()
 
     @asynccontextmanager
     async def _lifespan(self) -> AsyncGenerator[None, None]:
         async with get_client() as client:
             self._client = client
-            yield
+            try:
+                yield
+            finally:
+                # The client closes when this exits, so releases scheduled by
+                # cancelled callers have to finish first or their slots leak.
+                if self._pending_releases:
+                    await asyncio.gather(
+                        *(
+                            asyncio.wrap_future(release)
+                            for release in tuple(self._pending_releases)
+                        ),
+                        return_exceptions=True,
+                    )
 
     async def acquire(
         self,
@@ -185,6 +199,74 @@ class ConcurrencySlotAcquisitionWithLeaseService(
                     if max_retries is not None:
                         max_retries -= 1
 
+    async def _discard(self, response: httpx.Response) -> None:
+        """Release a lease granted to a caller that was cancelled while waiting.
+
+        Without this the slots stay occupied until the lease expires, because the
+        caller never learns the lease id and so cannot record it for cleanup.
+        """
+        lease_id = self._lease_id_from_response(response)
+        if lease_id is None:
+            return
+
+        try:
+            await self._client.release_concurrency_slots_with_lease(lease_id=lease_id)
+        except Exception:
+            logger.warning(
+                f"Failed to release concurrency lease {lease_id} for "
+                f"{self.concurrency_limit_names} after the acquiring caller was cancelled",
+                exc_info=True,
+            )
+
+    def release_orphaned_lease(
+        self, response: httpx.Response
+    ) -> "concurrent.futures.Future[None]":
+        """Release a lease that was delivered to a caller which is already gone.
+
+        The release is scheduled on the service's own loop so it reuses the client
+        that acquired the slots, keeping acquisition and cleanup on the same API, and
+        is tracked so that draining the service waits for it.
+        """
+        with self._lock:
+            loop = self._loop
+            if self._stopped or loop is None or loop.is_closed():
+                logger.warning(
+                    f"Unable to release concurrency lease for {self.concurrency_limit_names} "
+                    "after the acquiring caller was cancelled: the acquisition service is "
+                    "no longer running. The slots remain occupied until the lease expires."
+                )
+                stopped: concurrent.futures.Future[None] = concurrent.futures.Future()
+                stopped.set_result(None)
+                return stopped
+
+            # Registering under the lock `_stop` uses keeps the service from
+            # finishing its lifespan, and closing its client, before this release.
+            release = asyncio.run_coroutine_threadsafe(self._discard(response), loop)
+            self._pending_releases.add(release)
+
+        release.add_done_callback(self._pending_releases.discard)
+        return release
+
+    def _lease_id_from_response(self, response: httpx.Response) -> Optional[UUID]:
+        """Read the lease id out of a successful acquisition response.
+
+        Returns `None` when no slots were acquired, and logs when the response is
+        malformed, since that leaves a possibly active lease we cannot release.
+        """
+        try:
+            data = response.json()
+            if not data.get("limits"):
+                return None
+            return UUID(data["lease_id"])
+        except Exception:
+            logger.warning(
+                f"Unable to read the lease id from the acquisition response for "
+                f"{self.concurrency_limit_names}; if a lease was granted its slots "
+                "remain occupied until it expires.",
+                exc_info=True,
+            )
+            return None
+
 
 def _should_use_cache(
     names: list[str], holder: Optional["ConcurrencyLeaseHolder"]

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/flows.py

@@ -3134,6 +3134,7 @@ async def aserve(
 
         if __name__ == "__main__":
             asyncio.run(main())
+        ```
     """
 
     from prefect.runner import Runner

prefect_client-3.8.3.dev2/src/prefect/runner/_uv_command.py

@@ -0,0 +1,90 @@
+"""Auto-`uv run` launcher command construction shared by runner and worker paths."""
+
+from __future__ import annotations
+
+import shutil
+from pathlib import Path
+from typing import Iterable
+
+from packaging.requirements import InvalidRequirement, Requirement
+from packaging.utils import canonicalize_name
+
+from prefect._internal.compatibility.backports import tomllib
+from prefect.settings import get_current_settings
+from prefect.utilities.processutils import command_to_string
+
+
+def _dependencies_include_prefect(dependencies: object) -> bool:
+    if not isinstance(dependencies, Iterable) or isinstance(dependencies, (str, bytes)):
+        return False
+
+    for dependency in dependencies:
+        if not isinstance(dependency, str):
+            continue
+        try:
+            name = Requirement(dependency).name
+        except InvalidRequirement:
+            continue
+        if canonicalize_name(name) == "prefect":
+            return True
+    return False
+
+
+def _pyproject_declares_prefect_dependency(pyproject: Path) -> bool:
+    try:
+        data = tomllib.loads(pyproject.read_text(encoding="utf-8"))
+    except (OSError, tomllib.TOMLDecodeError):
+        return False
+
+    project = data.get("project")
+    if not isinstance(project, dict):
+        return False
+
+    return _dependencies_include_prefect(project.get("dependencies"))
+
+
+def uv_project_command(
+    project_root: Path | None,
+    engine_args: Iterable[str],
+    path: str | None = None,
+    auto_install_dependencies: bool | None = None,
+) -> str | None:
+    """Build an auto-`uv run` command for a project directory, if applicable.
+
+    Returns `None` unless dependency auto-installation is enabled, `project_root`
+    contains a `pyproject.toml` declaring `prefect` as a project dependency, and
+    `uv` is discoverable on `path` (or the current `PATH` when `path` is `None`).
+
+    `auto_install_dependencies` overrides the current setting value, for callers
+    that resolve the setting from a run-specific environment.
+    """
+    if auto_install_dependencies is None:
+        auto_install_dependencies = (
+            get_current_settings().runner.auto_install_dependencies
+        )
+    if not auto_install_dependencies:
+        return None
+
+    if project_root is None:
+        return None
+
+    pyproject = project_root / "pyproject.toml"
+    if not pyproject.is_file() or not _pyproject_declares_prefect_dependency(pyproject):
+        return None
+
+    uv_executable = (
+        shutil.which("uv", path=path) if path is not None else shutil.which("uv")
+    )
+    if uv_executable is None:
+        return None
+
+    return command_to_string(
+        [
+            uv_executable,
+            "run",
+            "--no-default-groups",
+            "--project",
+            str(project_root),
+            *engine_args,
+        ]
+    )

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/runner/_workspace_starter.py

@@ -2,26 +2,23 @@ from __future__ import annotations
 
 import functools
 import os
-import shutil
 import site
 import subprocess
 import sys
 import sysconfig
 from contextlib import contextmanager
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Iterable, Iterator
+from typing import TYPE_CHECKING, Any, Iterator
 from uuid import UUID
 
 import anyio
 import anyio.abc
-from packaging.requirements import InvalidRequirement, Requirement
-from packaging.utils import canonicalize_name
 
-from prefect._internal.compatibility.backports import tomllib
 from prefect.exceptions import MissingFlowError
 from prefect.flows import load_flow_from_entrypoint, load_function_and_convert_to_flow
 from prefect.runner._process_manager import ProcessHandle
 from prefect.runner._starter_engine import EngineCommandStarter
+from prefect.runner._uv_command import uv_project_command
 from prefect.runner._workspace_resolver import (
     PreparedWorkspace,
     PreparedWorkspaceResult,
@@ -29,7 +26,7 @@ from prefect.runner._workspace_resolver import (
 )
 from prefect.settings import get_current_settings
 from prefect.utilities.asyncutils import run_sync_in_worker_thread
-from prefect.utilities.processutils import command_to_string, sanitize_subprocess_env
+from prefect.utilities.processutils import sanitize_subprocess_env
 
 if TYPE_CHECKING:
     from prefect.client.schemas.objects import FlowRun
@@ -217,67 +214,11 @@ def _absolute_file_entrypoint(workspace: PreparedWorkspace) -> str:
     return f"{entrypoint_path.resolve()}:{object_name}"
 
 
-def _dependencies_include_prefect(dependencies: object) -> bool:
-    if not isinstance(dependencies, Iterable) or isinstance(dependencies, (str, bytes)):
-        return False
-
-    for dependency in dependencies:
-        if not isinstance(dependency, str):
-            continue
-        try:
-            name = Requirement(dependency).name
-        except InvalidRequirement:
-            continue
-        if canonicalize_name(name) == "prefect":
-            return True
-    return False
-
-
-def _pyproject_declares_prefect_dependency(pyproject: Path) -> bool:
-    try:
-        data = tomllib.loads(pyproject.read_text(encoding="utf-8"))
-    except (OSError, tomllib.TOMLDecodeError):
-        return False
-
-    project = data.get("project")
-    if not isinstance(project, dict):
-        return False
-
-    return _dependencies_include_prefect(project.get("dependencies"))
-
-
 def _uv_run_command(workspace: PreparedWorkspace) -> str | None:
-    if not get_current_settings().runner.auto_install_dependencies:
-        return None
-
-    project_root = workspace.project_root
-    if project_root is None:
-        return None
-
-    pyproject = project_root / "pyproject.toml"
-    if not pyproject.is_file() or not _pyproject_declares_prefect_dependency(pyproject):
-        return None
-
-    workspace_path = workspace.environment.get("PATH")
-    uv_executable = (
-        shutil.which("uv", path=workspace_path)
-        if workspace_path is not None
-        else shutil.which("uv")
-    )
-    if uv_executable is None:
-        return None
-
-    return command_to_string(
-        [
-            uv_executable,
-            "run",
-            "--no-default-groups",
-            "--project",
-            str(project_root),
-            "-m",
-            "prefect.flow_engine",
-            workspace.runtime_entrypoint,
-        ]
+    return uv_project_command(
+        workspace.project_root,
+        ["-m", "prefect.flow_engine", workspace.runtime_entrypoint],
+        path=workspace.environment.get("PATH"),
     )
 
 

{prefect_client-3.8.2.dev6 → prefect_client-3.8.3.dev2}/src/prefect/workers/process.py

@@ -25,10 +25,11 @@ from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
 import anyio
 import anyio.abc
-from pydantic import Field, field_validator
+from pydantic import Field, PrivateAttr, TypeAdapter, ValidationError, field_validator
 
 from prefect._internal.schemas.validators import validate_working_dir
 from prefect.client.schemas.objects import Flow as APIFlow
+from prefect.runner._uv_command import uv_project_command
 from prefect.runner.runner import Runner
 from prefect.states import Pending
 from prefect.utilities.processutils import command_to_string, get_sys_executable
@@ -53,6 +54,8 @@ class ProcessJobConfiguration(BaseJobConfiguration):
     stream_output: bool = Field(default=True)
     working_dir: Optional[Path] = Field(default=None)
 
+    _command_configured: bool = PrivateAttr(default=False)
+
     @field_validator("working_dir")
     @classmethod
     def validate_working_dir(cls, v: Path | str | None) -> Path | None:
@@ -69,6 +72,10 @@ class ProcessJobConfiguration(BaseJobConfiguration):
         worker_name: str | None = None,
         worker_id: "UUID | None" = None,
     ) -> None:
+        # The base implementation fills in `_base_flow_run_command()` when no command
+        # is configured, so provenance must be captured before delegating.
+        self._command_configured = self.command is not None
+
         super().prepare_for_flow_run(
             flow_run,
             deployment,
@@ -80,9 +87,9 @@ class ProcessJobConfiguration(BaseJobConfiguration):
 
         self.env: dict[str, str | None] = {**os.environ, **self.env}
         self.command: str | None = (
-            command_to_string([get_sys_executable(), "-m", "prefect.engine"])
-            if self.command == self._base_flow_run_command()
-            else self.command
+            self.command
+            if self._command_configured
+            else command_to_string([get_sys_executable(), "-m", "prefect.engine"])
         )
 
     @staticmethod
@@ -94,6 +101,38 @@ class ProcessJobConfiguration(BaseJobConfiguration):
         """
         return "python -m prefect.engine"
 
+    def _resolve_command(self, working_dir: Path | str) -> str | None:
+        """
+        Use an auto-`uv run` launcher for the flow run when the working directory
+        is a project that declares `prefect` as a dependency and the deployment
+        did not configure an explicit command.
+        """
+        if self._command_configured:
+            return self.command
+
+        env = self.env or {}
+        # A run-specific setting in the environment takes precedence over the
+        # worker process's own setting.
+        auto_install = env.get("PREFECT_RUNNER_AUTO_INSTALL_DEPENDENCIES")
+        try:
+            auto_install_dependencies = (
+                TypeAdapter(bool).validate_python(auto_install)
+                if auto_install is not None
+                else None
+            )
+        except ValidationError:
+            auto_install_dependencies = None
+
+        uv_command = uv_project_command(
+            # `uv` resolves `--project` relative to the flow run's working
+            # directory, so the project root must be absolute.
+            Path(working_dir).resolve(),
+            ["-m", "prefect.engine"],
+            path=env.get("PATH"),
+            auto_install_dependencies=auto_install_dependencies,
+        )
+        return uv_command or self.command
+
 
 class ProcessVariables(BaseVariables):
     stream_output: bool = Field(
@@ -151,7 +190,7 @@ class ProcessWorker(
             warnings.simplefilter("ignore", DeprecationWarning)
             process = await self._runner.execute_flow_run(
                 flow_run_id=flow_run.id,
-                command=configuration.command,
+                command=configuration._resolve_command(working_dir),
                 cwd=working_dir,
                 env=configuration.env,
                 stream_output=configuration.stream_output,

prefect_client-3.8.2.dev6/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.8.2.dev6"
-__build_date__ = "2026-08-07 08:27:53.656449+00:00"
-__git_commit__ = "eff3759c0edd62edb46e6edbe3a5e04854f5cf73"
-__dirty__ = False