Skip to content

Commit 7257736

Browse files
dugenkui03dugenkui03
committed
rename
1 parent c5b90a8 commit 7257736

19 files changed

+134
-134
lines changed

‎README.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func main() {
5757
}
5858
}
5959

60-
func helloHandler(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
60+
func helloHandler(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
6161
name, err := request.RequireString("name")
6262
if err != nil {
6363
return mcp.NewToolResultError(err.Error()), nil
@@ -92,7 +92,7 @@ MCP Go handles all the complex protocol details and server management, so you ca
9292
- [Resources](#resources)
9393
- [Tools](#tools)
9494
- [Prompts](#prompts)
95-
- [RequestContext](#RequestContext)
95+
- [RequestSession](#RequestSession)
9696
- [Examples](#examples)
9797
- [Extras](#extras)
9898
- [Transports](#transports)
@@ -154,7 +154,7 @@ func main() {
154154
)
155155

156156
// Add the calculator handler
157-
s.AddTool(calculatorTool, func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
157+
s.AddTool(calculatorTool, func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
158158
// Using helper functions for type-safe argument access
159159
op, err := request.RequireString("operation")
160160
if err != nil {
@@ -252,7 +252,7 @@ resource := mcp.NewResource(
252252
)
253253

254254
// Add resource with its handler
255-
s.AddResource(resource, func(ctx context.Context, requestContext server.RequestContext, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
255+
s.AddResource(resource, func(ctx context.Context, requestSession server.RequestSession, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
256256
content, err := os.ReadFile("README.md")
257257
if err != nil {
258258
return nil, err
@@ -280,7 +280,7 @@ template := mcp.NewResourceTemplate(
280280
)
281281

282282
// Add template with its handler
283-
s.AddResourceTemplate(template, func(ctx context.Context, requestContext server.RequestContext, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
283+
s.AddResourceTemplate(template, func(ctx context.Context, requestSession server.RequestSession, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
284284
// Extract ID from the URI using regex matching
285285
// The server automatically matches URIs to templates
286286
userID := extractIDFromURI(request.Params.URI)
@@ -329,7 +329,7 @@ calculatorTool := mcp.NewTool("calculate",
329329
),
330330
)
331331

332-
s.AddTool(calculatorTool, func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
332+
s.AddTool(calculatorTool, func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
333333
args := request.GetArguments()
334334
op := args["operation"].(string)
335335
x := args["x"].(float64)
@@ -373,7 +373,7 @@ httpTool := mcp.NewTool("http_request",
373373
),
374374
)
375375

376-
s.AddTool(httpTool, func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
376+
s.AddTool(httpTool, func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
377377
args := request.GetArguments()
378378
method := args["method"].(string)
379379
url := args["url"].(string)
@@ -441,7 +441,7 @@ s.AddPrompt(mcp.NewPrompt("greeting",
441441
mcp.WithArgument("name",
442442
mcp.ArgumentDescription("Name of the person to greet"),
443443
),
444-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
444+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
445445
name := request.Params.Arguments["name"]
446446
if name == "" {
447447
name = "friend"
@@ -465,7 +465,7 @@ s.AddPrompt(mcp.NewPrompt("code_review",
465465
mcp.ArgumentDescription("Pull request number to review"),
466466
mcp.RequiredArgument(),
467467
),
468-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
468+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
469469
prNumber := request.Params.Arguments["pr_number"]
470470
if prNumber == "" {
471471
return nil, fmt.Errorf("pr_number is required")
@@ -496,7 +496,7 @@ s.AddPrompt(mcp.NewPrompt("query_builder",
496496
mcp.ArgumentDescription("Name of the table to query"),
497497
mcp.RequiredArgument(),
498498
),
499-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
499+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
500500
tableName := request.Params.Arguments["table"]
501501
if tableName == "" {
502502
return nil, fmt.Errorf("table name is required")
@@ -531,28 +531,28 @@ Prompts can include:
531531

532532
</details>
533533

534-
### RequestContext
534+
### RequestSession
535535
<details>
536-
<summary>Show RequestContext Examples</summary>
536+
<summary>Show RequestSession Examples</summary>
537537

538-
The RequestContext object provides capabilities to interact with the client, such as sending logging notification and progress notification.
538+
The RequestSession object provides capabilities to interact with the client, such as sending logging notification and progress notification.
539539

540540
```go
541-
// Example of using RequestContext to send logging notifications and progress notifications
541+
// Example of using RequestSession to send logging notifications and progress notifications
542542
mcpServer.AddTool(mcp.NewTool(
543-
"test-RequestContent",
544-
mcp.WithDescription("test RequestContent"),
545-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
546-
// you could invoke `requestContext.IsLoggingNotificationSupported()` first the check if server supports logging notification
543+
"test-RequestSession",
544+
mcp.WithDescription("test RequestSession"),
545+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
546+
// you could invoke `requestSession.IsLoggingNotificationSupported()` first the check if server supports logging notification
547547
// ff server does not support logging notification, this method will do nothing.
548-
_ = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
548+
_ = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
549549
"testLog": "test send log notification",
550550
})
551551

552552
// server should send progress notification if request metadata includes a progressToken
553553
total := float64(100)
554554
progressMessage := "human readable progress information"
555-
_ = requestContext.SendProgressNotification(ctx, float64(50), &total, &progressMessage)
555+
_ = requestSession.SendProgressNotification(ctx, float64(50), &total, &progressMessage)
556556

557557
return &mcp.CallToolResult{
558558
Content: []mcp.Content{
@@ -759,7 +759,7 @@ s := server.NewMCPServer(
759759
The session context is automatically passed to tool and resource handlers:
760760

761761
```go
762-
s.AddTool(mcp.NewTool("session_aware"), func(ctx context.Context, requestContext server.RequestContext, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
762+
s.AddTool(mcp.NewTool("session_aware"), func(ctx context.Context, requestSession server.RequestSession, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
763763
// Get the current session from context
764764
session := server.ClientSessionFromContext(ctx)
765765
if session == nil {

‎client/inprocess_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestInProcessMCPClient(t *testing.T) {
2727
mcp.WithDestructiveHintAnnotation(false),
2828
mcp.WithIdempotentHintAnnotation(true),
2929
mcp.WithOpenWorldHintAnnotation(false),
30-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
30+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
3131
return &mcp.CallToolResult{
3232
Content: []mcp.Content{
3333
mcp.TextContent{
@@ -48,7 +48,7 @@ func TestInProcessMCPClient(t *testing.T) {
4848
URI: "resource://testresource",
4949
Name: "My Resource",
5050
},
51-
func(ctx context.Context, requestContext server.RequestContext, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
51+
func(ctx context.Context, requestSession server.RequestSession, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
5252
return []mcp.ResourceContents{
5353
mcp.TextResourceContents{
5454
URI: "resource://testresource",
@@ -70,7 +70,7 @@ func TestInProcessMCPClient(t *testing.T) {
7070
},
7171
},
7272
},
73-
func(ctx context.Context, requestContext server.RequestContext, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
73+
func(ctx context.Context, requestSession server.RequestSession, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
7474
return &mcp.GetPromptResult{
7575
Messages: []mcp.PromptMessage{
7676
{

‎client/sse_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestSSEMCPClient(t *testing.T) {
4242
mcp.WithDestructiveHintAnnotation(false),
4343
mcp.WithIdempotentHintAnnotation(true),
4444
mcp.WithOpenWorldHintAnnotation(false),
45-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
45+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
4646
return &mcp.CallToolResult{
4747
Content: []mcp.Content{
4848
mcp.TextContent{
@@ -55,7 +55,7 @@ func TestSSEMCPClient(t *testing.T) {
5555
mcpServer.AddTool(mcp.NewTool(
5656
"test-tool-for-http-header",
5757
mcp.WithDescription("Test tool for http header"),
58-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
58+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
5959
// , X-Test-Header-Func
6060
return &mcp.CallToolResult{
6161
Content: []mcp.Content{
@@ -70,29 +70,29 @@ func TestSSEMCPClient(t *testing.T) {
7070
mcpServer.AddTool(mcp.NewTool(
7171
"test-tool-for-sending-notification",
7272
mcp.WithDescription("Test tool for sending log notification, and the log level is warn"),
73-
), func(ctx context.Context, requestContext server.RequestContext, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
73+
), func(ctx context.Context, requestSession server.RequestSession, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
7474
totalProgressValue := float64(100)
7575
startFuncMessage := "start func"
76-
err := requestContext.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
76+
err := requestSession.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
7777
if err != nil {
7878
return nil, err
7979
}
8080

81-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
81+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
8282
"filtered_log_message": "will be filtered by log level",
8383
})
8484
if err != nil {
8585
return nil, err
8686
}
87-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
87+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
8888
"log_message": "log message value",
8989
})
9090
if err != nil {
9191
return nil, err
9292
}
9393

9494
startFuncMessage = "end func"
95-
err = requestContext.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
95+
err = requestSession.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
9696
if err != nil {
9797
return nil, err
9898
}
@@ -109,29 +109,29 @@ func TestSSEMCPClient(t *testing.T) {
109109
mcpServer.AddPrompt(mcp.Prompt{
110110
Name: "prompt_get_for_server_notification",
111111
Description: "Test prompt",
112-
}, func(ctx context.Context, requestContext server.RequestContext, req mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
112+
}, func(ctx context.Context, requestSession server.RequestSession, req mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
113113
totalProgressValue := float64(100)
114114
startFuncMessage := "start get prompt"
115-
err := requestContext.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
115+
err := requestSession.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
116116
if err != nil {
117117
return nil, err
118118
}
119119

120-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
120+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
121121
"filtered_log_message": "will be filtered by log level",
122122
})
123123
if err != nil {
124124
return nil, err
125125
}
126-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
126+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
127127
"log_message": "log message value",
128128
})
129129
if err != nil {
130130
return nil, err
131131
}
132132

133133
startFuncMessage = "end get prompt"
134-
err = requestContext.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
134+
err = requestSession.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
135135
if err != nil {
136136
return nil, err
137137
}
@@ -152,29 +152,29 @@ func TestSSEMCPClient(t *testing.T) {
152152
mcpServer.AddResource(mcp.Resource{
153153
URI: "resource://testresource",
154154
Name: "My Resource",
155-
}, func(ctx context.Context, requestContext server.RequestContext, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
155+
}, func(ctx context.Context, requestSession server.RequestSession, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
156156
totalProgressValue := float64(100)
157157
startFuncMessage := "start read resource"
158-
err := requestContext.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
158+
err := requestSession.SendProgressNotification(ctx, float64(0), &totalProgressValue, &startFuncMessage)
159159
if err != nil {
160160
return nil, err
161161
}
162162

163-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
163+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelInfo, map[string]any{
164164
"filtered_log_message": "will be filtered by log level",
165165
})
166166
if err != nil {
167167
return nil, err
168168
}
169-
err = requestContext.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
169+
err = requestSession.SendLoggingNotification(ctx, mcp.LoggingLevelError, map[string]any{
170170
"log_message": "log message value",
171171
})
172172
if err != nil {
173173
return nil, err
174174
}
175175

176176
startFuncMessage = "end read resource"
177-
err = requestContext.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
177+
err = requestSession.SendProgressNotification(ctx, float64(100), &totalProgressValue, &startFuncMessage)
178178
if err != nil {
179179
return nil, err
180180
}

‎examples/custom_context/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func makeRequest(ctx context.Context, message, token string) (*response, error)
7979
// using the token from the context.
8080
func handleMakeAuthenticatedRequestTool(
8181
ctx context.Context,
82-
requestContext server.RequestContext,
82+
requestSession server.RequestSession,
8383
request mcp.CallToolRequest,
8484
) (*mcp.CallToolResult, error) {
8585
message, ok := request.GetArguments()["message"].(string)

‎examples/dynamic_path/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func main() {
1919
mcpServer := server.NewMCPServer("dynamic-path-example", "1.0.0")
2020

2121
// Add a trivial tool for demonstration
22-
mcpServer.AddTool(mcp.NewTool("echo"), func(ctx context.Context, requestContext server.RequestContext, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
22+
mcpServer.AddTool(mcp.NewTool("echo"), func(ctx context.Context, requestSession server.RequestSession, req mcp.CallToolRequest) (*mcp.CallToolResult, error) {
2323
return mcp.NewToolResultText(fmt.Sprintf("Echo: %v", req.GetArguments()["message"])), nil
2424
})
2525

‎examples/everything/main.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func generateResources() []mcp.Resource {
191191

192192
func handleReadResource(
193193
ctx context.Context,
194-
requestContext server.RequestContext,
194+
requestSession server.RequestSession,
195195
request mcp.ReadResourceRequest,
196196
) ([]mcp.ResourceContents, error) {
197197
return []mcp.ResourceContents{
@@ -205,7 +205,7 @@ func handleReadResource(
205205

206206
func handleResourceTemplate(
207207
ctx context.Context,
208-
requestContext server.RequestContext,
208+
requestSession server.RequestSession,
209209
request mcp.ReadResourceRequest,
210210
) ([]mcp.ResourceContents, error) {
211211
return []mcp.ResourceContents{
@@ -219,7 +219,7 @@ func handleResourceTemplate(
219219

220220
func handleGeneratedResource(
221221
ctx context.Context,
222-
requestContext server.RequestContext,
222+
requestSession server.RequestSession,
223223
request mcp.ReadResourceRequest,
224224
) ([]mcp.ResourceContents, error) {
225225
uri := request.Params.URI
@@ -257,7 +257,7 @@ func handleGeneratedResource(
257257

258258
func handleSimplePrompt(
259259
ctx context.Context,
260-
requestContext server.RequestContext,
260+
requestSession server.RequestSession,
261261
request mcp.GetPromptRequest,
262262
) (*mcp.GetPromptResult, error) {
263263
return &mcp.GetPromptResult{
@@ -276,7 +276,7 @@ func handleSimplePrompt(
276276

277277
func handleComplexPrompt(
278278
ctx context.Context,
279-
requestContext server.RequestContext,
279+
requestSession server.RequestSession,
280280
request mcp.GetPromptRequest,
281281
) (*mcp.GetPromptResult, error) {
282282
arguments := request.Params.Arguments
@@ -315,7 +315,7 @@ func handleComplexPrompt(
315315

316316
func handleEchoTool(
317317
ctx context.Context,
318-
requestContext server.RequestContext,
318+
requestSession server.RequestSession,
319319
request mcp.CallToolRequest,
320320
) (*mcp.CallToolResult, error) {
321321
arguments := request.GetArguments()
@@ -335,7 +335,7 @@ func handleEchoTool(
335335

336336
func handleAddTool(
337337
ctx context.Context,
338-
requestContext server.RequestContext,
338+
requestSession server.RequestSession,
339339
request mcp.CallToolRequest,
340340
) (*mcp.CallToolResult, error) {
341341
arguments := request.GetArguments()
@@ -357,7 +357,7 @@ func handleAddTool(
357357

358358
func handleSendNotification(
359359
ctx context.Context,
360-
requestContext server.RequestContext,
360+
requestSession server.RequestSession,
361361
request mcp.CallToolRequest,
362362
) (*mcp.CallToolResult, error) {
363363

@@ -388,7 +388,7 @@ func handleSendNotification(
388388

389389
func handleLongRunningOperationTool(
390390
ctx context.Context,
391-
requestContext server.RequestContext,
391+
requestSession server.RequestSession,
392392
request mcp.CallToolRequest,
393393
) (*mcp.CallToolResult, error) {
394394
arguments := request.GetArguments()
@@ -454,7 +454,7 @@ func handleLongRunningOperationTool(
454454

455455
func handleGetTinyImageTool(
456456
ctx context.Context,
457-
requestContext server.RequestContext,
457+
requestSession server.RequestSession,
458458
request mcp.CallToolRequest,
459459
) (*mcp.CallToolResult, error) {
460460
return &mcp.CallToolResult{

0 commit comments

Comments
 (0)