Skip to content

Commit b76a6db

Browse files
author
wenhaozhao
committed
feat: pass timeout config while init mcp client
1 parent 403ace1 commit b76a6db

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

core/src/main/java/com/google/adk/tools/mcp/McpSessionManager.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,26 @@ public McpSyncClient createSession() {
4646
}
4747

4848
public static McpSyncClient initializeSession(Object connectionParams) {
49-
McpClientTransport transport = new DefaultMcpTransportBuilder().build(connectionParams);
50-
McpSyncClient client =
51-
McpClient.sync(transport)
52-
.requestTimeout(Duration.ofSeconds(10))
53-
.capabilities(ClientCapabilities.builder().build())
54-
.build();
55-
InitializeResult initResult = client.initialize();
56-
logger.debug("Initialize Client Result: {}", initResult);
57-
return client;
49+
return initializeSession(connectionParams, new DefaultMcpTransportBuilder());
5850
}
5951

6052
public static McpSyncClient initializeSession(
6153
Object connectionParams, McpTransportBuilder transportBuilder) {
54+
Duration initializationTimeout = null;
55+
Duration requestTimeout = null;
6256
McpClientTransport transport = transportBuilder.build(connectionParams);
63-
57+
if (connectionParams instanceof SseServerParameters sseServerParams) {
58+
initializationTimeout = sseServerParams.timeout();
59+
requestTimeout = sseServerParams.sseReadTimeout();
60+
}
6461
McpSyncClient client =
6562
McpClient.sync(transport)
66-
.requestTimeout(Duration.ofSeconds(10))
63+
.initializationTimeout(initializationTimeout == null ? Duration.ofSeconds(10) : initializationTimeout)
64+
.requestTimeout(requestTimeout == null ? Duration.ofSeconds(10) : requestTimeout)
6765
.capabilities(ClientCapabilities.builder().build())
6866
.build();
6967
InitializeResult initResult = client.initialize();
7068
logger.debug("Initialize Client Result: {}", initResult);
71-
7269
return client;
7370
}
7471
}

0 commit comments

Comments
 (0)