show-server-info

Author: barnuri

src/mcp/server/fastmcp/server.py

@@ -166,6 +166,7 @@ async def _run(self, transport: Literal["stdio", "sse"]):
             server_info = await self.get_server_info()
             logger.debug(f"Server name: {server_info.name}")
             logger.debug(f"Server: {server_info.host}:{server_info.port}")
+            logger.debug(f"Instructions: {server_info.instructions}")
             for asset_type, asset_list in server_info.assets.items():
                 if not asset_list:
                     continue
@@ -192,12 +193,10 @@ async def get_server_info(self) -> ServerInfo:
             host=self.settings.host,
             port=self.settings.port,
             instructions=self.instructions,
-            assets=ServerInfo.ServerInfoAssets(
-                tools=await self.list_tools(),
-                resources=await self.list_resources(),
-                prompts=await self.list_prompts(),
-                resource_templates=await self.list_resource_templates()
-            )
+            tools=await self.list_tools() or [],
+            resources=await self.list_resources() or [],
+            prompts=await self.list_prompts() or [],
+            resource_templates=await self.list_resource_templates() or []
         )
 
     def _setup_handlers(self) -> None:

src/mcp/types.py

@@ -1129,18 +1129,25 @@ class ServerResult(
 ):
     pass
 
-class ServerInfo(BaseModel):
-    class ServerInfoAssets(BaseModel):
-        tools: list[Tool]
-        prompts: list[Prompt]
-        resources: list[Resource]
-        resource_templates: list[ResourceTemplate]
-    
+class ServerInfo(BaseModel):   
     name: str
     host: str
     port: int
     instructions: str | None
-    assets: ServerInfoAssets
+    tools: list[Tool]
+    prompts: list[Prompt]
+    resources: list[Resource]
+    resource_templates: list[ResourceTemplate]
+
+    @property
+    def assets(self) -> dict[str, list[Tool] | list[Prompt] | list[Resource] | list[ResourceTemplate]]:
+        assets_dict = {
+            "tools": self.tools,
+            "prompts": self.prompts,
+            "resources": self.resources,
+            "resource_templates": self.resource_templates
+        }
+        return assets_dict