Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 00e72d24a6 | |||
| dc78d92e5b | |||
| 86891173b2 | |||
| 73b3d80026 | |||
| 26099d643d | |||
| ff3123a190 |
+1
-2
@@ -3,7 +3,7 @@ services:
|
|||||||
# https://hub.docker.com/_/mariadb
|
# https://hub.docker.com/_/mariadb
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
||||||
image: docker.io/library/mariadb:lts@sha256:404ebf26ed7a56fbab05c29f6f1e70188e5eadb51bba8cee8d355775776deb08
|
image: docker.io/library/mariadb:lts@sha256:6b848cb24fbbd87429917f6c4422ac53c343e85692eb0fef86553e99e4f422f3
|
||||||
restart: always
|
restart: always
|
||||||
command: --transaction-isolation=READ-COMMITTED
|
command: --transaction-isolation=READ-COMMITTED
|
||||||
volumes:
|
volumes:
|
||||||
@@ -69,7 +69,6 @@ services:
|
|||||||
|
|
||||||
mcp:
|
mcp:
|
||||||
build: .
|
build: .
|
||||||
command: ["--transport", "streamable-http"]
|
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
app:
|
app:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
+51
-3
@@ -9,6 +9,7 @@ import pytest
|
|||||||
from httpx import HTTPStatusError
|
from httpx import HTTPStatusError
|
||||||
from mcp import ClientSession
|
from mcp import ClientSession
|
||||||
from mcp.client.session import RequestContext
|
from mcp.client.session import RequestContext
|
||||||
|
from mcp.client.sse import sse_client
|
||||||
from mcp.client.streamable_http import streamablehttp_client
|
from mcp.client.streamable_http import streamablehttp_client
|
||||||
from mcp.types import ElicitRequestParams, ElicitResult, ErrorData
|
from mcp.types import ElicitRequestParams, ElicitResult, ErrorData
|
||||||
|
|
||||||
@@ -165,6 +166,51 @@ async def create_mcp_client_session(
|
|||||||
logger.debug(f"{client_name} client session cleaned up successfully")
|
logger.debug(f"{client_name} client session cleaned up successfully")
|
||||||
|
|
||||||
|
|
||||||
|
async def create_mcp_client_session_sse(
|
||||||
|
url: str,
|
||||||
|
token: str | None = None,
|
||||||
|
client_name: str = "MCP",
|
||||||
|
elicitation_callback: Any = None,
|
||||||
|
) -> AsyncGenerator[ClientSession, Any]:
|
||||||
|
"""
|
||||||
|
Factory function to create an MCP client session using SSE transport.
|
||||||
|
|
||||||
|
Similar to create_mcp_client_session but uses SSE transport instead of streamable-http.
|
||||||
|
Uses native async context managers to ensure correct LIFO cleanup order.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
url: MCP server URL (e.g., "http://localhost:8000/sse")
|
||||||
|
token: Optional OAuth access token for Bearer authentication
|
||||||
|
client_name: Client name for logging (e.g., "Basic MCP (SSE)")
|
||||||
|
elicitation_callback: Optional callback for handling elicitation requests
|
||||||
|
|
||||||
|
Yields:
|
||||||
|
Initialized MCP ClientSession
|
||||||
|
|
||||||
|
Note:
|
||||||
|
SSE transport is being deprecated in favor of streamable-http.
|
||||||
|
This function exists for compatibility testing only.
|
||||||
|
"""
|
||||||
|
logger.info(f"Creating SSE client for {client_name}")
|
||||||
|
|
||||||
|
# Prepare headers with OAuth token if provided
|
||||||
|
headers = {"Authorization": f"Bearer {token}"} if token else None
|
||||||
|
|
||||||
|
# Use native async with - Python ensures LIFO cleanup
|
||||||
|
# Cleanup order will be: ClientSession.__aexit__ -> sse_client.__aexit__
|
||||||
|
# Note: sse_client yields only (read_stream, write_stream), not 3 values like streamablehttp_client
|
||||||
|
async with sse_client(url, headers=headers) as (read_stream, write_stream):
|
||||||
|
async with ClientSession(
|
||||||
|
read_stream, write_stream, elicitation_callback=elicitation_callback
|
||||||
|
) as session:
|
||||||
|
await session.initialize()
|
||||||
|
logger.info(f"{client_name} client session initialized successfully")
|
||||||
|
yield session
|
||||||
|
|
||||||
|
# Cleanup happens automatically in LIFO order - no exception suppression needed
|
||||||
|
logger.debug(f"{client_name} client session cleaned up successfully")
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
async def nc_client(anyio_backend) -> AsyncGenerator[NextcloudClient, Any]:
|
async def nc_client(anyio_backend) -> AsyncGenerator[NextcloudClient, Any]:
|
||||||
"""
|
"""
|
||||||
@@ -203,12 +249,14 @@ async def nc_client(anyio_backend) -> AsyncGenerator[NextcloudClient, Any]:
|
|||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
async def nc_mcp_client(anyio_backend) -> AsyncGenerator[ClientSession, Any]:
|
async def nc_mcp_client(anyio_backend) -> AsyncGenerator[ClientSession, Any]:
|
||||||
"""
|
"""
|
||||||
Fixture to create an MCP client session for integration tests using streamable-http.
|
Fixture to create an MCP client session for integration tests using SSE transport.
|
||||||
|
|
||||||
Uses anyio pytest plugin for proper async fixture handling.
|
Uses anyio pytest plugin for proper async fixture handling.
|
||||||
|
|
||||||
|
Note: SSE transport is being deprecated. This fixture uses SSE for compatibility testing.
|
||||||
"""
|
"""
|
||||||
async for session in create_mcp_client_session(
|
async for session in create_mcp_client_session_sse(
|
||||||
url="http://localhost:8000/mcp", client_name="Basic MCP"
|
url="http://localhost:8000/sse", client_name="Basic MCP (SSE)"
|
||||||
):
|
):
|
||||||
yield session
|
yield session
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user