prefect-client 3.0.0rc19__py3-none-any.whl → 3.0.1__py3-none-any.whl

prefect/results.py

@@ -1,11 +1,13 @@
 import abc
 import inspect
+import os
+import socket
+import threading
 import uuid
 from functools import partial
 from typing import (
     TYPE_CHECKING,
     Any,
-    Awaitable,
     Callable,
     Dict,
     Generic,
@@ -17,7 +19,15 @@ from typing import (
 )
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, ValidationError
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    PrivateAttr,
+    ValidationError,
+    model_serializer,
+    model_validator,
+)
 from pydantic_core import PydanticUndefinedType
 from pydantic_extra_types.pendulum_dt import DateTime
 from typing_extensions import ParamSpec, Self
@@ -25,13 +35,18 @@ from typing_extensions import ParamSpec, Self
 import prefect
 from prefect.blocks.core import Block
 from prefect.client.utilities import inject_client
-from prefect.exceptions import MissingResult
+from prefect.exceptions import (
+    ConfigurationError,
+    MissingContextError,
+    SerializationError,
+)
 from prefect.filesystems import (
     LocalFileSystem,
     WritableFileSystem,
 )
+from prefect.locking.protocol import LockManager
 from prefect.logging import get_logger
-from prefect.serializers import Serializer
+from prefect.serializers import PickleSerializer, Serializer
 from prefect.settings import (
     PREFECT_DEFAULT_RESULT_STORAGE_BLOCK,
     PREFECT_LOCAL_STORAGE_PATH,
@@ -46,6 +61,7 @@ from prefect.utilities.pydantic import get_dispatch_key, lookup_type, register_b
 if TYPE_CHECKING:
     from prefect import Flow, Task
     from prefect.client.orchestration import PrefectClient
+    from prefect.transactions import IsolationLevel
 
 
 ResultStorage = Union[WritableFileSystem, str]
@@ -65,18 +81,66 @@ _default_storages: Dict[Tuple[str, str], WritableFileSystem] = {}
 
 
 @sync_compatible
-async def get_default_result_storage() -> ResultStorage:
+async def get_default_result_storage() -> WritableFileSystem:
     """
     Generate a default file system for result storage.
     """
     default_block = PREFECT_DEFAULT_RESULT_STORAGE_BLOCK.value()
 
     if default_block is not None:
-        return await Block.load(default_block)
+        return await resolve_result_storage(default_block)
 
     # otherwise, use the local file system
     basepath = PREFECT_LOCAL_STORAGE_PATH.value()
-    return LocalFileSystem(basepath=basepath)
+    return LocalFileSystem(basepath=str(basepath))
+
+
+@sync_compatible
+async def resolve_result_storage(
+    result_storage: ResultStorage,
+) -> WritableFileSystem:
+    """
+    Resolve one of the valid `ResultStorage` input types into a saved block
+    document id and an instance of the block.
+    """
+    from prefect.client.orchestration import get_client
+
+    client = get_client()
+    if isinstance(result_storage, Block):
+        storage_block = result_storage
+
+        if storage_block._block_document_id is not None:
+            # Avoid saving the block if it already has an identifier assigned
+            storage_block_id = storage_block._block_document_id
+        else:
+            storage_block_id = None
+    elif isinstance(result_storage, str):
+        storage_block = await Block.load(result_storage, client=client)
+        storage_block_id = storage_block._block_document_id
+        assert storage_block_id is not None, "Loaded storage blocks must have ids"
+    else:
+        raise TypeError(
+            "Result storage must be one of the following types: 'UUID', 'Block', "
+            f"'str'. Got unsupported type {type(result_storage).__name__!r}."
+        )
+
+    return storage_block
+
+
+def resolve_serializer(serializer: ResultSerializer) -> Serializer:
+    """
+    Resolve one of the valid `ResultSerializer` input types into a serializer
+    instance.
+    """
+    if isinstance(serializer, Serializer):
+        return serializer
+    elif isinstance(serializer, str):
+        return Serializer(type=serializer)
+    else:
+        raise TypeError(
+            "Result serializer must be one of the following types: 'Serializer', "
+            f"'str'. Got unsupported type {type(serializer).__name__!r}."
+        )
 
 
 async def get_or_create_default_task_scheduling_storage() -> ResultStorage:
@@ -93,11 +157,11 @@ async def get_or_create_default_task_scheduling_storage() -> ResultStorage:
     return LocalFileSystem(basepath=basepath)
 
 
-def get_default_result_serializer() -> ResultSerializer:
+def get_default_result_serializer() -> Serializer:
     """
     Generate a default file system for result storage.
     """
-    return PREFECT_RESULTS_DEFAULT_SERIALIZER.value()
+    return resolve_serializer(PREFECT_RESULTS_DEFAULT_SERIALIZER.value())
 
 
 def get_default_persist_setting() -> bool:
@@ -114,217 +178,498 @@ def _format_user_supplied_storage_key(key: str) -> str:
     return key.format(**runtime_vars, parameters=prefect.runtime.task_run.parameters)
 
 
-class ResultFactory(BaseModel):
+class ResultStore(BaseModel):
     """
-    A utility to generate `Result` types.
+    Manages the storage and retrieval of results.
+
+    Attributes:
+        result_storage: The storage for result records. If not provided, the default
+            result storage will be used.
+        metadata_storage: The storage for result record metadata. If not provided,
+            the metadata will be stored alongside the results.
+        lock_manager: The lock manager to use for locking result records. If not provided,
+            the store cannot be used in transactions with the SERIALIZABLE isolation level.
+        persist_result: Whether to persist results.
+        cache_result_in_memory: Whether to cache results in memory.
+        serializer: The serializer to use for results.
+        storage_key_fn: The function to generate storage keys.
     """
 
-    persist_result: bool
-    cache_result_in_memory: bool
-    serializer: Serializer
-    storage_block_id: Optional[uuid.UUID] = None
-    storage_block: WritableFileSystem
-    storage_key_fn: Callable[[], str]
+    model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    @classmethod
-    @inject_client
-    async def default_factory(cls, client: "PrefectClient" = None, **kwargs):
+    result_storage: Optional[WritableFileSystem] = Field(default=None)
+    metadata_storage: Optional[WritableFileSystem] = Field(default=None)
+    lock_manager: Optional[LockManager] = Field(default=None)
+    persist_result: bool = Field(default_factory=get_default_persist_setting)
+    cache_result_in_memory: bool = Field(default=True)
+    serializer: Serializer = Field(default_factory=get_default_result_serializer)
+    storage_key_fn: Callable[[], str] = Field(default=DEFAULT_STORAGE_KEY_FN)
+
+    @property
+    def result_storage_block_id(self) -> Optional[UUID]:
+        if self.result_storage is None:
+            return None
+        return self.result_storage._block_document_id
+
+    @sync_compatible
+    async def update_for_flow(self, flow: "Flow") -> Self:
         """
-        Create a new result factory with default options.
+        Create a new result store for a flow with updated settings.
+
+        Args:
+            flow: The flow to update the result store for.
 
-        Keyword arguments may be provided to override defaults. Null keys will be
-        ignored.
+        Returns:
+            An updated result store.
         """
-        # Remove any null keys so `setdefault` can do its magic
-        for key, value in tuple(kwargs.items()):
-            if value is None:
-                kwargs.pop(key)
+        update = {}
+        if flow.result_storage is not None:
+            update["result_storage"] = await resolve_result_storage(flow.result_storage)
+        if flow.result_serializer is not None:
+            update["serializer"] = resolve_serializer(flow.result_serializer)
+        if flow.persist_result is not None:
+            update["persist_result"] = flow.persist_result
+        if flow.cache_result_in_memory is not None:
+            update["cache_result_in_memory"] = flow.cache_result_in_memory
+        if self.result_storage is None and update.get("result_storage") is None:
+            update["result_storage"] = await get_default_result_storage()
+        return self.model_copy(update=update)
 
-        # Apply defaults
-        kwargs.setdefault("result_storage", await get_default_result_storage())
-        kwargs.setdefault("result_serializer", get_default_result_serializer())
-        kwargs.setdefault("persist_result", get_default_persist_setting())
-        kwargs.setdefault("cache_result_in_memory", True)
-        kwargs.setdefault("storage_key_fn", DEFAULT_STORAGE_KEY_FN)
+    @sync_compatible
+    async def update_for_task(self: Self, task: "Task") -> Self:
+        """
+        Create a new result store for a task.
 
-        return await cls.from_settings(**kwargs, client=client)
+        Args:
+            task: The task to update the result store for.
 
-    @classmethod
-    @inject_client
-    async def from_flow(
-        cls: Type[Self], flow: "Flow", client: "PrefectClient" = None
-    ) -> Self:
-        """
-        Create a new result factory for a flow.
-        """
-        from prefect.context import FlowRunContext
-
-        ctx = FlowRunContext.get()
-        if ctx:
-            # This is a child flow run
-            return await cls.from_settings(
-                result_storage=flow.result_storage or ctx.result_factory.storage_block,
-                result_serializer=flow.result_serializer
-                or ctx.result_factory.serializer,
-                persist_result=flow.persist_result,
-                cache_result_in_memory=flow.cache_result_in_memory,
-                storage_key_fn=DEFAULT_STORAGE_KEY_FN,
-                client=client,
+        Returns:
+            An updated result store.
+        """
+        update = {}
+        if task.result_storage is not None:
+            update["result_storage"] = await resolve_result_storage(task.result_storage)
+        if task.result_serializer is not None:
+            update["serializer"] = resolve_serializer(task.result_serializer)
+        if task.persist_result is not None:
+            update["persist_result"] = task.persist_result
+        if task.cache_result_in_memory is not None:
+            update["cache_result_in_memory"] = task.cache_result_in_memory
+        if task.result_storage_key is not None:
+            update["storage_key_fn"] = partial(
+                _format_user_supplied_storage_key, task.result_storage_key
             )
+        if self.result_storage is None and update.get("result_storage") is None:
+            update["result_storage"] = await get_default_result_storage()
+        return self.model_copy(update=update)
+
+    @staticmethod
+    def generate_default_holder() -> str:
+        """
+        Generate a default holder string using hostname, PID, and thread ID.
+
+        Returns:
+            str: A unique identifier string.
+        """
+        hostname = socket.gethostname()
+        pid = os.getpid()
+        thread_name = threading.current_thread().name
+        thread_id = threading.get_ident()
+        return f"{hostname}:{pid}:{thread_id}:{thread_name}"
+
+    @sync_compatible
+    async def _exists(self, key: str) -> bool:
+        """
+        Check if a result record exists in storage.
+
+        Args:
+            key: The key to check for the existence of a result record.
+
+        Returns:
+            bool: True if the result record exists, False otherwise.
+        """
+        if self.metadata_storage is not None:
+            # TODO: Add an `exists` method to commonly used storage blocks
+            # so the entire payload doesn't need to be read
+            try:
+                metadata_content = await self.metadata_storage.read_path(key)
+                return metadata_content is not None
+            except Exception:
+                return False
         else:
-            # This is a root flow run
-            # Pass the flow settings up to the default which will replace nulls with
-            # our default options
-            return await cls.default_factory(
-                client=client,
-                result_storage=flow.result_storage,
-                result_serializer=flow.result_serializer,
-                persist_result=flow.persist_result,
-                cache_result_in_memory=flow.cache_result_in_memory,
-                storage_key_fn=DEFAULT_STORAGE_KEY_FN,
+            try:
+                content = await self.result_storage.read_path(key)
+                return content is not None
+            except Exception:
+                return False
+
+    def exists(self, key: str) -> bool:
+        """
+        Check if a result record exists in storage.
+
+        Args:
+            key: The key to check for the existence of a result record.
+
+        Returns:
+            bool: True if the result record exists, False otherwise.
+        """
+        return self._exists(key=key, _sync=True)
+
+    async def aexists(self, key: str) -> bool:
+        """
+        Check if a result record exists in storage.
+
+        Args:
+            key: The key to check for the existence of a result record.
+
+        Returns:
+            bool: True if the result record exists, False otherwise.
+        """
+        return await self._exists(key=key, _sync=False)
+
+    @sync_compatible
+    async def _read(self, key: str, holder: str) -> "ResultRecord":
+        """
+        Read a result record from storage.
+
+        This is the internal implementation. Use `read` or `aread` for synchronous and
+        asynchronous result reading respectively.
+
+        Args:
+            key: The key to read the result record from.
+            holder: The holder of the lock if a lock was set on the record.
+
+        Returns:
+            A result record.
+        """
+        if self.lock_manager is not None and not self.is_lock_holder(key, holder):
+            await self.await_for_lock(key)
+
+        if self.result_storage is None:
+            self.result_storage = await get_default_result_storage()
+
+        if self.metadata_storage is not None:
+            metadata_content = await self.metadata_storage.read_path(key)
+            metadata = ResultRecordMetadata.load_bytes(metadata_content)
+            assert (
+                metadata.storage_key is not None
+            ), "Did not find storage key in metadata"
+            result_content = await self.result_storage.read_path(metadata.storage_key)
+            return ResultRecord.deserialize_from_result_and_metadata(
+                result=result_content, metadata=metadata_content
             )
+        else:
+            content = await self.result_storage.read_path(key)
+            return ResultRecord.deserialize(content)
 
-    @classmethod
-    @inject_client
-    async def from_task(
-        cls: Type[Self], task: "Task", client: "PrefectClient" = None
-    ) -> Self:
+    def read(self, key: str, holder: Optional[str] = None) -> "ResultRecord":
         """
-        Create a new result factory for a task.
+        Read a result record from storage.
+
+        Args:
+            key: The key to read the result record from.
+            holder: The holder of the lock if a lock was set on the record.
+        Returns:
+            A result record.
         """
-        return await cls._from_task(task, get_default_result_storage, client=client)
+        holder = holder or self.generate_default_holder()
+        return self._read(key=key, holder=holder, _sync=True)
 
-    @classmethod
-    @inject_client
-    async def from_autonomous_task(
-        cls: Type[Self], task: "Task[P, R]", client: "PrefectClient" = None
-    ) -> Self:
+    async def aread(self, key: str, holder: Optional[str] = None) -> "ResultRecord":
         """
-        Create a new result factory for an autonomous task.
+        Read a result record from storage.
+
+        Args:
+            key: The key to read the result record from.
+            holder: The holder of the lock if a lock was set on the record.
+        Returns:
+            A result record.
         """
-        return await cls._from_task(
-            task, get_or_create_default_task_scheduling_storage, client=client
+        holder = holder or self.generate_default_holder()
+        return await self._read(key=key, holder=holder, _sync=False)
+
+    def create_result_record(
+        self,
+        key: str,
+        obj: Any,
+        expiration: Optional[DateTime] = None,
+    ):
+        """
+        Create a result record.
+
+        Args:
+            key: The key to create the result record for.
+            obj: The object to create the result record for.
+            expiration: The expiration time for the result record.
+        """
+        key = key or self.storage_key_fn()
+
+        return ResultRecord(
+            result=obj,
+            metadata=ResultRecordMetadata(
+                serializer=self.serializer,
+                expiration=expiration,
+                storage_key=key,
+                storage_block_id=self.result_storage_block_id,
+            ),
         )
 
-    @classmethod
-    @inject_client
-    async def _from_task(
-        cls: Type[Self],
-        task: "Task",
-        default_storage_getter: Callable[[], Awaitable[ResultStorage]],
-        client: "PrefectClient" = None,
-    ) -> Self:
-        from prefect.context import FlowRunContext
-
-        ctx = FlowRunContext.get()
-
-        result_storage = task.result_storage or (
-            ctx.result_factory.storage_block
-            if ctx and ctx.result_factory
-            else await default_storage_getter()
+    def write(
+        self,
+        key: str,
+        obj: Any,
+        expiration: Optional[DateTime] = None,
+        holder: Optional[str] = None,
+    ):
+        """
+        Write a result to storage.
+
+        Handles the creation of a `ResultRecord` and its serialization to storage.
+
+        Args:
+            key: The key to write the result record to.
+            obj: The object to write to storage.
+            expiration: The expiration time for the result record.
+            holder: The holder of the lock if a lock was set on the record.
+        """
+        holder = holder or self.generate_default_holder()
+        return self.persist_result_record(
+            result_record=self.create_result_record(
+                key=key, obj=obj, expiration=expiration
+            ),
+            holder=holder,
         )
-        result_serializer = task.result_serializer or (
-            ctx.result_factory.serializer
-            if ctx and ctx.result_factory
-            else get_default_result_serializer()
+
+    async def awrite(
+        self,
+        key: str,
+        obj: Any,
+        expiration: Optional[DateTime] = None,
+        holder: Optional[str] = None,
+    ):
+        """
+        Write a result to storage.
+
+        Args:
+            key: The key to write the result record to.
+            obj: The object to write to storage.
+            expiration: The expiration time for the result record.
+            holder: The holder of the lock if a lock was set on the record.
+        """
+        holder = holder or self.generate_default_holder()
+        return await self.apersist_result_record(
+            result_record=self.create_result_record(
+                key=key, obj=obj, expiration=expiration
+            ),
+            holder=holder,
         )
-        if task.persist_result is None:
-            persist_result = (
-                ctx.result_factory.persist_result
-                if ctx and ctx.result_factory
-                else get_default_persist_setting()
+
+    @sync_compatible
+    async def _persist_result_record(self, result_record: "ResultRecord", holder: str):
+        """
+        Persist a result record to storage.
+
+        Args:
+            result_record: The result record to persist.
+            holder: The holder of the lock if a lock was set on the record.
+        """
+        assert (
+            result_record.metadata.storage_key is not None
+        ), "Storage key is required on result record"
+
+        key = result_record.metadata.storage_key
+        if (
+            self.lock_manager is not None
+            and self.is_locked(key)
+            and not self.is_lock_holder(key, holder)
+        ):
+            raise RuntimeError(
+                f"Cannot write to result record with key {key} because it is locked by "
+                f"another holder."
+            )
+        if self.result_storage is None:
+            self.result_storage = await get_default_result_storage()
+
+        # If metadata storage is configured, write result and metadata separately
+        if self.metadata_storage is not None:
+            await self.result_storage.write_path(
+                result_record.metadata.storage_key,
+                content=result_record.serialize_result(),
             )
+            await self.metadata_storage.write_path(
+                result_record.metadata.storage_key,
+                content=result_record.serialize_metadata(),
+            )
+        # Otherwise, write the result metadata and result together
         else:
-            persist_result = task.persist_result
-
-        cache_result_in_memory = task.cache_result_in_memory
-
-        return await cls.from_settings(
-            result_storage=result_storage,
-            result_serializer=result_serializer,
-            persist_result=persist_result,
-            cache_result_in_memory=cache_result_in_memory,
-            client=client,
-            storage_key_fn=(
-                partial(_format_user_supplied_storage_key, task.result_storage_key)
-                if task.result_storage_key is not None
-                else DEFAULT_STORAGE_KEY_FN
-            ),
-        )
+            await self.result_storage.write_path(
+                result_record.metadata.storage_key, content=result_record.serialize()
+            )
 
-    @classmethod
-    @inject_client
-    async def from_settings(
-        cls: Type[Self],
-        result_storage: ResultStorage,
-        result_serializer: ResultSerializer,
-        persist_result: Optional[bool],
-        cache_result_in_memory: bool,
-        storage_key_fn: Callable[[], str],
-        client: "PrefectClient",
-    ) -> Self:
-        if persist_result is None:
-            persist_result = get_default_persist_setting()
+    def persist_result_record(
+        self, result_record: "ResultRecord", holder: Optional[str] = None
+    ):
+        """
+        Persist a result record to storage.
 
-        storage_block_id, storage_block = await cls.resolve_storage_block(
-            result_storage, client=client, persist_result=persist_result
+        Args:
+            result_record: The result record to persist.
+        """
+        holder = holder or self.generate_default_holder()
+        return self._persist_result_record(
+            result_record=result_record, holder=holder, _sync=True
         )
-        serializer = cls.resolve_serializer(result_serializer)
 
-        return cls(
-            storage_block=storage_block,
-            storage_block_id=storage_block_id,
-            serializer=serializer,
-            persist_result=persist_result,
-            cache_result_in_memory=cache_result_in_memory,
-            storage_key_fn=storage_key_fn,
+    async def apersist_result_record(
+        self, result_record: "ResultRecord", holder: Optional[str] = None
+    ):
+        """
+        Persist a result record to storage.
+
+        Args:
+            result_record: The result record to persist.
+        """
+        holder = holder or self.generate_default_holder()
+        return await self._persist_result_record(
+            result_record=result_record, holder=holder, _sync=False
         )
 
-    @staticmethod
-    async def resolve_storage_block(
-        result_storage: ResultStorage,
-        client: "PrefectClient",
-        persist_result: bool = True,
-    ) -> Tuple[Optional[uuid.UUID], WritableFileSystem]:
-        """
-        Resolve one of the valid `ResultStorage` input types into a saved block
-        document id and an instance of the block.
-        """
-        if isinstance(result_storage, Block):
-            storage_block = result_storage
-
-            if storage_block._block_document_id is not None:
-                # Avoid saving the block if it already has an identifier assigned
-                storage_block_id = storage_block._block_document_id
-            else:
-                storage_block_id = None
-        elif isinstance(result_storage, str):
-            storage_block = await Block.load(result_storage, client=client)
-            storage_block_id = storage_block._block_document_id
-            assert storage_block_id is not None, "Loaded storage blocks must have ids"
+    def supports_isolation_level(self, level: "IsolationLevel") -> bool:
+        """
+        Check if the result store supports a given isolation level.
+
+        Args:
+            level: The isolation level to check.
+
+        Returns:
+            bool: True if the isolation level is supported, False otherwise.
+        """
+        from prefect.transactions import IsolationLevel
+
+        if level == IsolationLevel.READ_COMMITTED:
+            return True
+        elif level == IsolationLevel.SERIALIZABLE:
+            return self.lock_manager is not None
         else:
-            raise TypeError(
-                "Result storage must be one of the following types: 'UUID', 'Block', "
-                f"'str'. Got unsupported type {type(result_storage).__name__!r}."
+            raise ValueError(f"Unsupported isolation level: {level}")
+
+    def acquire_lock(
+        self, key: str, holder: Optional[str] = None, timeout: Optional[float] = None
+    ) -> bool:
+        """
+        Acquire a lock for a result record.
+
+        Args:
+            key: The key to acquire the lock for.
+            holder: The holder of the lock. If not provided, a default holder based on the
+                current host, process, and thread will be used.
+            timeout: The timeout for the lock.
+
+        Returns:
+            bool: True if the lock was successfully acquired; False otherwise.
+        """
+        holder = holder or self.generate_default_holder()
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
             )
+        return self.lock_manager.acquire_lock(key, holder, timeout)
 
-        return storage_block_id, storage_block
+    async def aacquire_lock(
+        self, key: str, holder: Optional[str] = None, timeout: Optional[float] = None
+    ) -> bool:
+        """
+        Acquire a lock for a result record.
 
-    @staticmethod
-    def resolve_serializer(serializer: ResultSerializer) -> Serializer:
+        Args:
+            key: The key to acquire the lock for.
+            holder: The holder of the lock. If not provided, a default holder based on the
+                current host, process, and thread will be used.
+            timeout: The timeout for the lock.
+
+        Returns:
+            bool: True if the lock was successfully acquired; False otherwise.
         """
-        Resolve one of the valid `ResultSerializer` input types into a serializer
-        instance.
+        holder = holder or self.generate_default_holder()
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
+            )
+
+        return await self.lock_manager.aacquire_lock(key, holder, timeout)
+
+    def release_lock(self, key: str, holder: Optional[str] = None):
         """
-        if isinstance(serializer, Serializer):
-            return serializer
-        elif isinstance(serializer, str):
-            return Serializer(type=serializer)
-        else:
-            raise TypeError(
-                "Result serializer must be one of the following types: 'Serializer', "
-                f"'str'. Got unsupported type {type(serializer).__name__!r}."
+        Release a lock for a result record.
+
+        Args:
+            key: The key to release the lock for.
+            holder: The holder of the lock. Must match the holder that acquired the lock.
+                If not provided, a default holder based on the current host, process, and
+                thread will be used.
+        """
+        holder = holder or self.generate_default_holder()
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
+            )
+        return self.lock_manager.release_lock(key, holder)
+
+    def is_locked(self, key: str) -> bool:
+        """
+        Check if a result record is locked.
+        """
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
+            )
+        return self.lock_manager.is_locked(key)
+
+    def is_lock_holder(self, key: str, holder: Optional[str] = None) -> bool:
+        """
+        Check if the current holder is the lock holder for the result record.
+
+        Args:
+            key: The key to check the lock for.
+            holder: The holder of the lock. If not provided, a default holder based on the
+                current host, process, and thread will be used.
+
+        Returns:
+            bool: True if the current holder is the lock holder; False otherwise.
+        """
+        holder = holder or self.generate_default_holder()
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
+            )
+        return self.lock_manager.is_lock_holder(key, holder)
+
+    def wait_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+        """
+        Wait for the corresponding transaction record to become free.
+        """
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
             )
+        return self.lock_manager.wait_for_lock(key, timeout)
+
+    async def await_for_lock(self, key: str, timeout: Optional[float] = None) -> bool:
+        """
+        Wait for the corresponding transaction record to become free.
+        """
+        if self.lock_manager is None:
+            raise ConfigurationError(
+                "Result store is not configured with a lock manager. Please set"
+                " a lock manager when creating the result store to enable locking."
+            )
+        return await self.lock_manager.await_for_lock(key, timeout)
 
     @sync_compatible
     async def create_result(
@@ -332,22 +677,13 @@ class ResultFactory(BaseModel):
         obj: R,
         key: Optional[str] = None,
         expiration: Optional[DateTime] = None,
-        defer_persistence: bool = False,
     ) -> Union[R, "BaseResult[R]"]:
         """
-        Create a result type for the given object.
-
-        If persistence is disabled, the object is wrapped in an `UnpersistedResult` and
-        returned.
-
-        If persistence is enabled the object is serialized, persisted to storage, and a reference is returned.
+        Create a `PersistedResult` for the given object.
         """
         # Null objects are "cached" in memory at no cost
         should_cache_object = self.cache_result_in_memory or obj is None
 
-        if not self.persist_result:
-            return await UnpersistedResult.create(obj, cache_object=should_cache_object)
-
         if key:
 
             def key_fn():
@@ -357,31 +693,225 @@ class ResultFactory(BaseModel):
         else:
             storage_key_fn = self.storage_key_fn
 
+        if self.result_storage is None:
+            self.result_storage = await get_default_result_storage()
+
         return await PersistedResult.create(
             obj,
-            storage_block=self.storage_block,
-            storage_block_id=self.storage_block_id,
+            storage_block=self.result_storage,
+            storage_block_id=self.result_storage_block_id,
             storage_key_fn=storage_key_fn,
             serializer=self.serializer,
             cache_object=should_cache_object,
             expiration=expiration,
-            defer_persistence=defer_persistence,
+            serialize_to_none=not self.persist_result,
         )
 
+    # TODO: These two methods need to find a new home
+
     @sync_compatible
     async def store_parameters(self, identifier: UUID, parameters: Dict[str, Any]):
-        data = self.serializer.dumps(parameters)
-        blob = PersistedResultBlob(serializer=self.serializer, data=data)
-        await self.storage_block.write_path(
-            f"parameters/{identifier}", content=blob.to_bytes()
+        record = ResultRecord(
+            result=parameters,
+            metadata=ResultRecordMetadata(
+                serializer=self.serializer, storage_key=str(identifier)
+            ),
+        )
+        await self.result_storage.write_path(
+            f"parameters/{identifier}", content=record.serialize()
         )
 
     @sync_compatible
     async def read_parameters(self, identifier: UUID) -> Dict[str, Any]:
-        blob = PersistedResultBlob.model_validate_json(
-            await self.storage_block.read_path(f"parameters/{identifier}")
+        record = ResultRecord.deserialize(
+            await self.result_storage.read_path(f"parameters/{identifier}")
+        )
+        return record.result
+
+
+def get_current_result_store() -> ResultStore:
+    """
+    Get the current result store.
+    """
+    from prefect.context import get_run_context
+
+    try:
+        run_context = get_run_context()
+    except MissingContextError:
+        result_store = ResultStore()
+    else:
+        result_store = run_context.result_store
+    return result_store
+
+
+class ResultRecordMetadata(BaseModel):
+    """
+    Metadata for a result record.
+    """
+
+    storage_key: Optional[str] = Field(
+        default=None
+    )  # optional for backwards compatibility
+    expiration: Optional[DateTime] = Field(default=None)
+    serializer: Serializer = Field(default_factory=PickleSerializer)
+    prefect_version: str = Field(default=prefect.__version__)
+    storage_block_id: Optional[uuid.UUID] = Field(default=None)
+
+    def dump_bytes(self) -> bytes:
+        """
+        Serialize the metadata to bytes.
+
+        Returns:
+            bytes: the serialized metadata
+        """
+        return self.model_dump_json(serialize_as_any=True).encode()
+
+    @classmethod
+    def load_bytes(cls, data: bytes) -> "ResultRecordMetadata":
+        """
+        Deserialize metadata from bytes.
+
+        Args:
+            data: the serialized metadata
+
+        Returns:
+            ResultRecordMetadata: the deserialized metadata
+        """
+        return cls.model_validate_json(data)
+
+
+class ResultRecord(BaseModel, Generic[R]):
+    """
+    A record of a result.
+    """
+
+    metadata: ResultRecordMetadata
+    result: R
+
+    @property
+    def expiration(self) -> Optional[DateTime]:
+        return self.metadata.expiration
+
+    @property
+    def serializer(self) -> Serializer:
+        return self.metadata.serializer
+
+    def serialize_result(self) -> bytes:
+        try:
+            data = self.serializer.dumps(self.result)
+        except Exception as exc:
+            extra_info = (
+                'You can try a different serializer (e.g. result_serializer="json") '
+                "or disabling persistence (persist_result=False) for this flow or task."
+            )
+            # check if this is a known issue with cloudpickle and pydantic
+            # and add extra information to help the user recover
+
+            if (
+                isinstance(exc, TypeError)
+                and isinstance(self.result, BaseModel)
+                and str(exc).startswith("cannot pickle")
+            ):
+                try:
+                    from IPython import get_ipython
+
+                    if get_ipython() is not None:
+                        extra_info = inspect.cleandoc(
+                            """
+                            This is a known issue in Pydantic that prevents
+                            locally-defined (non-imported) models from being
+                            serialized by cloudpickle in IPython/Jupyter
+                            environments. Please see
+                            https://github.com/pydantic/pydantic/issues/8232 for
+                            more information. To fix the issue, either: (1) move
+                            your Pydantic class definition to an importable
+                            location, (2) use the JSON serializer for your flow
+                            or task (`result_serializer="json"`), or (3)
+                            disable result persistence for your flow or task
+                            (`persist_result=False`).
+                            """
+                        ).replace("\n", " ")
+                except ImportError:
+                    pass
+            raise SerializationError(
+                f"Failed to serialize object of type {type(self.result).__name__!r} with "
+                f"serializer {self.serializer.type!r}. {extra_info}"
+            ) from exc
+
+        return data
+
+    @model_validator(mode="before")
+    @classmethod
+    def coerce_old_format(cls, value: Any):
+        if isinstance(value, dict):
+            if "data" in value:
+                value["result"] = value.pop("data")
+            if "metadata" not in value:
+                value["metadata"] = {}
+            if "expiration" in value:
+                value["metadata"]["expiration"] = value.pop("expiration")
+            if "serializer" in value:
+                value["metadata"]["serializer"] = value.pop("serializer")
+            if "prefect_version" in value:
+                value["metadata"]["prefect_version"] = value.pop("prefect_version")
+        return value
+
+    def serialize_metadata(self) -> bytes:
+        return self.metadata.dump_bytes()
+
+    def serialize(
+        self,
+    ) -> bytes:
+        """
+        Serialize the record to bytes.
+
+        Returns:
+            bytes: the serialized record
+
+        """
+        return (
+            self.model_copy(update={"result": self.serialize_result()})
+            .model_dump_json(serialize_as_any=True)
+            .encode()
+        )
+
+    @classmethod
+    def deserialize(cls, data: bytes) -> "ResultRecord[R]":
+        """
+        Deserialize a record from bytes.
+
+        Args:
+            data: the serialized record
+
+        Returns:
+            ResultRecord: the deserialized record
+        """
+        instance = cls.model_validate_json(data)
+        if isinstance(instance.result, bytes):
+            instance.result = instance.serializer.loads(instance.result)
+        elif isinstance(instance.result, str):
+            instance.result = instance.serializer.loads(instance.result.encode())
+        return instance
+
+    @classmethod
+    def deserialize_from_result_and_metadata(
+        cls, result: bytes, metadata: bytes
+    ) -> "ResultRecord[R]":
+        """
+        Deserialize a record from separate result and metadata bytes.
+
+        Args:
+            result: the result
+            metadata: the serialized metadata
+
+        Returns:
+            ResultRecord: the deserialized record
+        """
+        result_record_metadata = ResultRecordMetadata.load_bytes(metadata)
+        return cls(
+            metadata=result_record_metadata,
+            result=result_record_metadata.serializer.loads(result),
         )
-        return self.serializer.loads(blob.data)
 
 
 @register_base_type
@@ -390,7 +920,9 @@ class BaseResult(BaseModel, abc.ABC, Generic[R]):
     type: str
 
     def __init__(self, **data: Any) -> None:
-        type_string = get_dispatch_key(self) if type(self) != BaseResult else "__base__"
+        type_string = (
+            get_dispatch_key(self) if type(self) is not BaseResult else "__base__"
+        )
         data.setdefault("type", type_string)
         super().__init__(**data)
 
@@ -432,40 +964,12 @@ class BaseResult(BaseModel, abc.ABC, Generic[R]):
         return cls.__name__ if isinstance(default, PydanticUndefinedType) else default
 
 
-class UnpersistedResult(BaseResult):
-    """
-    Result type for results that are not persisted outside of local memory.
-    """
-
-    type: str = "unpersisted"
-
-    @sync_compatible
-    async def get(self) -> R:
-        if self.has_cached_object():
-            return self._cache
-
-        raise MissingResult("The result was not persisted and is no longer available.")
-
-    @classmethod
-    @sync_compatible
-    async def create(
-        cls: "Type[UnpersistedResult]",
-        obj: R,
-        cache_object: bool = True,
-    ) -> "UnpersistedResult[R]":
-        result = cls()
-        # Only store the object in local memory, it will not be sent to the API
-        if cache_object:
-            result._cache_object(obj)
-        return result
-
-
 class PersistedResult(BaseResult):
     """
     Result type which stores a reference to a persisted result.
 
     When created, the user's object is serialized and stored. The format for the content
-    is defined by `PersistedResultBlob`. This reference contains metadata necessary for retrieval
+    is defined by `ResultRecord`. This reference contains metadata necessary for retrieval
     of the object, such as a reference to the storage block and the key where the
     content was written.
     """
@@ -476,12 +980,19 @@ class PersistedResult(BaseResult):
     storage_key: str
     storage_block_id: Optional[uuid.UUID] = None
     expiration: Optional[DateTime] = None
+    serialize_to_none: bool = False
 
-    _should_cache_object: bool = PrivateAttr(default=True)
     _persisted: bool = PrivateAttr(default=False)
+    _should_cache_object: bool = PrivateAttr(default=True)
     _storage_block: WritableFileSystem = PrivateAttr(default=None)
     _serializer: Serializer = PrivateAttr(default=None)
 
+    @model_serializer(mode="wrap")
+    def serialize_model(self, handler, info):
+        if self.serialize_to_none:
+            return None
+        return handler(self, info)
+
     def _cache_object(
         self,
         obj: Any,
@@ -505,28 +1016,28 @@ class PersistedResult(BaseResult):
 
     @sync_compatible
     @inject_client
-    async def get(self, client: "PrefectClient") -> R:
+    async def get(
+        self, ignore_cache: bool = False, client: "PrefectClient" = None
+    ) -> R:
         """
         Retrieve the data and deserialize it into the original object.
         """
-        if self.has_cached_object():
+        if self.has_cached_object() and not ignore_cache:
             return self._cache
 
-        blob = await self._read_blob(client=client)
-        obj = blob.load()
-        self.expiration = blob.expiration
+        result_store_kwargs = {}
+        if self._serializer:
+            result_store_kwargs["serializer"] = resolve_serializer(self._serializer)
+        storage_block = await self._get_storage_block(client=client)
+        result_store = ResultStore(result_storage=storage_block, **result_store_kwargs)
+
+        record = await result_store.aread(self.storage_key)
+        self.expiration = record.expiration
 
         if self._should_cache_object:
-            self._cache_object(obj)
-
-        return obj
+            self._cache_object(record.result)
 
-    @inject_client
-    async def _read_blob(self, client: "PrefectClient") -> "PersistedResultBlob":
-        block = await self._get_storage_block(client=client)
-        content = await block.read_path(self.storage_key)
-        blob = PersistedResultBlob.model_validate_json(content)
-        return blob
+        return record.result
 
     @staticmethod
     def _infer_path(storage_block, key) -> str:
@@ -547,7 +1058,7 @@ class PersistedResult(BaseResult):
         Write the result to the storage block.
         """
 
-        if self._persisted:
+        if self._persisted or self.serialize_to_none:
             # don't double write or overwrite
             return
 
@@ -567,50 +1078,11 @@ class PersistedResult(BaseResult):
             # this could error if the serializer requires kwargs
             serializer = Serializer(type=self.serializer_type)
 
-        try:
-            data = serializer.dumps(obj)
-        except Exception as exc:
-            extra_info = (
-                'You can try a different serializer (e.g. result_serializer="json") '
-                "or disabling persistence (persist_result=False) for this flow or task."
-            )
-            # check if this is a known issue with cloudpickle and pydantic
-            # and add extra information to help the user recover
-
-            if (
-                isinstance(exc, TypeError)
-                and isinstance(obj, BaseModel)
-                and str(exc).startswith("cannot pickle")
-            ):
-                try:
-                    from IPython import get_ipython
-
-                    if get_ipython() is not None:
-                        extra_info = inspect.cleandoc(
-                            """
-                            This is a known issue in Pydantic that prevents
-                            locally-defined (non-imported) models from being
-                            serialized by cloudpickle in IPython/Jupyter
-                            environments. Please see
-                            https://github.com/pydantic/pydantic/issues/8232 for
-                            more information. To fix the issue, either: (1) move
-                            your Pydantic class definition to an importable
-                            location, (2) use the JSON serializer for your flow
-                            or task (`result_serializer="json"`), or (3)
-                            disable result persistence for your flow or task
-                            (`persist_result=False`).
-                            """
-                        ).replace("\n", " ")
-                except ImportError:
-                    pass
-            raise ValueError(
-                f"Failed to serialize object of type {type(obj).__name__!r} with "
-                f"serializer {serializer.type!r}. {extra_info}"
-            ) from exc
-        blob = PersistedResultBlob(
-            serializer=serializer, data=data, expiration=self.expiration
+        result_store = ResultStore(result_storage=storage_block, serializer=serializer)
+        await result_store.awrite(
+            obj=obj, key=self.storage_key, expiration=self.expiration
         )
-        await storage_block.write_path(self.storage_key, content=blob.to_bytes())
+
         self._persisted = True
 
         if not self._should_cache_object:
@@ -627,7 +1099,7 @@ class PersistedResult(BaseResult):
         storage_block_id: Optional[uuid.UUID] = None,
         cache_object: bool = True,
         expiration: Optional[DateTime] = None,
-        defer_persistence: bool = False,
+        serialize_to_none: bool = False,
     ) -> "PersistedResult[R]":
         """
         Create a new result reference from a user's object.
@@ -651,24 +1123,13 @@ class PersistedResult(BaseResult):
             storage_block_id=storage_block_id,
             storage_key=key,
             expiration=expiration,
+            serialize_to_none=serialize_to_none,
         )
 
-        if cache_object and not defer_persistence:
-            # Attach the object to the result so it's available without deserialization
-            result._cache_object(
-                obj, storage_block=storage_block, serializer=serializer
-            )
-
         object.__setattr__(result, "_should_cache_object", cache_object)
-
-        if not defer_persistence:
-            await result.write(obj=obj)
-        else:
-            # we must cache temporarily to allow for writing later
-            # the cache will be removed on write
-            result._cache_object(
-                obj, storage_block=storage_block, serializer=serializer
-            )
+        # we must cache temporarily to allow for writing later
+        # the cache will be removed on write
+        result._cache_object(obj, storage_block=storage_block, serializer=serializer)
 
         return result
 
@@ -682,59 +1143,3 @@ class PersistedResult(BaseResult):
             and self.storage_block_id == other.storage_block_id
             and self.expiration == other.expiration
         )
-
-
-class PersistedResultBlob(BaseModel):
-    """
-    The format of the content stored by a persisted result.
-
-    Typically, this is written to a file as bytes.
-    """
-
-    serializer: Serializer
-    data: bytes
-    prefect_version: str = Field(default=prefect.__version__)
-    expiration: Optional[DateTime] = None
-
-    def load(self) -> Any:
-        return self.serializer.loads(self.data)
-
-    def to_bytes(self) -> bytes:
-        return self.model_dump_json(serialize_as_any=True).encode()
-
-
-class UnknownResult(BaseResult):
-    """
-    Result type for unknown results. Typically used to represent the result
-    of tasks that were forced from a failure state into a completed state.
-
-    The value for this result is always None and is not persisted to external
-    result storage, but orchestration treats the result the same as persisted
-    results when determining orchestration rules, such as whether to rerun a
-    completed task.
-    """
-
-    type: str = "unknown"
-    value: None
-
-    def has_cached_object(self) -> bool:
-        # This result type always has the object cached in memory
-        return True
-
-    @sync_compatible
-    async def get(self) -> R:
-        return self.value
-
-    @classmethod
-    @sync_compatible
-    async def create(
-        cls: "Type[UnknownResult]",
-        obj: R = None,
-    ) -> "UnknownResult[R]":
-        if obj is not None:
-            raise TypeError(
-                f"Unsupported type {type(obj).__name__!r} for unknown result. "
-                "Only None is supported."
-            )
-
-        return cls(value=obj)