PR feedback updates

Author: peteski22

README.md

@@ -145,7 +145,7 @@ client = McpdClient(api_endpoint="http://localhost:8090", api_key="optional-key"
 
 * `client.tools(server_name: str) -> list[dict]` - Returns the tool schema definitions for only the specified server.
 
-* `client.agent_tools(servers: list[str] | None = None, check_health: bool = True) -> list[Callable]` - Returns a list of self-contained, callable functions suitable for agentic frameworks. By default, filters to healthy servers only. Use `servers` to filter by server names, or `check_health=False` to include all servers regardless of health.
+* `client.agent_tools(servers: list[str] | None = None, *, check_health: bool = True) -> list[Callable]` - Returns a list of self-contained, callable functions suitable for agentic frameworks. By default, filters to healthy servers only. Use `servers` to filter by server names, or `check_health=False` to include all servers regardless of health.
 
 * `client.clear_agent_tools_cache()` - Clears cached generated callable functions that are created when calling agent_tools().
 

src/mcpd/mcpd_client.py

@@ -406,7 +406,6 @@ def agent_tools(self, servers: list[str] | None = None, *, check_health: bool =
             ConnectionError: If unable to connect to the mcpd daemon.
             TimeoutError: If requests to the daemon time out.
             AuthenticationError: If API key authentication fails.
-            ServerNotFoundError: If a server becomes unavailable during tool retrieval.
             McpdError: If unable to retrieve server health status (when check_health=True)
                       or retrieve tool definitions or generate functions.
 

tests/conftest.py

@@ -1,3 +1,4 @@
+from collections.abc import Callable
 from unittest.mock import Mock
 
 import pytest
@@ -73,8 +74,8 @@ def test_something(tools_side_effect):
             mock_tools.side_effect = tools_side_effect(tools_map)
     """
 
-    def _create_side_effect(tools_map: dict[str, list[dict]]):
-        def side_effect(server_name=None):
+    def _create_side_effect(tools_map: dict[str, list[dict]]) -> Callable[[str | None], list[dict]]:
+        def side_effect(server_name: str | None = None) -> list[dict]:
             return tools_map.get(server_name, [])
 
         return side_effect

tests/unit/test_mcpd_client.py

@@ -233,7 +233,8 @@ def test_agent_tools_with_empty_servers_list(self, mock_health, mock_tools, clie
             result = client.agent_tools(servers=[])
 
             assert result == []
-            assert mock_create.call_count == 0
+            mock_tools.assert_not_called()
+            mock_create.assert_not_called()
 
     @patch.object(McpdClient, "servers")
     @patch.object(McpdClient, "tools")
@@ -323,13 +324,15 @@ def test_agent_tools_no_health_check_when_disabled(self, mock_tools, mock_server
     @patch.object(McpdClient, "servers")
     @patch.object(McpdClient, "tools")
     @patch.object(McpdClient, "server_health")
-    def test_agent_tools_all_servers_unhealthy(self, mock_health, mock_tools, mock_servers, client):
+    def test_agent_tools_all_servers_unhealthy(self, mock_health, mock_tools, mock_servers, client, tools_side_effect):
         """Test behavior when all servers are unhealthy."""
         mock_servers.return_value = ["server1", "server2"]
-        mock_tools.return_value = {
-            "server1": [{"name": "tool1", "description": "Tool 1"}],
-            "server2": [{"name": "tool2", "description": "Tool 2"}],
-        }
+        mock_tools.side_effect = tools_side_effect(
+            {
+                "server1": [{"name": "tool1", "description": "Tool 1"}],
+                "server2": [{"name": "tool2", "description": "Tool 2"}],
+            }
+        )
 
         mock_health.return_value = {
             "server1": {"status": "timeout"},
@@ -375,12 +378,14 @@ def test_agent_tools_with_servers_and_health_filtering(self, mock_health, mock_t
     @patch.object(McpdClient, "servers")
     @patch.object(McpdClient, "tools")
     @patch.object(McpdClient, "server_health")
-    def test_agent_tools_health_check_exception(self, mock_health, mock_tools, mock_servers, client):
+    def test_agent_tools_health_check_exception(self, mock_health, mock_tools, mock_servers, client, tools_side_effect):
         """Test behavior when health check raises exception."""
         mock_servers.return_value = ["server1"]
-        mock_tools.return_value = {
-            "server1": [{"name": "tool1", "description": "Tool 1"}],
-        }
+        mock_tools.side_effect = tools_side_effect(
+            {
+                "server1": [{"name": "tool1", "description": "Tool 1"}],
+            }
+        )
 
         # Health check raises exception.
         mock_health.side_effect = Exception("Health check failed")