prefect-client 3.0.1__py3-none-any.whl → 3.0.2__py3-none-any.whl

prefect/flow_engine.py

@@ -47,7 +47,12 @@ from prefect.logging.loggers import (
     get_run_logger,
     patch_print,
 )
-from prefect.results import BaseResult, ResultStore, get_current_result_store
+from prefect.results import (
+    BaseResult,
+    ResultStore,
+    get_result_store,
+    should_persist_result,
+)
 from prefect.settings import PREFECT_DEBUG_MODE
 from prefect.states import (
     Failed,
@@ -202,7 +207,7 @@ class FlowRunEngine(Generic[P, R]):
                 self.handle_exception(
                     exc,
                     msg=message,
-                    result_store=get_current_result_store().update_for_flow(
+                    result_store=get_result_store().update_for_flow(
                         self.flow, _sync=True
                     ),
                 )
@@ -271,7 +276,7 @@ class FlowRunEngine(Generic[P, R]):
             return_value_to_state(
                 resolved_result,
                 result_store=result_store,
-                write_result=True,
+                write_result=should_persist_result(),
             )
         )
         self.set_state(terminal_state)
@@ -507,10 +512,13 @@ class FlowRunEngine(Generic[P, R]):
                     flow_run=self.flow_run,
                     parameters=self.parameters,
                     client=client,
-                    result_store=get_current_result_store().update_for_flow(
+                    result_store=get_result_store().update_for_flow(
                         self.flow, _sync=True
                     ),
                     task_runner=task_runner,
+                    persist_result=self.flow.persist_result
+                    if self.flow.persist_result is not None
+                    else should_persist_result(),
                 )
             )
             stack.enter_context(ConcurrencyContextV1())

prefect/locking/filesystem.py

@@ -0,0 +1,243 @@
+import time
+from pathlib import Path
+from typing import Dict, Optional
+
+import anyio
+import pendulum
+import pydantic_core
+from typing_extensions import TypedDict
+
+from prefect.logging.loggers import get_logger
+
+from .protocol import LockManager
+
+logger = get_logger(__name__)
+
+
+class _LockInfo(TypedDict):
+    """
+    A dictionary containing information about a lock.
+
+    Attributes:
+        holder: The holder of the lock.
+        expiration: Datetime when the lock expires.
+        path: Path to the lock file.
+    """
+
+    holder: str
+    expiration: Optional[pendulum.DateTime]
+    path: Path
+
+
+class FileSystemLockManager(LockManager):
+    """
+    A lock manager that implements locking using local files.
+
+    Attributes:
+        lock_files_directory: the directory where lock files are stored
+    """
+
+    def __init__(self, lock_files_directory: Path):
+        self.lock_files_directory = lock_files_directory
+        self._locks: Dict[str, _LockInfo] = {}
+
+    def _ensure_records_directory_exists(self):
+        self.lock_files_directory.mkdir(parents=True, exist_ok=True)
+
+    def _lock_path_for_key(self, key: str) -> Path:
+        if (lock_info := self._locks.get(key)) is not None:
+            return lock_info["path"]
+        return self.lock_files_directory.joinpath(key).with_suffix(".lock")
+
+    def _get_lock_info(self, key: str, use_cache=True) -> Optional[_LockInfo]:
+        if use_cache:
+            if (lock_info := self._locks.get(key)) is not None:
+                return lock_info
+
+        lock_path = self._lock_path_for_key(key)
+
+        try:
+            with open(lock_path, "rb") as lock_file:
+                lock_info = pydantic_core.from_json(lock_file.read())
+                lock_info["path"] = lock_path
+                expiration = lock_info.get("expiration")
+                lock_info["expiration"] = (
+                    pendulum.parse(expiration) if expiration is not None else None
+                )
+            self._locks[key] = lock_info
+            return lock_info
+        except FileNotFoundError:
+            return None
+
+    async def _aget_lock_info(
+        self, key: str, use_cache: bool = True
+    ) -> Optional[_LockInfo]:
+        if use_cache:
+            if (lock_info := self._locks.get(key)) is not None:
+                return lock_info
+
+        lock_path = self._lock_path_for_key(key)
+
+        try:
+            lock_info_bytes = await anyio.Path(lock_path).read_bytes()
+            lock_info = pydantic_core.from_json(lock_info_bytes)
+            lock_info["path"] = lock_path
+            expiration = lock_info.get("expiration")
+            lock_info["expiration"] = (
+                pendulum.parse(expiration) if expiration is not None else None
+            )
+            self._locks[key] = lock_info
+            return lock_info
+        except FileNotFoundError:
+            return None
+
+    def acquire_lock(
+        self,
+        key: str,
+        holder: str,
+        acquire_timeout: Optional[float] = None,
+        hold_timeout: Optional[float] = None,
+    ) -> bool:
+        self._ensure_records_directory_exists()
+        lock_path = self._lock_path_for_key(key)
+
+        if self.is_locked(key) and not self.is_lock_holder(key, holder):
+            lock_free = self.wait_for_lock(key, acquire_timeout)
+            if not lock_free:
+                return False
+
+        try:
+            Path(lock_path).touch(exist_ok=False)
+        except FileExistsError:
+            if not self.is_lock_holder(key, holder):
+                logger.debug(
+                    f"Another actor acquired the lock for record with key {key}. Trying again."
+                )
+                return self.acquire_lock(key, holder, acquire_timeout, hold_timeout)
+        expiration = (
+            pendulum.now("utc") + pendulum.duration(seconds=hold_timeout)
+            if hold_timeout is not None
+            else None
+        )
+
+        with open(Path(lock_path), "wb") as lock_file:
+            lock_file.write(
+                pydantic_core.to_json(
+                    {
+                        "holder": holder,
+                        "expiration": str(expiration)
+                        if expiration is not None
+                        else None,
+                    },
+                )
+            )
+
+        self._locks[key] = {
+            "holder": holder,
+            "expiration": expiration,
+            "path": lock_path,
+        }
+
+        return True
+
+    async def aacquire_lock(
+        self,
+        key: str,
+        holder: str,
+        acquire_timeout: Optional[float] = None,
+        hold_timeout: Optional[float] = None,
+    ) -> bool:
+        await anyio.Path(self.lock_files_directory).mkdir(parents=True, exist_ok=True)
+        lock_path = self._lock_path_for_key(key)
+
+        if self.is_locked(key) and not self.is_lock_holder(key, holder):
+            lock_free = await self.await_for_lock(key, acquire_timeout)
+            if not lock_free:
+                return False
+
+        try:
+            await anyio.Path(lock_path).touch(exist_ok=False)
+        except FileExistsError:
+            if not self.is_lock_holder(key, holder):
+                logger.debug(
+                    f"Another actor acquired the lock for record with key {key}. Trying again."
+                )
+                return self.acquire_lock(key, holder, acquire_timeout, hold_timeout)
+        expiration = (
+            pendulum.now("utc") + pendulum.duration(seconds=hold_timeout)
+            if hold_timeout is not None
+            else None
+        )
+
+        async with await anyio.Path(lock_path).open("wb") as lock_file:
+            await lock_file.write(
+                pydantic_core.to_json(
+                    {
+                        "holder": holder,
+                        "expiration": str(expiration)
+                        if expiration is not None
+                        else None,
+                    },
+                )
+            )
+
+        self._locks[key] = {
+            "holder": holder,
+            "expiration": expiration,
+            "path": lock_path,
+        }
+
+        return True
+
+    def release_lock(self, key: str, holder: str) -> None:
+        lock_path = self._lock_path_for_key(key)
+        if not self.is_locked(key):
+            ValueError(f"No lock for transaction with key {key}")
+        if self.is_lock_holder(key, holder):
+            Path(lock_path).unlink(missing_ok=True)
+            self._locks.pop(key, None)
+        else:
+            raise ValueError(f"No lock held by {holder} for transaction with key {key}")
+
+    def is_locked(self, key: str, use_cache: bool = False) -> bool:
+        if (lock_info := self._get_lock_info(key, use_cache=use_cache)) is None:
+            return False
+
+        if (expiration := lock_info.get("expiration")) is None:
+            return True
+
+        expired = expiration < pendulum.now("utc")
+        if expired:
+            Path(lock_info["path"]).unlink()
+            self._locks.pop(key, None)
+            return False
+        else:
+            return True
+
+    def is_lock_holder(self, key: str, holder: str) -> bool:
+        if not self.is_locked(key):
+            return False
+
+        if not self.is_locked(key):
+            return False
+        if (lock_info := self._get_lock_info(key)) is None:
+            return False
+        return lock_info["holder"] == holder
+
+    def wait_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+        seconds_waited = 0
+        while self.is_locked(key, use_cache=False):
+            if timeout and seconds_waited >= timeout:
+                return False
+            seconds_waited += 0.1
+            time.sleep(0.1)
+        return True
+
+    async def await_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+        seconds_waited = 0
+        while self.is_locked(key, use_cache=False):
+            if timeout and seconds_waited >= timeout:
+                return False
+            seconds_waited += 0.1
+            await anyio.sleep(0.1)
+        return True

prefect/logging/handlers.py

@@ -138,8 +138,6 @@ class APILogHandler(logging.Handler):
                 return  # Respect the global settings toggle
             if not getattr(record, "send_to_api", True):
                 return  # Do not send records that have opted out
-            if not getattr(record, "send_to_orion", True):
-                return  # Backwards compatibility
 
             log = self.prepare(record)
             APILogWorker.instance().send(log)

prefect/logging/loggers.py

@@ -1,7 +1,6 @@
 import io
 import logging
 import sys
-import warnings
 from builtins import print
 from contextlib import contextmanager
 from functools import lru_cache
@@ -34,23 +33,6 @@ class PrefectLogAdapter(logging.LoggerAdapter):
 
     def process(self, msg, kwargs):
         kwargs["extra"] = {**(self.extra or {}), **(kwargs.get("extra") or {})}
-
-        from prefect._internal.compatibility.deprecated import (
-            PrefectDeprecationWarning,
-            generate_deprecation_message,
-        )
-
-        if "send_to_orion" in kwargs["extra"]:
-            warnings.warn(
-                generate_deprecation_message(
-                    'The "send_to_orion" option',
-                    start_date="May 2023",
-                    help='Use "send_to_api" instead.',
-                ),
-                PrefectDeprecationWarning,
-                stacklevel=4,
-            )
-
         return (msg, kwargs)
 
     def getChild(

prefect/logging/logging.yml

@@ -77,6 +77,7 @@ loggers:
     prefect.extra:
         level: "${PREFECT_LOGGING_LEVEL}"
         handlers: [api]
+        propagate: false
 
     prefect.flow_runs:
         level: NOTSET

prefect/main.py

@@ -7,7 +7,7 @@ from prefect.transactions import Transaction
 from prefect.tasks import task, Task
 from prefect.context import tags
 from prefect.utilities.annotations import unmapped, allow_failure
-from prefect.results import BaseResult
+from prefect.results import BaseResult, ResultRecordMetadata
 from prefect.flow_runs import pause_flow_run, resume_flow_run, suspend_flow_run
 from prefect.client.orchestration import get_client, PrefectClient
 from prefect.client.cloud import get_cloud_client, CloudClient
@@ -26,12 +26,26 @@ import prefect.context
 import prefect.client.schemas
 
 prefect.context.FlowRunContext.model_rebuild(
-    _types_namespace={"Flow": Flow, "BaseResult": BaseResult}
+    _types_namespace={
+        "Flow": Flow,
+        "BaseResult": BaseResult,
+        "ResultRecordMetadata": ResultRecordMetadata,
+    }
+)
+prefect.context.TaskRunContext.model_rebuild(
+    _types_namespace={"Task": Task, "BaseResult": BaseResult}
+)
+prefect.client.schemas.State.model_rebuild(
+    _types_namespace={
+        "BaseResult": BaseResult,
+        "ResultRecordMetadata": ResultRecordMetadata,
+    }
 )
-prefect.context.TaskRunContext.model_rebuild(_types_namespace={"Task": Task})
-prefect.client.schemas.State.model_rebuild(_types_namespace={"BaseResult": BaseResult})
 prefect.client.schemas.StateCreate.model_rebuild(
-    _types_namespace={"BaseResult": BaseResult}
+    _types_namespace={
+        "BaseResult": BaseResult,
+        "ResultRecordMetadata": ResultRecordMetadata,
+    }
 )
 Transaction.model_rebuild()
 

prefect/records/base.py

@@ -6,11 +6,18 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Optional
 
+from prefect._internal.compatibility import deprecated
+
 if TYPE_CHECKING:
     from prefect.results import BaseResult
     from prefect.transactions import IsolationLevel
 
 
+@deprecated.deprecated_class(
+    start_date="Sep 2024",
+    end_date="Nov 2024",
+    help="Use `ResultRecord` instead to represent a result and its associated metadata.",
+)
 @dataclass
 class TransactionRecord:
     """
@@ -21,6 +28,11 @@ class TransactionRecord:
     result: "BaseResult"
 
 
+@deprecated.deprecated_class(
+    start_date="Sep 2024",
+    end_date="Nov 2024",
+    help="Use `ResultStore` and provide a `WritableFileSystem` for `metadata_storage` instead.",
+)
 class RecordStore(abc.ABC):
     @abc.abstractmethod
     def read(

prefect/records/filesystem.py

@@ -6,6 +6,7 @@ from typing import Dict, Optional
 import pendulum
 from typing_extensions import TypedDict
 
+from prefect._internal.compatibility import deprecated
 from prefect.logging.loggers import get_logger
 from prefect.records.base import RecordStore, TransactionRecord
 from prefect.results import BaseResult
@@ -29,6 +30,11 @@ class _LockInfo(TypedDict):
     path: Path
 
 
+@deprecated.deprecated_class(
+    start_date="Sep 2024",
+    end_date="Nov 2024",
+    help="Use `ResultStore` with a `LocalFileSystem` for `metadata_storage` and a `FileSystemLockManager` instead.",
+)
 class FileSystemRecordStore(RecordStore):
     """
     A record store that stores data on the local filesystem.
@@ -56,7 +62,6 @@ class FileSystemRecordStore(RecordStore):
     def _get_lock_info(self, key: str, use_cache=True) -> Optional[_LockInfo]:
         if use_cache:
             if (lock_info := self._locks.get(key)) is not None:
-                print("Got lock info from cache")
                 return lock_info
 
         lock_path = self._lock_path_for_key(key)
@@ -70,7 +75,6 @@ class FileSystemRecordStore(RecordStore):
                     pendulum.parse(expiration) if expiration is not None else None
                 )
             self._locks[key] = lock_info
-            print("Got lock info from file")
             return lock_info
         except FileNotFoundError:
             return None

prefect/records/memory.py

@@ -1,6 +1,7 @@
 import threading
 from typing import Dict, Optional, TypedDict
 
+from prefect._internal.compatibility import deprecated
 from prefect.results import BaseResult
 from prefect.transactions import IsolationLevel
 
@@ -22,6 +23,11 @@ class _LockInfo(TypedDict):
     expiration_timer: Optional[threading.Timer]
 
 
+@deprecated.deprecated_class(
+    start_date="Sep 2024",
+    end_date="Nov 2024",
+    help="Use `ResultStore` with a `MemoryLockManager` instead.",
+)
 class MemoryRecordStore(RecordStore):
     """
     A record store that stores data in memory.

prefect/records/result_store.py

@@ -3,6 +3,7 @@ from typing import Any, Optional
 
 import pendulum
 
+from prefect._internal.compatibility import deprecated
 from prefect.results import BaseResult, PersistedResult, ResultStore
 from prefect.transactions import IsolationLevel
 from prefect.utilities.asyncutils import run_coro_as_sync
@@ -10,6 +11,11 @@ from prefect.utilities.asyncutils import run_coro_as_sync
 from .base import RecordStore, TransactionRecord
 
 
+@deprecated.deprecated_class(
+    start_date="Sep 2024",
+    end_date="Nov 2024",
+    help="Use `ResultStore` directly instead.",
+)
 @dataclass
 class ResultRecordStore(RecordStore):
     """