Close unclosed resources in the whole project (#267)

* Close resources

* Close all resources

* Update pyproject.toml

* Close all resources

* Close all resources

* try now...

* try to ignore this

* try again

* try adding one more..

* try now

* try now

* revert ci changes
This commit is contained in:
Marcelo Trylesinski
2025-03-13 11:59:45 +01:00
committed by GitHub
parent 1691b905e2
commit 94d326dbf1
8 changed files with 64 additions and 11 deletions

View File

@@ -43,7 +43,9 @@ async def _default_list_roots_callback(
)
ClientResponse = TypeAdapter(types.ClientResult | types.ErrorData)
ClientResponse: TypeAdapter[types.ClientResult | types.ErrorData] = TypeAdapter(
types.ClientResult | types.ErrorData
)
class ClientSession(
@@ -219,7 +221,7 @@ class ClientSession(
)
async def call_tool(
self, name: str, arguments: dict | None = None
self, name: str, arguments: dict[str, Any] | None = None
) -> types.CallToolResult:
"""Send a tools/call request."""
return await self.send_request(
@@ -258,7 +260,9 @@ class ClientSession(
)
async def complete(
self, ref: types.ResourceReference | types.PromptReference, argument: dict
self,
ref: types.ResourceReference | types.PromptReference,
argument: dict[str, str],
) -> types.CompleteResult:
"""Send a completion/complete request."""
return await self.send_request(

View File

@@ -18,10 +18,10 @@ if TYPE_CHECKING:
class Tool(BaseModel):
"""Internal tool registration info."""
fn: Callable = Field(exclude=True)
fn: Callable[..., Any] = Field(exclude=True)
name: str = Field(description="Name of the tool")
description: str = Field(description="Description of what the tool does")
parameters: dict = Field(description="JSON schema for tool parameters")
parameters: dict[str, Any] = Field(description="JSON schema for tool parameters")
fn_metadata: FuncMetadata = Field(
description="Metadata about the function including a pydantic model for tool"
" arguments"
@@ -34,7 +34,7 @@ class Tool(BaseModel):
@classmethod
def from_function(
cls,
fn: Callable,
fn: Callable[..., Any],
name: str | None = None,
description: str | None = None,
context_kwarg: str | None = None,

View File

@@ -102,7 +102,9 @@ class FuncMetadata(BaseModel):
)
def func_metadata(func: Callable, skip_names: Sequence[str] = ()) -> FuncMetadata:
def func_metadata(
func: Callable[..., Any], skip_names: Sequence[str] = ()
) -> FuncMetadata:
"""Given a function, return metadata including a pydantic model representing its
signature.

View File

@@ -1,4 +1,5 @@
import logging
from contextlib import AsyncExitStack
from datetime import timedelta
from typing import Any, Callable, Generic, TypeVar
@@ -180,6 +181,7 @@ class BaseSession(
self._read_timeout_seconds = read_timeout_seconds
self._in_flight = {}
self._exit_stack = AsyncExitStack()
self._incoming_message_stream_writer, self._incoming_message_stream_reader = (
anyio.create_memory_object_stream[
RequestResponder[ReceiveRequestT, SendResultT]
@@ -187,6 +189,12 @@ class BaseSession(
| Exception
]()
)
self._exit_stack.push_async_callback(
lambda: self._incoming_message_stream_reader.aclose()
)
self._exit_stack.push_async_callback(
lambda: self._incoming_message_stream_writer.aclose()
)
async def __aenter__(self) -> Self:
self._task_group = anyio.create_task_group()
@@ -195,6 +203,7 @@ class BaseSession(
return self
async def __aexit__(self, exc_type, exc_val, exc_tb):
await self._exit_stack.aclose()
# Using BaseSession as a context manager should not block on exit (this
# would be very surprising behavior), so make sure to cancel the tasks
# in the task group.
@@ -222,6 +231,9 @@ class BaseSession(
](1)
self._response_streams[request_id] = response_stream
self._exit_stack.push_async_callback(lambda: response_stream.aclose())
self._exit_stack.push_async_callback(lambda: response_stream_reader.aclose())
jsonrpc_request = JSONRPCRequest(
jsonrpc="2.0",
id=request_id,