prefect 3.3.5.dev1__tar.gz → 3.3.5.dev3__tar.gz

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect
-Version: 3.3.5.dev1
+Version: 3.3.5.dev3
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

prefect-3.3.5.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.5.dev3"
+__build_date__ = "2025-04-16 08:09:06.186543+00:00"
+__git_commit__ = "d01b30e8ec3cffd839c23ab42edc62983c3cb1a4"
+__dirty__ = False

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

@@ -39,6 +39,7 @@ import prefect.types._datetime
 from prefect.events import Event
 from prefect.logging import get_logger
 from prefect.settings import (
+    PREFECT_API_AUTH_STRING,
     PREFECT_API_KEY,
     PREFECT_API_SSL_CERT_FILE,
     PREFECT_API_TLS_INSECURE_SKIP_VERIFY,
@@ -367,7 +368,7 @@ class PrefectEventsClient(EventsClient):
         await self._connect.__aexit__(exc_type, exc_val, exc_tb)
         return await super().__aexit__(exc_type, exc_val, exc_tb)
 
-    def _log_debug(self, message: str, *args, **kwargs) -> None:
+    def _log_debug(self, message: str, *args: Any, **kwargs: Any) -> None:
         message = f"EventsClient(id={id(self)}): " + message
         logger.debug(message, *args, **kwargs)
 
@@ -578,6 +579,7 @@ class PrefectEventSubscriber:
     _seen_events: MutableMapping[UUID, bool]
 
     _api_key: Optional[str]
+    _auth_token: Optional[str]
 
     def __init__(
         self,
@@ -593,6 +595,8 @@ class PrefectEventSubscriber:
                 the client should attempt to reconnect
         """
         self._api_key = None
+        self._auth_token = PREFECT_API_AUTH_STRING.value()
+
         if not api_url:
             api_url = cast(str, PREFECT_API_URL.value())
 
@@ -641,8 +645,10 @@ class PrefectEventSubscriber:
         await pong
 
         logger.debug("  authenticating...")
+        # Use the API key (for Cloud) OR the auth token (for self-hosted with auth string)
+        token = self._api_key or self._auth_token
         await self._websocket.send(
-            orjson.dumps({"type": "auth", "token": self._api_key}).decode()
+            orjson.dumps({"type": "auth", "token": token}).decode()
         )
 
         try:
@@ -652,13 +658,13 @@ class PrefectEventSubscriber:
         except AssertionError as e:
             raise Exception(
                 "Unable to authenticate to the event stream. Please ensure the "
-                "provided api_key you are using is valid for this environment. "
+                "provided api_key or auth_token you are using is valid for this environment. "
                 f"Reason: {e.args[0]}"
             )
         except ConnectionClosedError as e:
             reason = getattr(e.rcvd, "reason", None)
             msg = "Unable to authenticate to the event stream. Please ensure the "
-            msg += "provided api_key you are using is valid for this environment. "
+            msg += "provided api_key or auth_token you are using is valid for this environment. "
             msg += f"Reason: {reason}" if reason else ""
             raise Exception(msg) from e
 

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/flows.py

@@ -1130,7 +1130,7 @@ class Flow(Generic[P, R]):
     @classmethod
     async def afrom_source(
         cls,
-        source: Union[str, "RunnerStorage", ReadableDeploymentStorage],
+        source: Union[str, Path, "RunnerStorage", ReadableDeploymentStorage],
         entrypoint: str,
     ) -> "Flow[..., Any]":
         """
@@ -1244,7 +1244,7 @@ class Flow(Generic[P, R]):
     @async_dispatch(afrom_source)
     def from_source(
         cls,
-        source: Union[str, "RunnerStorage", ReadableDeploymentStorage],
+        source: Union[str, Path, "RunnerStorage", ReadableDeploymentStorage],
         entrypoint: str,
     ) -> "Flow[..., Any]":
         """
@@ -1976,7 +1976,7 @@ class FlowDecorator:
         # manually here.
         @staticmethod
         def from_source(
-            source: Union[str, "RunnerStorage", ReadableDeploymentStorage],
+            source: Union[str, Path, "RunnerStorage", ReadableDeploymentStorage],
             entrypoint: str,
         ) -> Union["Flow[..., Any]", Coroutine[Any, Any, "Flow[..., Any]"]]: ...
 

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/locking/memory.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import asyncio
 import threading
-from typing import Any, Optional, TypedDict
+from typing import Any, TypedDict
 
 from typing_extensions import Self
 
@@ -19,7 +21,7 @@ class _LockInfo(TypedDict):
 
     holder: str
     lock: threading.Lock
-    expiration_timer: Optional[threading.Timer]
+    expiration_timer: threading.Timer | None
 
 
 class MemoryLockManager(LockManager):
@@ -63,8 +65,8 @@ class MemoryLockManager(LockManager):
         self,
         key: str,
         holder: str,
-        acquire_timeout: Optional[float] = None,
-        hold_timeout: Optional[float] = None,
+        acquire_timeout: float | None = None,
+        hold_timeout: float | None = None,
     ) -> bool:
         with self._locks_dict_lock:
             if key not in self._locks:
@@ -116,13 +118,13 @@ class MemoryLockManager(LockManager):
         self,
         key: str,
         holder: str,
-        acquire_timeout: Optional[float] = None,
-        hold_timeout: Optional[float] = None,
+        acquire_timeout: float | None = None,
+        hold_timeout: float | None = None,
     ) -> bool:
         with self._locks_dict_lock:
             if key not in self._locks:
                 lock = threading.Lock()
-                await asyncio.to_thread(lock.acquire)
+                lock.acquire()
                 expiration_timer = None
                 if hold_timeout is not None:
                     expiration_timer = threading.Timer(
@@ -192,7 +194,7 @@ class MemoryLockManager(LockManager):
             and lock_info["holder"] == holder
         )
 
-    def wait_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+    def wait_for_lock(self, key: str, timeout: float | None = None) -> bool:
         lock_info: _LockInfo | None = self._locks.get(key)
         if lock_info is None:
             return True
@@ -206,7 +208,7 @@ class MemoryLockManager(LockManager):
             return lock_acquired
         return True
 
-    async def await_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+    async def await_for_lock(self, key: str, timeout: float | None = None) -> bool:
         lock_info: _LockInfo | None = self._locks.get(key, None)
         if lock_info is None:
             return True

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/results.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 import inspect
 import os
 import socket
@@ -33,6 +34,7 @@ from typing_extensions import ParamSpec, Self
 import prefect
 import prefect.types._datetime
 from prefect._internal.compatibility.async_dispatch import async_dispatch
+from prefect._internal.concurrency.event_loop import get_running_loop
 from prefect._result_records import R, ResultRecord, ResultRecordMetadata
 from prefect.blocks.core import Block
 from prefect.exceptions import (
@@ -475,10 +477,17 @@ class ResultStore(BaseModel):
         Returns:
             str: A unique identifier string.
         """
+        current_loop = get_running_loop()
         hostname = socket.gethostname()
         pid = os.getpid()
         thread_name = threading.current_thread().name
         thread_id = threading.get_ident()
+        if current_loop:
+            current_task = asyncio.current_task()
+            if current_task:
+                # include the task id to ensure uniqueness because there might be
+                # multiple tasks running in the same thread
+                return f"{hostname}:{pid}:{thread_id}:{thread_name}:{id(current_task)}"
         return f"{hostname}:{pid}:{thread_id}:{thread_name}"
 
     @sync_compatible

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/server/utilities/subscriptions.py

@@ -1,4 +1,6 @@
 import asyncio
+from asyncio import IncompleteReadError as IOError
+from logging import Logger
 from typing import Optional
 
 from fastapi import WebSocket
@@ -6,8 +8,13 @@ from starlette.status import WS_1002_PROTOCOL_ERROR, WS_1008_POLICY_VIOLATION
 from starlette.websockets import WebSocketDisconnect
 from websockets.exceptions import ConnectionClosed
 
+from prefect.logging import get_logger
+from prefect.settings import get_current_settings
+
 NORMAL_DISCONNECT_EXCEPTIONS = (IOError, ConnectionClosed, WebSocketDisconnect)
 
+logger: Logger = get_logger("prefect.server.utilities.subscriptions")
+
 
 async def accept_prefect_socket(websocket: WebSocket) -> Optional[WebSocket]:
     subprotocols = websocket.headers.get("Sec-WebSocket-Protocol", "").split(",")
@@ -21,16 +28,53 @@ async def accept_prefect_socket(websocket: WebSocket) -> Optional[WebSocket]:
         # message is expected to be an auth message, and if any other type of
         # message is received then the connection will be closed.
         #
-        # There is no authentication in Prefect Server, but the protocol requires
-        # that we receive and return the auth message for compatibility with Prefect
-        # Cloud.
+        # The protocol requires receiving an auth message for compatibility
+        # with Prefect Cloud, even if server-side auth is not configured.
         message = await websocket.receive_json()
-        if message["type"] != "auth":
+
+        auth_setting = (
+            auth_setting_secret.get_secret_value()
+            if (auth_setting_secret := get_current_settings().server.api.auth_string)
+            else None
+        )
+        logger.debug(
+            f"PREFECT_SERVER_API_AUTH_STRING setting: {'*' * len(auth_setting) if auth_setting else 'Not set'}"
+        )
+
+        if message.get("type") != "auth":
+            logger.warning(
+                "WebSocket connection closed: Expected 'auth' message first."
+            )
             return await websocket.close(
                 WS_1008_POLICY_VIOLATION, reason="Expected 'auth' message"
             )
 
+        # Check authentication if PREFECT_SERVER_API_AUTH_STRING is set
+        if auth_setting:
+            received_token = message.get("token")
+            logger.debug(
+                f"Auth required. Received token: {'*' * len(received_token) if received_token else 'None'}"
+            )
+            if not received_token:
+                logger.warning(
+                    "WebSocket connection closed: Auth required but no token received."
+                )
+                return await websocket.close(
+                    WS_1008_POLICY_VIOLATION,
+                    reason="Auth required but no token provided",
+                )
+
+            if received_token != auth_setting:
+                logger.warning("WebSocket connection closed: Invalid token.")
+                return await websocket.close(
+                    WS_1008_POLICY_VIOLATION, reason="Invalid token"
+                )
+            logger.debug("WebSocket token authentication successful.")
+        else:
+            logger.debug("No server auth string set, skipping token check.")
+
         await websocket.send_json({"type": "auth_success"})
+        logger.debug("Sent auth_success to WebSocket.")
         return websocket
 
     except NORMAL_DISCONNECT_EXCEPTIONS:

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/task_engine.py

@@ -81,7 +81,13 @@ from prefect.states import (
     return_value_to_state,
 )
 from prefect.telemetry.run_telemetry import RunTelemetry
-from prefect.transactions import IsolationLevel, Transaction, transaction
+from prefect.transactions import (
+    AsyncTransaction,
+    IsolationLevel,
+    Transaction,
+    atransaction,
+    transaction,
+)
 from prefect.utilities._engine import get_hook_name
 from prefect.utilities.annotations import NotSet
 from prefect.utilities.asyncutils import run_coro_as_sync
@@ -1020,7 +1026,7 @@ class AsyncTaskRunEngine(BaseTaskRunEngine[P, R]):
             # otherwise, return the exception
             return self._raised
 
-    async def handle_success(self, result: R, transaction: Transaction) -> R:
+    async def handle_success(self, result: R, transaction: AsyncTransaction) -> R:
         if self.task.cache_expiration is not None:
             expiration = prefect.types._datetime.now("UTC") + self.task.cache_expiration
         else:
@@ -1302,7 +1308,7 @@ class AsyncTaskRunEngine(BaseTaskRunEngine[P, R]):
                         await self.call_hooks()
 
     @asynccontextmanager
-    async def transaction_context(self) -> AsyncGenerator[Transaction, None]:
+    async def transaction_context(self) -> AsyncGenerator[AsyncTransaction, None]:
         # refresh cache setting is now repurposes as overwrite transaction record
         overwrite = (
             self.task.refresh_cache
@@ -1317,7 +1323,7 @@ class AsyncTaskRunEngine(BaseTaskRunEngine[P, R]):
             else None
         )
 
-        with transaction(
+        async with atransaction(
             key=self.compute_transaction_key(),
             store=get_result_store(),
             overwrite=overwrite,
@@ -1349,7 +1355,7 @@ class AsyncTaskRunEngine(BaseTaskRunEngine[P, R]):
                 await self.handle_exception(exc)
 
     async def call_task_fn(
-        self, transaction: Transaction
+        self, transaction: AsyncTransaction
     ) -> Union[R, Coroutine[Any, Any, R]]:
         """
         Convenience method to call the task function. Returns a coroutine if the
@@ -1357,7 +1363,7 @@ class AsyncTaskRunEngine(BaseTaskRunEngine[P, R]):
         """
         parameters = self.parameters or {}
         if transaction.is_committed():
-            result = transaction.read()
+            result = await transaction.read()
         else:
             result = await call_with_parameters(self.task.fn, parameters)
         await self.handle_success(result, transaction=transaction)

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/tasks.py

@@ -764,11 +764,6 @@ class Task(Generic[P, R]):
     def on_rollback(
         self, fn: Callable[["Transaction"], None]
     ) -> Callable[["Transaction"], None]:
-        if asyncio.iscoroutinefunction(fn):
-            raise ValueError(
-                "Asynchronous rollback hooks are not yet supported. Rollback hooks must be synchronous functions."
-            )
-
         self.on_rollback_hooks.append(fn)
         return fn
 

{prefect-3.3.5.dev1 → prefect-3.3.5.dev3}/src/prefect/telemetry/instrumentation.py

@@ -1,6 +1,6 @@
 import logging
-import os
 import re
+import socket
 from typing import TYPE_CHECKING
 from urllib.parse import urljoin
 from uuid import UUID
@@ -74,7 +74,7 @@ def setup_exporters(
     resource = Resource.create(
         {
             "service.name": "prefect",
-            "service.instance.id": os.uname().nodename,
+            "service.instance.id": socket.gethostname(),
             "prefect.account": str(account_id),
             "prefect.workspace": str(workspace_id),
         }