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

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

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

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