Update dependencies

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "uv_build"
 [project]
 name = "draive"
 description = "Framework designed to simplify and accelerate the development of LLM-based applications."
-version = "0.95.1"
+version = "0.96.0"
 readme = "README.md"
 maintainers = [
   { name = "Kacper Kaliński", email = "kacper.kalinski@miquido.com" },
@@ -24,25 +24,25 @@ classifiers = [
   "Topic :: Software Development :: Libraries :: Application Frameworks",
 ]
 license = { file = "LICENSE" }
-dependencies = ["numpy~=2.3", "haiway~=0.40.2"]
+dependencies = ["numpy~=2.3", "haiway~=0.42"]
 
 [project.urls]
 Homepage = "https://miquido.com"
 Repository = "https://github.com/miquido/draive.git"
 
 [project.optional-dependencies]
-cohere = ["cohere~=5.18"]
-cohere_bedrock = ["cohere~=5.18", "boto3~=1.40"]
-openai = ["openai~=2.8"]
-openai_realtime = ["openai[realtime]~=2.8"]
-anthropic = ["anthropic~=0.72"]
-anthropic_bedrock = ["anthropic[bedrock]~=0.72"]
-mistral = ["mistralai~=1.9"]
+cohere = ["cohere~=5.20"]
+cohere_bedrock = ["cohere~=5.20", "boto3~=1.41"]
+openai = ["openai~=2.9"]
+openai_realtime = ["openai[realtime]~=2.9"]
+anthropic = ["anthropic~=0.75"]
+anthropic_bedrock = ["anthropic[bedrock]~=0.75"]
+mistral = ["mistralai~=1.10"]
 gemini = ["google-genai~=1.50", "google-api-core"]
-ollama = ["ollama~=0.6.0"]
-bedrock = ["boto3~=1.40"]
-aws = ["boto3~=1.40"]
-vllm = ["openai~=2.8"]
+ollama = ["ollama~=0.6.1"]
+bedrock = ["boto3~=1.41"]
+aws = ["boto3~=1.41"]
+vllm = ["openai~=2.9"]
 mcp = ["mcp~=1.21"]
 opentelemetry = [
   "haiway[opentelemetry]",

src/draive/__init__.py

@@ -12,13 +12,14 @@
     ConfigurationInvalid,
     ConfigurationMissing,
     ConfigurationRepository,
-    ContextPreset,
+    ContextIdentifier,
+    ContextMissing,
+    ContextPresets,
+    ContextStateMissing,
     Default,
     DefaultValue,
     Description,
     Disposable,
-    Disposables,
-    EventSubscription,
     File,
     FileAccess,
     HTTPClient,
@@ -34,17 +35,11 @@
     MetaTags,
     MetaValues,
     Missing,
-    MissingContext,
-    MissingState,
     Observability,
     ObservabilityAttribute,
-    ObservabilityContext,
     ObservabilityLevel,
-    ScopeContext,
-    ScopeIdentifier,
     Specification,
     State,
-    StateContext,
     TypeSpecification,
     Validating,
     ValidationError,
@@ -227,7 +222,10 @@
     "ConfigurationInvalid",
     "ConfigurationMissing",
     "ConfigurationRepository",
-    "ContextPreset",
+    "ContextIdentifier",
+    "ContextMissing",
+    "ContextPresets",
+    "ContextStateMissing",
     "Conversation",
     "ConversationEvent",
     "ConversationInputChunk",
@@ -238,9 +236,7 @@
     "DefaultValue",
     "Description",
     "Disposable",
-    "Disposables",
     "Embedded",
-    "EventSubscription",
     "File",
     "FileAccess",
     "FunctionTool",
@@ -275,8 +271,6 @@
     "MetaValues",
     "MimeType",
     "Missing",
-    "MissingContext",
-    "MissingState",
     "ModelContext",
     "ModelContextElement",
     "ModelException",
@@ -320,7 +314,6 @@
     "MultimodalTag",
     "Observability",
     "ObservabilityAttribute",
-    "ObservabilityContext",
     "ObservabilityLevel",
     "RealtimeConversation",
     "RealtimeConversationSession",
@@ -339,14 +332,11 @@
     "ResourceTemplate",
     "ResourceUploading",
     "ResourcesRepository",
-    "ScopeContext",
-    "ScopeIdentifier",
     "Specification",
     "Stage",
     "StageException",
     "StageState",
     "State",
-    "StateContext",
     "Template",
     "TemplateDeclaration",
     "TemplateMissing",

src/draive/mcp/server.py

@@ -36,40 +36,26 @@ def __init__(
         name: str,
         version: str | None = None,
         instructions: str | None = None,
-        resources: Iterable[ResourceTemplate[Any] | Resource] | None = None,
-        tools: Toolbox | Iterable[Tool] | None = None,
-        disposables: Disposables | Collection[Disposable] | None = None,
+        resources: Iterable[ResourceTemplate[Any] | Resource] = (),
+        tools: Toolbox | Iterable[Tool] = (),
+        disposables: Collection[Disposable] = (),
     ) -> None:
-        disposable: Disposables
-        if disposables is None:
-            disposable = Disposables(())
-
-        elif isinstance(disposables, Disposables):
-            disposable = disposables
-
-        else:
-            disposable = Disposables(disposables)
-
         @asynccontextmanager
         async def lifspan(server: Server) -> AsyncGenerator[Iterable[State]]:
-            state: Iterable[State] = await disposable.prepare()
-            try:
+            async with Disposables(disposables) as state:
                 yield state
 
-            finally:
-                await disposable.dispose()
-
         self._server = Server[Iterable[State]](
             name=name,
             version=version,
             instructions=instructions,
             lifespan=lifspan,
         )
 
-        if resources is not None:
+        if resources:
             self._expose_resources(resources)
 
-        if tools is not None:
+        if tools:
             self._expose_tools(tools)
 
     async def run_stdio(

src/draive/resources/http.py

@@ -42,7 +42,7 @@ async def http_resource_fetching(
         await response.body(),
         mime_type=response.headers.get(
             "Content-Type",
-            default="application/octet-stream",
+            "application/octet-stream",
         ),
     )
 

src/draive/stages/stage.py

@@ -1467,7 +1467,7 @@ def with_ctx(
         self,
         /,
         *,
-        disposables: Disposables | Collection[Disposable],
+        disposables: Collection[Disposable],
     ) -> Self: ...
 
     @overload
@@ -1478,12 +1478,12 @@ def with_ctx(
         *state: State,
     ) -> Self: ...
 
-    def with_ctx(  # noqa: C901
+    def with_ctx(
         self,
         state: State | None = None,
         /,
         *states: State,
-        disposables: Disposables | Collection[Disposable] | None = None,
+        disposables: Collection[Disposable] = (),
     ) -> Self:
         """
         Apply the specified state context to this stage.
@@ -1502,7 +1502,7 @@ def with_ctx(  # noqa: C901
             Optional additional `State` objects to include in the state context.
             Only applicable when `state_context` is a `State`.
 
-        disposables: Disposables | Collection[Disposable] | None
+        disposables: Collection[Disposable]
             Optional Disposables which will be used for execution of this stage.
             State produced by disposables will be used within the context state.
 
@@ -1513,47 +1513,17 @@ def with_ctx(  # noqa: C901
         """
         execution: StageExecution = self._execution
 
-        resolved_disposables: Disposables | None
-        if disposables is None:
-            resolved_disposables = None
-
-        elif isinstance(disposables, Disposables):
-            resolved_disposables = disposables
-
-        else:
-            resolved_disposables = Disposables(disposables)
-
-        match (state, resolved_disposables):
-            case (None, None):
-                assert not states  # nosec: B101
-                return self  # nothing to change...
-
-            case (None, ctx_disposables):
-                assert not states  # nosec: B101
+        if ctx_state := state:
+            if disposables:
 
                 async def stage(
                     *,
                     state: StageState,
                 ) -> StageState:
-                    result_state: StageState
-                    try:
-                        with ctx.updated(*await ctx_disposables.prepare()):
-                            result_state = await execution(state=state)
-
-                    except BaseException as exc:
-                        await ctx_disposables.dispose(
-                            exc_type=type(exc),
-                            exc_val=exc,
-                            exc_tb=exc.__traceback__,
-                        )
-                        raise exc
-
-                    else:
-                        await ctx_disposables.dispose()
-
-                    return result_state
-
-            case (ctx_state, None):
+                    async with Disposables(disposables) as disposable_state:
+                        with ctx.updated(*disposable_state, ctx_state, *states):
+                            return await execution(state=state)
+            else:
 
                 async def stage(
                     *,
@@ -1562,30 +1532,18 @@ async def stage(
                     with ctx.updated(ctx_state, *states):
                         return await execution(state=state)
 
-            case (ctx_state, ctx_disposables):
-
-                async def stage(
-                    *,
-                    state: StageState,
-                ) -> StageState:
-                    disposables_state: Iterable[State] = await ctx_disposables.prepare()
-                    result_state: StageState
-                    try:
-                        with ctx.updated(ctx_state, *disposables_state, *states):
-                            result_state = await execution(state=state)
-
-                    except BaseException as exc:
-                        await ctx_disposables.dispose(
-                            exc_type=type(exc),
-                            exc_val=exc,
-                            exc_tb=exc.__traceback__,
-                        )
-                        raise exc
-
-                    else:
-                        await ctx_disposables.dispose()
+        elif disposables:
+            assert not states  # nosec: B101
 
-                    return result_state
+            async def stage(
+                *,
+                state: StageState,
+            ) -> StageState:
+                async with ctx.disposables(*disposables):
+                    return await execution(state=state)
+        else:
+            assert not states  # nosec: B101
+            return self  # nothing to change...
 
         return self.__class__(
             stage,

src/draive/stages/types.py

@@ -1,7 +1,7 @@
 from collections.abc import Mapping, Sequence
 from typing import Any, Literal, Protocol, Self, cast, final, overload, runtime_checkable
 
-from haiway import Meta, MetaValues, MissingState, State
+from haiway import ContextStateMissing, Meta, MetaValues, State
 
 from draive.models import ModelContext, ModelOutput
 from draive.multimodal import Multimodal, MultimodalContent
@@ -179,7 +179,7 @@ def get[StateType: DataModel | State](
         default : StateType | None
             Default value to return if the state is not found.
         required : bool
-            If True, raises MissingState when the state is not found.
+            If True, raises ContextStateMissing when the state is not found.
 
         Returns
         -------
@@ -188,7 +188,7 @@ def get[StateType: DataModel | State](
 
         Raises
         ------
-        MissingState
+        ContextStateMissing
             When required=True and the state is not found.
         """
 
@@ -200,7 +200,7 @@ def get[StateType: DataModel | State](
             return default
 
         elif required:
-            raise MissingState(f"{state.__qualname__} is not available within stage state")
+            raise ContextStateMissing(f"{state.__qualname__} is not available within stage state")
 
         else:
             return None