Skip to content

fix(core): close session after cancelled initialization #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsusul wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(core): close session after cancelled initialization #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/toolbox-core/src/toolbox_core/mcp_transport/transport_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ async def close(self):
if self._init_task:
try:
await self._init_task
except Exception:
except (asyncio.CancelledError, Exception):
# If initialization failed, we can still try to close.
pass
if self._manage_session and self._session and not self._session.closed:
Expand Down
31 changes: 31 additions & 0 deletions packages/toolbox-core/tests/mcp_transport/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,37 @@ async def test_close_managed_session(self, mocker):
await transport.close()
mock_close.assert_called_once()

@pytest.mark.asyncio
async def test_close_managed_session_after_cancelled_initialization(self):
transport = ConcreteTransport("http://fake-server.com")
transport._init_task = asyncio.create_task(asyncio.sleep(0))
transport._init_task.cancel()

with pytest.raises(asyncio.CancelledError):
await transport._init_task

try:
await transport.close()
assert transport._session.closed
finally:
if not transport._session.closed:
await transport._session.close()

@pytest.mark.asyncio
async def test_close_managed_session_after_initialization_error(self):
async def fail_initialization():
raise RuntimeError("initialization failed")

transport = ConcreteTransport("http://fake-server.com")
transport._init_task = asyncio.create_task(fail_initialization())

try:
await transport.close()
assert transport._session.closed
finally:
if not transport._session.closed:
await transport._session.close()

@pytest.mark.asyncio
async def test_close_unmanaged_session(self):
mock_session = AsyncMock(spec=ClientSession)
Expand Down
Loading