chore: code cleanup + unit tests

Author: jer96

pyproject.toml

@@ -116,7 +116,7 @@ lint-fix = [
 ]
 
 [tool.hatch.envs.hatch-test]
-features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "otel"]
+features = ["anthropic", "litellm", "llamaapi", "ollama", "openai", "a2a"]
 extra-dependencies = [
     "moto>=5.1.0,<6.0.0",
     "pytest>=8.0.0,<9.0.0",
@@ -134,15 +134,9 @@ extra-args = [
 dev-mode = true
 features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "otel"]
 
-[tool.hatch.envs.a2a]
-dev-mode = true
-features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "a2a"]
-
-
 [[tool.hatch.envs.hatch-test.matrix]]
 python = ["3.13", "3.12", "3.11", "3.10"]
 
-
 [tool.hatch.envs.hatch-test.scripts]
 run = [
     "pytest{env:HATCH_TEST_ARGS:} {args}"
@@ -151,6 +145,10 @@ run-cov = [
     "pytest{env:HATCH_TEST_ARGS:} --cov --cov-config=pyproject.toml {args}"
 ]
 
+[tool.hatch.envs.a2a]
+dev-mode = true
+features = ["dev", "docs", "anthropic", "litellm", "llamaapi", "ollama", "a2a"]
+
 cov-combine = []
 cov-report = []
 
@@ -198,7 +196,6 @@ warn_no_return = true
 warn_unreachable = true
 follow_untyped_imports = true
 ignore_missing_imports = false
-exclude = ["/multiagent/a2a"]
 
 [[tool.mypy.overrides]]
 module = "litellm"
@@ -230,9 +227,6 @@ testpaths = [
     "tests"
 ]
 asyncio_default_fixture_loop_scope = "function"
-norecursedirs = [
-    "tests/multiagent/a2a"
-]
 
 [tool.coverage.run]
 branch = true

src/strands/agent/agent.py

@@ -216,6 +216,9 @@ def __init__(
         record_direct_tool_call: bool = True,
         load_tools_from_directory: bool = True,
         trace_attributes: Optional[Mapping[str, AttributeValue]] = None,
+        *,
+        name: str | None = None,
+        description: str | None = None,
     ):
         """Initialize the Agent with the specified configuration.
 
@@ -248,6 +251,10 @@ def __init__(
             load_tools_from_directory: Whether to load and automatically reload tools in the `./tools/` directory.
                 Defaults to True.
             trace_attributes: Custom trace attributes to apply to the agent's trace span.
+            name: name of the Agent
+                Defaults to empty string.
+            description: description of what the Agent does
+                Defaults to empty string.
 
         Raises:
             ValueError: If max_parallel_tools is less than 1.
@@ -310,6 +317,8 @@ def __init__(
         self.trace_span: Optional[trace.Span] = None
 
         self.tool_caller = Agent.ToolCaller(self)
+        self.name = name
+        self.description = description
 
     @property
     def tool(self) -> ToolCaller:

src/strands/multiagent/a2a/agent.py

@@ -28,9 +28,8 @@ def __init__(
         self,
         agent: SAAgent,
         *,
-        name: str,
-        description: str,
-        host: str = "localhost",
+        # AgentCard
+        host: str = "0.0.0",
         port: int = 9000,
         version: str = "0.0.1",
     ):
@@ -44,13 +43,14 @@ def __init__(
             port: The port to bind the A2A server to. Defaults to 9000.
             version: The version of the agent. Defaults to "0.0.1".
         """
-        self.name = name
-        self.description = description
         self.host = host
         self.port = port
         self.http_url = f"http://{self.host}:{self.port}/"
         self.version = version
         self.strands_agent = agent
+        self.name = self.strands_agent.name
+        self.description = self.strands_agent.description
+        # TODO: enable configurable capabilities and request handler
         self.capabilities = AgentCapabilities()
         self.request_handler = DefaultRequestHandler(
             agent_executor=StrandsA2AExecutor(self.strands_agent),
@@ -67,7 +67,15 @@ def public_agent_card(self) -> AgentCard:
 
         Returns:
             AgentCard: The public agent card containing metadata about this agent.
+
+        Raises:
+            ValueError: If name or description is None or empty.
         """
+        if not self.name:
+            raise ValueError("A2A agent name cannot be None or empty")
+        if not self.description:
+            raise ValueError("A2A agent description cannot be None or empty")
+
         return AgentCard(
             name=self.name,
             description=self.description,
@@ -89,6 +97,7 @@ def agent_skills(self) -> list[AgentSkill]:
         Returns:
             list[AgentSkill]: A list of skills this agent provides.
         """
+        # TODO: translate Strands tools (native & MCP) to skills
         return []
 
     def to_starlette_app(self) -> Starlette:
@@ -100,8 +109,7 @@ def to_starlette_app(self) -> Starlette:
         Returns:
             Starlette: A Starlette application configured to serve this agent.
         """
-        starlette_app = A2AStarletteApplication(agent_card=self.public_agent_card, http_handler=self.request_handler)
-        return starlette_app.build()
+        return A2AStarletteApplication(agent_card=self.public_agent_card, http_handler=self.request_handler).build()
 
     def to_fastapi_app(self) -> FastAPI:
         """Create a FastAPI application for serving this agent via HTTP.
@@ -112,8 +120,7 @@ def to_fastapi_app(self) -> FastAPI:
         Returns:
             FastAPI: A FastAPI application configured to serve this agent.
         """
-        fastapi_app = A2AFastAPIApplication(agent_card=self.public_agent_card, http_handler=self.request_handler)
-        return fastapi_app.build()
+        return A2AFastAPIApplication(agent_card=self.public_agent_card, http_handler=self.request_handler).build()
 
     def serve(self, app_type: Literal["fastapi", "starlette"] = "starlette", **kwargs: Any) -> None:
         """Start the A2A server with the specified application type.
@@ -128,12 +135,14 @@ def serve(self, app_type: Literal["fastapi", "starlette"] = "starlette", **kwarg
             **kwargs: Additional keyword arguments to pass to uvicorn.run.
         """
         try:
-            log.info("Starting Strands agent A2A server...")
+            log.info("Starting Strands A2A server...")
             if app_type == "fastapi":
                 uvicorn.run(self.to_fastapi_app(), host=self.host, port=self.port, **kwargs)
             else:
                 uvicorn.run(self.to_starlette_app(), host=self.host, port=self.port, **kwargs)
         except KeyboardInterrupt:
-            log.warning("Server shutdown requested (KeyboardInterrupt).")
+            log.warning("Strands A2A server shutdown requested (KeyboardInterrupt).")
+        except Exception:
+            log.exception("Strands A2A server encountered exception.")
         finally:
-            log.info("Strands agent A2A server has shutdown.")
+            log.info("Strands A2A server has shutdown.")

tests/multiagent/a2a/__init__.py

@@ -1 +1 @@
-"""Tests for the A2A implementation."""
+"""Tests for the A2A module."""

tests/multiagent/a2a/conftest.py

@@ -1,15 +1,41 @@
-"""Pytest configuration for A2A tests."""
+"""Common fixtures for A2A module tests."""
 
-from unittest.mock import patch
+from unittest.mock import AsyncMock, MagicMock
 
 import pytest
+from a2a.server.agent_execution import RequestContext
+from a2a.server.events import EventQueue
 
-# Mark all tests in this directory to be skipped by default
-pytestmark = pytest.mark.skip(reason="a2a tests are excluded")
+from strands.agent.agent import Agent as SAAgent
+from strands.agent.agent_result import AgentResult as SAAgentResult
 
 
-@pytest.fixture(autouse=True)
-def mock_uvicorn():
-    """Mock uvicorn.run to prevent actual server startup during tests."""
-    with patch("uvicorn.run") as mock:
-        yield mock
+@pytest.fixture
+def mock_strands_agent():
+    """Create a mock Strands Agent for testing."""
+    agent = MagicMock(spec=SAAgent)
+    agent.name = "Test Agent"
+    agent.description = "A test agent for unit testing"
+
+    # Setup default response
+    mock_result = MagicMock(spec=SAAgentResult)
+    mock_result.message = {"content": [{"text": "Test response"}]}
+    agent.return_value = mock_result
+
+    return agent
+
+
+@pytest.fixture
+def mock_request_context():
+    """Create a mock RequestContext for testing."""
+    context = MagicMock(spec=RequestContext)
+    context.get_user_input.return_value = "Test input"
+    return context
+
+
+@pytest.fixture
+def mock_event_queue():
+    """Create a mock EventQueue for testing."""
+    queue = MagicMock(spec=EventQueue)
+    queue.enqueue_event = AsyncMock()
+    return queue