prefect-client 3.8.3.dev1__tar.gz → 3.8.3.dev3__tar.gz

{prefect_client-3.8.3.dev1 → prefect_client-3.8.3.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: prefect-client
-Version: 3.8.3.dev1
+Version: 3.8.3.dev3
 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.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.8.3.dev3"
+__build_date__ = "2026-08-13 08:34:43.056386+00:00"
+__git_commit__ = "517a7c41b60072999a010b020c2e6dbf014c2f4a"
+__dirty__ = False

{prefect_client-3.8.3.dev1 → prefect_client-3.8.3.dev3}/src/prefect/_internal/concurrency/cancellation.py

@@ -424,11 +424,18 @@ class WatcherThreadCancelScope(CancelScope):
         return self
 
     def __exit__(self, *_: Any) -> Optional[bool]:
-        retval = super().__exit__(*_)
-        self._event.set()
-        if self._enforcer_thread:
-            logger.debug("%r joining enforcer thread %r", self, self._enforcer_thread)
-            self._enforcer_thread.join()
+        # The enforcer thread can inject a cancellation exception at any instruction in
+        # this frame, so the event must be set from a `finally` to guarantee the
+        # enforcer is always released.
+        try:
+            retval = super().__exit__(*_)
+        finally:
+            self._event.set()
+            if self._enforcer_thread:
+                logger.debug(
+                    "%r joining enforcer thread %r", self, self._enforcer_thread
+                )
+                self._enforcer_thread.join()
         return retval
 
     def _send_cancelled_error(self):
@@ -458,10 +465,6 @@ class WatcherThreadCancelScope(CancelScope):
                 with _get_thread_shield(self._supervised_thread):
                     self._send_cancelled_error()
 
-        # Wait for the supervised thread to exit its context
-        logger.debug("%r waiting for supervised thread to exit", self)
-        self._event.wait()
-
     def cancel(self, throw: bool = True):
         if not super().cancel():
             return False

{prefect_client-3.8.3.dev1 → prefect_client-3.8.3.dev3}/src/prefect/_internal/observers.py

@@ -24,8 +24,9 @@ from prefect.exceptions import ObjectNotFound
 from prefect.logging.loggers import get_logger
 from prefect.utilities.services import critical_service_loop
 
-# How long to wait before warning that a suspension state is still unavailable,
-# how often to look initially, and the retry cap after the warning.
+# How long to wait before warning that a suspension transition is still not
+# visible on the flow run, how often to look initially, and the retry cap after
+# the warning.
 SUSPENSION_CONFIRMATION_WARNING_AFTER = 30.0
 SUSPENSION_CONFIRMATION_INTERVAL = 0.5
 SUSPENSION_CONFIRMATION_MAX_INTERVAL = 10.0
@@ -113,28 +114,40 @@ class _SuspensionWatch:
 
         while not self._closed and not self.is_suspended:
             try:
-                state = await self._client.read_flow_run_state(state_id)
+                flow_run = await self._client.read_flow_run(self.flow_run_id)
             except ObjectNotFound:
-                pass
+                self._logger.debug(
+                    "Flow run %s no longer exists; abandoning suspension confirmation.",
+                    self.flow_run_id,
+                )
+                return
             except Exception as exc:
                 last_error = exc
             else:
-                if state.state_details.flow_run_id not in (None, self.flow_run_id):
-                    self._logger.warning(
-                        "Suspension event for flow run %s referred to state %s owned"
-                        " by flow run %s.",
-                        self.flow_run_id,
-                        state_id,
-                        state.state_details.flow_run_id,
-                    )
-                    return
-                self.notify_if_suspended(state)
-                return
+                state = flow_run.state
+                if state is not None:
+                    if state.id == state_id or is_suspended_flow_run_state(state):
+                        self.notify_if_suspended(state)
+                        return
+                    if state.timestamp >= occurred:
+                        # Superseded (e.g. resumed) before confirmation: still
+                        # stop, or this engine could double-execute alongside
+                        # the resumed run's fresh submission.
+                        self.notify_if_suspended(
+                            State(
+                                id=state_id,
+                                type=StateType.PAUSED,
+                                name="Suspended",
+                                timestamp=occurred,
+                            )
+                        )
+                        return
 
             if not warned and time.monotonic() >= warning_deadline:
                 self._logger.warning(
-                    "Received a suspension event for flow run %s, but state %s has"
-                    " not become readable within %s seconds; continuing to retry.",
+                    "Received a suspension event for flow run %s, but its state %s"
+                    " has not become visible within %s seconds; continuing to"
+                    " retry.",
                     self.flow_run_id,
                     state_id,
                     SUSPENSION_CONFIRMATION_WARNING_AFTER,

{prefect_client-3.8.3.dev1 → prefect_client-3.8.3.dev3}/src/prefect/events/clients.py

@@ -1,5 +1,6 @@
 import abc
 import asyncio
+import base64
 from datetime import timedelta
 from types import TracebackType
 from typing import (
@@ -252,6 +253,11 @@ class AssertingEventsClient(EventsClient):
         return self
 
 
+def _basic_auth_token(auth_string: str) -> str:
+    """Encode an auth string of the form 'user:password' for basic authentication"""
+    return base64.b64encode(auth_string.encode("utf-8")).decode("utf-8")
+
+
 def _get_api_url_and_key(
     api_url: Optional[str], api_key: Optional[str]
 ) -> Tuple[str, str]:
@@ -303,10 +309,15 @@ class PrefectEventsClient(EventsClient):
             auth_string.get_secret_value() if auth_string is not None else None
         )
         self._events_socket_url = events_in_socket_from_api_url(api_url)
-        self._connect = websocket_connect(
-            self._events_socket_url,
-            subprotocols=[Subprotocol("prefect")],
-        )
+        connect_kwargs: Dict[str, Any] = {"subprotocols": [Subprotocol("prefect")]}
+        if self._auth_token:
+            # Servers and proxies that require basic authentication reject the
+            # HTTP upgrade request before the "prefect" subprotocol auth
+            # handshake can run, so also send the credentials as a header.
+            connect_kwargs["additional_headers"] = {
+                "Authorization": f"Basic {_basic_auth_token(self._auth_token)}"
+            }
+        self._connect = websocket_connect(self._events_socket_url, **connect_kwargs)
         self._websocket = None
         self._reconnection_attempts = reconnection_attempts
         self._unconfirmed_events = []

prefect_client-3.8.3.dev3/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.3.dev1 → prefect_client-3.8.3.dev3}/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.3.dev1 → prefect_client-3.8.3.dev3}/src/prefect/runner/storage.py

@@ -217,6 +217,9 @@ class GitRepository:
                 "Cannot provide both a branch and a commit SHA. Please provide only one."
             )
 
+        if branch and branch.startswith("-"):
+            raise ValueError("Branch names cannot start with '-'.")
+
         if commit_sha and not re.match(r"^[0-9a-fA-F]{4,64}$", commit_sha):
             raise ValueError(
                 f"Invalid commit SHA: {commit_sha!r}."

{prefect_client-3.8.3.dev1 → prefect_client-3.8.3.dev3}/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.3.dev1/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.8.3.dev1"
-__build_date__ = "2026-08-11 08:24:15.796562+00:00"
-__git_commit__ = "7d377adfd43019a26cc901d7f50491489a86377f"
-__dirty__ = False