prefect 3.2.8.dev4__tar.gz → 3.2.10.dev1__tar.gz

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect
-Version: 3.2.8.dev4
+Version: 3.2.10.dev1
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -73,7 +73,7 @@ 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
+Requires-Dist: websockets<16.0,>=13.0
 Provides-Extra: aws
 Requires-Dist: prefect-aws>=0.5.0; extra == 'aws'
 Provides-Extra: azure

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/pyproject.toml

@@ -79,7 +79,7 @@ dependencies = [
     "typing_extensions>=4.5.0,<5.0.0",
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
-    "websockets>=10.4,<14.0",
+    "websockets>=13.0,<16.0",
     "uv>=0.6.0",
 ]
 [project.urls]

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

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.2.10.dev1"
+__build_date__ = "2025-03-01 08:07:53.714618+00:00"
+__git_commit__ = "af502b4497663b65418e2891ea3baf384c338c73"
+__dirty__ = False

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

@@ -11,7 +11,6 @@ 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
@@ -22,6 +21,13 @@ from prefect.settings.context import get_current_settings
 from prefect.settings.models.root import Settings
 from prefect.utilities.slugify import slugify
 
+try:
+    import uv
+
+    uv_path = uv.find_uv_bin()
+except (ImportError, ModuleNotFoundError):
+    uv_path = "uv"
+
 
 class SerializedBundle(TypedDict):
     """
@@ -73,7 +79,7 @@ def create_bundle_for_flow_run(
         "flow_run": flow_run.model_dump(mode="json"),
         "dependencies": subprocess.check_output(
             [
-                uv.find_uv_bin(),
+                uv_path,
                 "pip",
                 "freeze",
                 # Exclude editable installs because we won't be able to install them in the execution environment
@@ -148,7 +154,7 @@ def execute_bundle_in_subprocess(
     # Install dependencies if necessary
     if dependencies := bundle.get("dependencies"):
         subprocess.check_call(
-            [uv.find_uv_bin(), "pip", "install", *dependencies.split("\n")],
+            [uv_path, "pip", "install", *dependencies.split("\n")],
             # Copy the current environment to ensure we install into the correct venv
             env=os.environ,
         )

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/cli/cloud/__init__.py

@@ -8,6 +8,7 @@ import os
 import traceback
 import uuid
 import urllib.parse
+import warnings
 import webbrowser
 from contextlib import asynccontextmanager
 from typing import (
@@ -131,7 +132,18 @@ async def serve_login_api(
     try:
         # Yield the server object
         task_status.started(server)
-        await server.serve()
+        with warnings.catch_warnings():
+            # Uvicorn uses the deprecated pieces of websockets, filter out
+            # the warnings until uvicorn has its dependencies updated
+            warnings.filterwarnings(
+                "ignore", category=DeprecationWarning, module="websockets"
+            )
+            warnings.filterwarnings(
+                "ignore",
+                category=DeprecationWarning,
+                module="uvicorn.protocols.websockets",
+            )
+            await server.serve()
     except anyio.get_cancelled_exc_class():
         pass  # Already cancelled, do not cancel again
     except SystemExit as exc:

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/cli/deployment.py

@@ -894,7 +894,6 @@ async def run(
         soft_wrap=True,
     )
     if watch:
-        watch_interval = 5 if watch_interval is None else watch_interval
         app.console.print(f"Watching flow run {flow_run.name!r}...")
         finished_flow_run = await wait_for_flow_run(
             flow_run.id,

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/cli/profile.py

@@ -22,7 +22,6 @@ from prefect.cli.root import app, is_interactive
 from prefect.client.base import determine_server_type
 from prefect.client.orchestration import ServerType, get_client
 from prefect.context import use_profile
-from prefect.exceptions import ObjectNotFound
 from prefect.settings import ProfilesCollection
 from prefect.utilities.collections import AutoEnum
 
@@ -293,13 +292,16 @@ def show_profile_changes(
 @profile_app.command()
 def populate_defaults():
     """Populate the profiles configuration with default base profiles, preserving existing user profiles."""
-    user_path = prefect.settings.PREFECT_PROFILES_PATH.value()
-    default_profiles = prefect.settings.profiles._read_profiles_from(
-        prefect.settings.DEFAULT_PROFILES_PATH
+    from prefect.settings.profiles import (
+        _read_profiles_from,  # type: ignore[reportPrivateUsage]
+        _write_profiles_to,  # type: ignore[reportPrivateUsage]
     )
 
+    user_path = prefect.settings.PREFECT_PROFILES_PATH.value()
+    default_profiles = _read_profiles_from(prefect.settings.DEFAULT_PROFILES_PATH)
+
     if user_path.exists():
-        user_profiles = prefect.settings.profiles._read_profiles_from(user_path)
+        user_profiles = _read_profiles_from(user_path)
 
         if not show_profile_changes(user_profiles, default_profiles):
             return
@@ -324,7 +326,7 @@ def populate_defaults():
         if name not in user_profiles:
             user_profiles.add_profile(profile)
 
-    prefect.settings.profiles._write_profiles_to(user_path, user_profiles)
+    _write_profiles_to(user_path, user_profiles)
     app.console.print(f"\nProfiles updated in [green]{user_path}[/green]")
     app.console.print(
         "\nUse with [green]prefect profile use[/green] [blue][PROFILE-NAME][/blue]"
@@ -348,27 +350,32 @@ class ConnectionStatus(AutoEnum):
 async def check_server_connection() -> ConnectionStatus:
     httpx_settings = dict(timeout=3)
     try:
-        # attempt to infer Cloud 2.0 API from the connection URL
-        cloud_client = get_cloud_client(
-            httpx_settings=httpx_settings, infer_cloud_url=True
-        )
-        async with cloud_client:
-            await cloud_client.api_healthcheck()
-        return ConnectionStatus.CLOUD_CONNECTED
-    except CloudUnauthorizedError:
-        # if the Cloud 2.0 API exists and fails to authenticate, notify the user
-        return ConnectionStatus.CLOUD_UNAUTHORIZED
-    except ObjectNotFound:
-        # if the route does not exist, attempt to connect as a hosted Prefect
-        # instance
+        # First determine the server type based on the URL
+        server_type = determine_server_type()
+
+        # Only try to connect to Cloud if the URL looks like a Cloud URL
+        if server_type == ServerType.CLOUD:
+            try:
+                cloud_client = get_cloud_client(
+                    httpx_settings=httpx_settings, infer_cloud_url=True
+                )
+                async with cloud_client:
+                    await cloud_client.api_healthcheck()
+                return ConnectionStatus.CLOUD_CONNECTED
+            except CloudUnauthorizedError:
+                # if the Cloud API exists and fails to authenticate, notify the user
+                return ConnectionStatus.CLOUD_UNAUTHORIZED
+            except (httpx.HTTPStatusError, Exception):
+                return ConnectionStatus.CLOUD_ERROR
+
+        # For non-Cloud URLs, try to connect as a hosted Prefect instance
+        if server_type == ServerType.EPHEMERAL:
+            return ConnectionStatus.EPHEMERAL
+        elif server_type == ServerType.UNCONFIGURED:
+            return ConnectionStatus.UNCONFIGURED
+
+        # Try to connect to the server
         try:
-            # inform the user if Prefect API endpoints exist, but there are
-            # connection issues
-            server_type = determine_server_type()
-            if server_type == ServerType.EPHEMERAL:
-                return ConnectionStatus.EPHEMERAL
-            elif server_type == ServerType.UNCONFIGURED:
-                return ConnectionStatus.UNCONFIGURED
             client = get_client(httpx_settings=httpx_settings)
             async with client:
                 connect_error = await client.api_healthcheck()
@@ -378,8 +385,6 @@ async def check_server_connection() -> ConnectionStatus:
                 return ConnectionStatus.SERVER_CONNECTED
         except Exception:
             return ConnectionStatus.SERVER_ERROR
-    except httpx.HTTPStatusError:
-        return ConnectionStatus.CLOUD_ERROR
     except TypeError:
         # if no Prefect API URL has been set, httpx will throw a TypeError
         try:

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/client/subscriptions.py

@@ -5,6 +5,7 @@ from typing import Any, Generic, Optional, TypeVar
 
 import orjson
 import websockets
+import websockets.asyncio.client
 import websockets.exceptions
 from starlette.status import WS_1008_POLICY_VIOLATION
 from typing_extensions import Self
@@ -45,7 +46,7 @@ class Subscription(Generic[S]):
         return self
 
     @property
-    def websocket(self) -> websockets.WebSocketClientProtocol:
+    def websocket(self) -> websockets.asyncio.client.ClientConnection:
         if not self._websocket:
             raise RuntimeError("Subscription is not connected")
         return self._websocket

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/events/clients.py

@@ -27,12 +27,12 @@ from prometheus_client import Counter
 from python_socks.async_.asyncio import Proxy
 from typing_extensions import Self
 from websockets import Subprotocol
+from websockets.asyncio.client import ClientConnection, connect
 from websockets.exceptions import (
     ConnectionClosed,
     ConnectionClosedError,
     ConnectionClosedOK,
 )
-from websockets.legacy.client import Connect, WebSocketClientProtocol
 
 from prefect.events import Event
 from prefect.logging import get_logger
@@ -91,7 +91,7 @@ def events_out_socket_from_api_url(url: str) -> str:
     return http_to_ws(url) + "/events/out"
 
 
-class WebsocketProxyConnect(Connect):
+class WebsocketProxyConnect(connect):
     def __init__(self: Self, uri: str, **kwargs: Any):
         # super() is intentionally deferred to the _proxy_connect method
         # to allow for the socket to be established first
@@ -130,7 +130,7 @@ class WebsocketProxyConnect(Connect):
             ctx.verify_mode = ssl.CERT_NONE
             self._kwargs.setdefault("ssl", ctx)
 
-    async def _proxy_connect(self: Self) -> WebSocketClientProtocol:
+    async def _proxy_connect(self: Self) -> ClientConnection:
         if self._proxy:
             sock = await self._proxy.connect(
                 dest_host=self._host,
@@ -142,7 +142,7 @@ class WebsocketProxyConnect(Connect):
         proto = await self.__await_impl__()
         return proto
 
-    def __await__(self: Self) -> Generator[Any, None, WebSocketClientProtocol]:
+    def __await__(self: Self) -> Generator[Any, None, ClientConnection]:
         return self._proxy_connect().__await__()
 
 
@@ -311,7 +311,7 @@ def _get_api_url_and_key(
 class PrefectEventsClient(EventsClient):
     """A Prefect Events client that streams events to a Prefect server"""
 
-    _websocket: Optional[WebSocketClientProtocol]
+    _websocket: Optional[ClientConnection]
     _unconfirmed_events: List[Event]
 
     def __init__(
@@ -403,19 +403,11 @@ class PrefectEventsClient(EventsClient):
             await self.emit(event)
         logger.debug("Finished resending unconfirmed events.")
 
-    async def _checkpoint(self, event: Event) -> None:
+    async def _checkpoint(self) -> None:
         assert self._websocket
 
-        self._unconfirmed_events.append(event)
-
         unconfirmed_count = len(self._unconfirmed_events)
 
-        logger.debug(
-            "Added event id=%s to unconfirmed events list. "
-            "There are now %s unconfirmed events.",
-            event.id,
-            unconfirmed_count,
-        )
         if unconfirmed_count < self._checkpoint_every:
             return
 
@@ -433,6 +425,16 @@ class PrefectEventsClient(EventsClient):
 
     async def _emit(self, event: Event) -> None:
         self._log_debug("Emitting event id=%s.", event.id)
+
+        self._unconfirmed_events.append(event)
+
+        logger.debug(
+            "Added event id=%s to unconfirmed events list. "
+            "There are now %s unconfirmed events.",
+            event.id,
+            len(self._unconfirmed_events),
+        )
+
         for i in range(self._reconnection_attempts + 1):
             self._log_debug("Emit reconnection attempt %s.", i)
             try:
@@ -450,7 +452,7 @@ class PrefectEventsClient(EventsClient):
                 self._log_debug("Sending event id=%s.", event.id)
                 await self._websocket.send(event.model_dump_json())
                 self._log_debug("Checkpointing event id=%s.", event.id)
-                await self._checkpoint(event)
+                await self._checkpoint()
 
                 return
             except ConnectionClosed:
@@ -537,7 +539,7 @@ class PrefectCloudEventsClient(PrefectEventsClient):
         )
         self._connect = websocket_connect(
             self._events_socket_url,
-            extra_headers={"Authorization": f"bearer {api_key}"},
+            additional_headers={"Authorization": f"bearer {api_key}"},
         )
 
 
@@ -562,7 +564,7 @@ class PrefectEventSubscriber:
 
     """
 
-    _websocket: Optional[WebSocketClientProtocol]
+    _websocket: Optional[ClientConnection]
     _filter: "EventFilter"
     _seen_events: MutableMapping[UUID, bool]
 

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/flow_runs.py

@@ -14,6 +14,7 @@ import anyio
 from prefect.client.orchestration import PrefectClient, get_client
 from prefect.client.schemas import FlowRun
 from prefect.client.schemas.objects import (
+    State,
     StateType,
 )
 from prefect.client.schemas.responses import SetStateStatus
@@ -22,6 +23,8 @@ from prefect.context import (
     FlowRunContext,
     TaskRunContext,
 )
+from prefect.events.clients import get_events_subscriber
+from prefect.events.filters import EventFilter, EventNameFilter, EventResourceFilter
 from prefect.exceptions import (
     Abort,
     FlowPauseTimeout,
@@ -54,7 +57,7 @@ if TYPE_CHECKING:
 async def wait_for_flow_run(
     flow_run_id: UUID,
     timeout: int | None = 10800,
-    poll_interval: int = 5,
+    poll_interval: int | None = None,
     client: "PrefectClient | None" = None,
     log_states: bool = False,
 ) -> FlowRun:
@@ -64,7 +67,9 @@ async def wait_for_flow_run(
     Args:
         flow_run_id: The flow run ID for the flow run to wait for.
         timeout: The wait timeout in seconds. Defaults to 10800 (3 hours).
-        poll_interval: The poll interval in seconds. Defaults to 5.
+        poll_interval: Deprecated; polling is no longer used to wait for flow runs.
+        client: Optional Prefect client. If not provided, one will be injected.
+        log_states: If True, log state changes. Defaults to False.
 
     Returns:
         FlowRun: The finished flow run.
@@ -114,17 +119,37 @@ async def wait_for_flow_run(
 
             ```
     """
+    if poll_interval is not None:
+        get_logger().warning(
+            "The `poll_interval` argument is deprecated and will be removed in a future release. "
+        )
+
     assert client is not None, "Client injection failed"
     logger = get_logger()
+
+    event_filter = EventFilter(
+        event=EventNameFilter(prefix=["prefect.flow-run"]),
+        resource=EventResourceFilter(id=[f"prefect.flow-run.{flow_run_id}"]),
+    )
+
     with anyio.move_on_after(timeout):
-        while True:
+        async with get_events_subscriber(filter=event_filter) as subscriber:
             flow_run = await client.read_flow_run(flow_run_id)
-            flow_state = flow_run.state
-            if log_states and flow_state:
-                logger.info(f"Flow run is in state {flow_state.name!r}")
-            if flow_state and flow_state.is_final():
+            if flow_run.state and flow_run.state.is_final():
+                if log_states:
+                    logger.info(f"Flow run is in state {flow_run.state.name!r}")
                 return flow_run
-            await anyio.sleep(poll_interval)
+
+            async for event in subscriber:
+                state_type = StateType(event.resource["prefect.state-type"])
+                state = State(type=state_type)
+
+                if log_states:
+                    logger.info(f"Flow run is in state {state.name!r}")
+
+                if state.is_final():
+                    return await client.read_flow_run(flow_run_id)
+
     raise FlowRunWaitTimeout(
         f"Flow run with ID {flow_run_id} exceeded watch timeout of {timeout} seconds"
     )

{prefect-3.2.8.dev4 → prefect-3.2.10.dev1}/src/prefect/flows.py

@@ -2353,7 +2353,9 @@ async def load_flow_from_flow_run(
         from prefect.deployments.steps.core import StepExecutionError, run_steps
 
         try:
-            output = await run_steps(deployment.pull_steps)
+            output = await run_steps(
+                deployment.pull_steps, print_function=run_logger.info
+            )
         except StepExecutionError as e:
             e = e.__cause__ or e
             run_logger.error(str(e))