Merge branch 'main' into add-client-sampling

dsp-ant · web-flow · commit 38f639cb13d8 · 2025-01-20T18:20:44.000Z
diff --git a/src/mcp/server/fastmcp/resources/resource_manager.py b/src/mcp/server/fastmcp/resources/resource_manager.py
@@ -34,7 +34,7 @@ def add_resource(self, resource: Resource) -> Resource:
             extra={
                 "uri": resource.uri,
                 "type": type(resource).__name__,
-                "name": resource.name,
+                "resource_name": resource.name,
             },
         )
         existing = self._resources.get(str(resource.uri))

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ def add_resource(self, resource: Resource) -> Resource:`
`34`	`34`	`extra={`
`35`	`35`	`"uri": resource.uri,`
`36`	`36`	`"type": type(resource).__name__,`
`37`		`- "name": resource.name,`
	`37`	`+ "resource_name": resource.name,`
`38`	`38`	`},`
`39`	`39`	`)`
`40`	`40`	`existing = self._resources.get(str(resource.uri))`