Skip to content

Commit 558aa5a

Browse files
sreenathssreenaths
committed
chore: Removing redundant method args on model instantiation
1 parent 68457a1 commit 558aa5a

File tree

9 files changed

+10
-78
lines changed

9 files changed

+10
-78
lines changed

‎src/mcp/client/session.py

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ async def initialize(self) -> types.InitializeResult:
151151
result = await self.send_request(
152152
types.ClientRequest(
153153
types.InitializeRequest(
154-
method="initialize",
155154
params=types.InitializeRequestParams(
156155
protocolVersion=types.LATEST_PROTOCOL_VERSION,
157156
capabilities=types.ClientCapabilities(
@@ -170,20 +169,14 @@ async def initialize(self) -> types.InitializeResult:
170169
if result.protocolVersion not in SUPPORTED_PROTOCOL_VERSIONS:
171170
raise RuntimeError(f"Unsupported protocol version from the server: {result.protocolVersion}")
172171

173-
await self.send_notification(
174-
types.ClientNotification(types.InitializedNotification(method="notifications/initialized"))
175-
)
172+
await self.send_notification(types.ClientNotification(types.InitializedNotification()))
176173

177174
return result
178175

179176
async def send_ping(self) -> types.EmptyResult:
180177
"""Send a ping request."""
181178
return await self.send_request(
182-
types.ClientRequest(
183-
types.PingRequest(
184-
method="ping",
185-
)
186-
),
179+
types.ClientRequest(types.PingRequest()),
187180
types.EmptyResult,
188181
)
189182

@@ -198,7 +191,6 @@ async def send_progress_notification(
198191
await self.send_notification(
199192
types.ClientNotification(
200193
types.ProgressNotification(
201-
method="notifications/progress",
202194
params=types.ProgressNotificationParams(
203195
progressToken=progress_token,
204196
progress=progress,
@@ -214,7 +206,6 @@ async def set_logging_level(self, level: types.LoggingLevel) -> types.EmptyResul
214206
return await self.send_request(
215207
types.ClientRequest(
216208
types.SetLevelRequest(
217-
method="logging/setLevel",
218209
params=types.SetLevelRequestParams(level=level),
219210
)
220211
),
@@ -226,7 +217,6 @@ async def list_resources(self, cursor: str | None = None) -> types.ListResources
226217
return await self.send_request(
227218
types.ClientRequest(
228219
types.ListResourcesRequest(
229-
method="resources/list",
230220
params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
231221
)
232222
),
@@ -238,7 +228,6 @@ async def list_resource_templates(self, cursor: str | None = None) -> types.List
238228
return await self.send_request(
239229
types.ClientRequest(
240230
types.ListResourceTemplatesRequest(
241-
method="resources/templates/list",
242231
params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
243232
)
244233
),
@@ -250,7 +239,6 @@ async def read_resource(self, uri: AnyUrl) -> types.ReadResourceResult:
250239
return await self.send_request(
251240
types.ClientRequest(
252241
types.ReadResourceRequest(
253-
method="resources/read",
254242
params=types.ReadResourceRequestParams(uri=uri),
255243
)
256244
),
@@ -262,7 +250,6 @@ async def subscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
262250
return await self.send_request(
263251
types.ClientRequest(
264252
types.SubscribeRequest(
265-
method="resources/subscribe",
266253
params=types.SubscribeRequestParams(uri=uri),
267254
)
268255
),
@@ -274,7 +261,6 @@ async def unsubscribe_resource(self, uri: AnyUrl) -> types.EmptyResult:
274261
return await self.send_request(
275262
types.ClientRequest(
276263
types.UnsubscribeRequest(
277-
method="resources/unsubscribe",
278264
params=types.UnsubscribeRequestParams(uri=uri),
279265
)
280266
),
@@ -293,7 +279,6 @@ async def call_tool(
293279
result = await self.send_request(
294280
types.ClientRequest(
295281
types.CallToolRequest(
296-
method="tools/call",
297282
params=types.CallToolRequestParams(
298283
name=name,
299284
arguments=arguments,
@@ -337,7 +322,6 @@ async def list_prompts(self, cursor: str | None = None) -> types.ListPromptsResu
337322
return await self.send_request(
338323
types.ClientRequest(
339324
types.ListPromptsRequest(
340-
method="prompts/list",
341325
params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
342326
)
343327
),
@@ -349,7 +333,6 @@ async def get_prompt(self, name: str, arguments: dict[str, str] | None = None) -
349333
return await self.send_request(
350334
types.ClientRequest(
351335
types.GetPromptRequest(
352-
method="prompts/get",
353336
params=types.GetPromptRequestParams(name=name, arguments=arguments),
354337
)
355338
),
@@ -370,7 +353,6 @@ async def complete(
370353
return await self.send_request(
371354
types.ClientRequest(
372355
types.CompleteRequest(
373-
method="completion/complete",
374356
params=types.CompleteRequestParams(
375357
ref=ref,
376358
argument=types.CompletionArgument(**argument),
@@ -386,7 +368,6 @@ async def list_tools(self, cursor: str | None = None) -> types.ListToolsResult:
386368
result = await self.send_request(
387369
types.ClientRequest(
388370
types.ListToolsRequest(
389-
method="tools/list",
390371
params=types.PaginatedRequestParams(cursor=cursor) if cursor is not None else None,
391372
)
392373
),
@@ -402,13 +383,7 @@ async def list_tools(self, cursor: str | None = None) -> types.ListToolsResult:
402383

403384
async def send_roots_list_changed(self) -> None:
404385
"""Send a roots/list_changed notification."""
405-
await self.send_notification(
406-
types.ClientNotification(
407-
types.RootsListChangedNotification(
408-
method="notifications/roots/list_changed",
409-
)
410-
)
411-
)
386+
await self.send_notification(types.ClientNotification(types.RootsListChangedNotification()))
412387

413388
async def _received_request(self, responder: RequestResponder[types.ServerRequest, types.ClientResult]) -> None:
414389
ctx = RequestContext[ClientSession, Any](

‎src/mcp/server/session.py

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,6 @@ async def send_log_message(
186186
await self.send_notification(
187187
types.ServerNotification(
188188
types.LoggingMessageNotification(
189-
method="notifications/message",
190189
params=types.LoggingMessageNotificationParams(
191190
level=level,
192191
data=data,
@@ -202,7 +201,6 @@ async def send_resource_updated(self, uri: AnyUrl) -> None:
202201
await self.send_notification(
203202
types.ServerNotification(
204203
types.ResourceUpdatedNotification(
205-
method="notifications/resources/updated",
206204
params=types.ResourceUpdatedNotificationParams(uri=uri),
207205
)
208206
)
@@ -225,7 +223,6 @@ async def create_message(
225223
return await self.send_request(
226224
request=types.ServerRequest(
227225
types.CreateMessageRequest(
228-
method="sampling/createMessage",
229226
params=types.CreateMessageRequestParams(
230227
messages=messages,
231228
systemPrompt=system_prompt,
@@ -247,11 +244,7 @@ async def create_message(
247244
async def list_roots(self) -> types.ListRootsResult:
248245
"""Send a roots/list request."""
249246
return await self.send_request(
250-
types.ServerRequest(
251-
types.ListRootsRequest(
252-
method="roots/list",
253-
)
254-
),
247+
types.ServerRequest(types.ListRootsRequest()),
255248
types.ListRootsResult,
256249
)
257250

@@ -273,7 +266,6 @@ async def elicit(
273266
return await self.send_request(
274267
types.ServerRequest(
275268
types.ElicitRequest(
276-
method="elicitation/create",
277269
params=types.ElicitRequestParams(
278270
message=message,
279271
requestedSchema=requestedSchema,
@@ -287,11 +279,7 @@ async def elicit(
287279
async def send_ping(self) -> types.EmptyResult:
288280
"""Send a ping request."""
289281
return await self.send_request(
290-
types.ServerRequest(
291-
types.PingRequest(
292-
method="ping",
293-
)
294-
),
282+
types.ServerRequest(types.PingRequest()),
295283
types.EmptyResult,
296284
)
297285

@@ -307,7 +295,6 @@ async def send_progress_notification(
307295
await self.send_notification(
308296
types.ServerNotification(
309297
types.ProgressNotification(
310-
method="notifications/progress",
311298
params=types.ProgressNotificationParams(
312299
progressToken=progress_token,
313300
progress=progress,
@@ -321,33 +308,15 @@ async def send_progress_notification(
321308

322309
async def send_resource_list_changed(self) -> None:
323310
"""Send a resource list changed notification."""
324-
await self.send_notification(
325-
types.ServerNotification(
326-
types.ResourceListChangedNotification(
327-
method="notifications/resources/list_changed",
328-
)
329-
)
330-
)
311+
await self.send_notification(types.ServerNotification(types.ResourceListChangedNotification()))
331312

332313
async def send_tool_list_changed(self) -> None:
333314
"""Send a tool list changed notification."""
334-
await self.send_notification(
335-
types.ServerNotification(
336-
types.ToolListChangedNotification(
337-
method="notifications/tools/list_changed",
338-
)
339-
)
340-
)
315+
await self.send_notification(types.ServerNotification(types.ToolListChangedNotification()))
341316

342317
async def send_prompt_list_changed(self) -> None:
343318
"""Send a prompt list changed notification."""
344-
await self.send_notification(
345-
types.ServerNotification(
346-
types.PromptListChangedNotification(
347-
method="notifications/prompts/list_changed",
348-
)
349-
)
350-
)
319+
await self.send_notification(types.ServerNotification(types.PromptListChangedNotification()))
351320

352321
async def _handle_incoming(self, req: ServerRequestResponder) -> None:
353322
await self._incoming_message_stream_writer.send(req)

‎tests/client/test_resource_cleanup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ async def _send_response(self, request_id: RequestId, response: SendResultT | Er
3535
)
3636

3737
# Create a test request
38-
request = ClientRequest(PingRequest(method="ping"))
38+
request = ClientRequest(PingRequest())
3939

4040
# Patch the _write_stream.send method to raise an exception
4141
async def mock_send(*args: Any, **kwargs: Any):

‎tests/issues/test_129_resource_templates.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def get_user_profile(user_id: str) -> str:
2424
# Note: list_resource_templates() returns a decorator that wraps the handler
2525
# The handler returns a ServerResult with a ListResourceTemplatesResult inside
2626
result = await mcp._mcp_server.request_handlers[types.ListResourceTemplatesRequest](
27-
types.ListResourceTemplatesRequest(method="resources/templates/list", params=None)
27+
types.ListResourceTemplatesRequest(params=None)
2828
)
2929
assert isinstance(result.root, types.ListResourceTemplatesResult)
3030
templates = result.root.resourceTemplates

‎tests/issues/test_342_base64_encoding.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ async def read_resource(uri: AnyUrl) -> list[ReadResourceContents]:
5454

5555
# Create a request
5656
request = ReadResourceRequest(
57-
method="resources/read",
5857
params=ReadResourceRequestParams(uri=AnyUrl("test://resource")),
5958
)
6059

‎tests/server/test_cancel_handling.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ async def first_request():
6161
await client.send_request(
6262
ClientRequest(
6363
CallToolRequest(
64-
method="tools/call",
6564
params=CallToolRequestParams(name="test_tool", arguments={}),
6665
)
6766
),
@@ -83,7 +82,6 @@ async def first_request():
8382
await client.send_notification(
8483
ClientNotification(
8584
CancelledNotification(
86-
method="notifications/cancelled",
8785
params=CancelledNotificationParams(
8886
requestId=first_request_id,
8987
reason="Testing server recovery",
@@ -96,7 +94,6 @@ async def first_request():
9694
result = await client.send_request(
9795
ClientRequest(
9896
CallToolRequest(
99-
method="tools/call",
10097
params=CallToolRequestParams(name="test_tool", arguments={}),
10198
)
10299
),

‎tests/server/test_read_resource.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ async def read_resource(uri: AnyUrl) -> Iterable[ReadResourceContents]:
3535

3636
# Create a request
3737
request = types.ReadResourceRequest(
38-
method="resources/read",
3938
params=types.ReadResourceRequestParams(uri=FileUrl(temp_file.as_uri())),
4039
)
4140

@@ -63,7 +62,6 @@ async def read_resource(uri: AnyUrl) -> Iterable[ReadResourceContents]:
6362

6463
# Create a request
6564
request = types.ReadResourceRequest(
66-
method="resources/read",
6765
params=types.ReadResourceRequestParams(uri=FileUrl(temp_file.as_uri())),
6866
)
6967

@@ -95,7 +93,6 @@ async def read_resource(uri: AnyUrl) -> Iterable[ReadResourceContents]:
9593

9694
# Create a request
9795
request = types.ReadResourceRequest(
98-
method="resources/read",
9996
params=types.ReadResourceRequestParams(uri=FileUrl(temp_file.as_uri())),
10097
)
10198

‎tests/shared/test_session.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ async def make_request(client_session: ClientSession):
8888
await client_session.send_request(
8989
ClientRequest(
9090
types.CallToolRequest(
91-
method="tools/call",
9291
params=types.CallToolRequestParams(name="slow_tool", arguments={}),
9392
)
9493
),
@@ -113,7 +112,6 @@ async def make_request(client_session: ClientSession):
113112
await client_session.send_notification(
114113
ClientNotification(
115114
CancelledNotification(
116-
method="notifications/cancelled",
117115
params=CancelledNotificationParams(requestId=request_id),
118116
)
119117
)

‎tests/shared/test_streamable_http.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,6 @@ async def run_tool():
11381138
await session.send_request(
11391139
types.ClientRequest(
11401140
types.CallToolRequest(
1141-
method="tools/call",
11421141
params=types.CallToolRequestParams(
11431142
name="wait_for_lock_with_notification", arguments={}
11441143
),
@@ -1180,7 +1179,6 @@ async def run_tool():
11801179
result = await session.send_request(
11811180
types.ClientRequest(
11821181
types.CallToolRequest(
1183-
method="tools/call",
11841182
params=types.CallToolRequestParams(name="release_lock", arguments={}),
11851183
)
11861184
),
@@ -1193,7 +1191,6 @@ async def run_tool():
11931191
result = await session.send_request(
11941192
types.ClientRequest(
11951193
types.CallToolRequest(
1196-
method="tools/call",
11971194
params=types.CallToolRequestParams(name="wait_for_lock_with_notification", arguments={}),
11981195
)
11991196
),

0 commit comments

Comments
 (0)