Few minor fixes

Author: sokoliva

src/a2a/server/request_handlers/default_request_handler.py

@@ -100,8 +100,6 @@ def __init__(  # noqa: PLR0913
         push_sender: PushNotificationSender | None = None,
         request_context_builder: RequestContextBuilder | None = None,
         extended_agent_card: AgentCard | None = None,
-        card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
-        | None = None,
         extended_card_modifier: Callable[
             [AgentCard, ServerCallContext], Awaitable[AgentCard] | AgentCard
         ]
@@ -119,7 +117,6 @@ def __init__(  # noqa: PLR0913
             request_context_builder: The `RequestContextBuilder` instance used
               to build request contexts. Defaults to `SimpleRequestContextBuilder`.
             extended_agent_card: An optional, distinct `AgentCard` to be served at the extended card endpoint.
-            card_modifier: An optional callback to dynamically modify the public `AgentCard` before it is served.
             extended_card_modifier: An optional callback to dynamically modify the extended `AgentCard` before it is served.
         """
         self.agent_executor = agent_executor
@@ -129,7 +126,6 @@ def __init__(  # noqa: PLR0913
         self._push_config_store = push_config_store
         self._push_sender = push_sender
         self.extended_agent_card = extended_agent_card
-        self.card_modifier = card_modifier
         self.extended_card_modifier = extended_card_modifier
         self._request_context_builder = (
             request_context_builder

src/a2a/server/request_handlers/request_handler.py

@@ -373,12 +373,10 @@ def decorator(function: Callable) -> Callable:
             async def async_gen_wrapper(self: Any, *args, **kwargs) -> Any:
                 if not expression(self):
                     final_message = error_message or str(expression)
-                    logger.error('Validation failure: %s', final_message)
-                    raise (
-                        error_type(final_message)
-                        if final_message
-                        else error_type
+                    logging.getLogger(__name__).error(
+                        'Validation failure: %s', final_message
                     )
+                    raise error_type(final_message)
                 inner = function(self, *args, **kwargs)
                 try:
                     async for item in inner:
@@ -394,12 +392,10 @@ async def async_gen_wrapper(self: Any, *args, **kwargs) -> Any:
             async def async_wrapper(self: Any, *args, **kwargs) -> Any:
                 if not expression(self):
                     final_message = error_message or str(expression)
-                    logger.error('Validation failure: %s', final_message)
-                    raise (
-                        error_type(final_message)
-                        if final_message
-                        else error_type
+                    logging.getLogger(__name__).error(
+                        'Validation failure: %s', final_message
                     )
+                    raise error_type(final_message)
                 return await function(self, *args, **kwargs)
 
             return async_wrapper
@@ -408,7 +404,9 @@ async def async_wrapper(self: Any, *args, **kwargs) -> Any:
         def sync_wrapper(self: Any, *args, **kwargs) -> Any:
             if not expression(self):
                 final_message = error_message or str(expression)
-                logger.error('Validation failure: %s', final_message)
+                logging.getLogger(__name__).error(
+                    'Validation failure: %s', final_message
+                )
                 raise error_type(final_message)
             return function(self, *args, **kwargs)
 

tests/integration/test_agent_card.py

@@ -66,7 +66,7 @@ async def test_agent_card_integration(header_val: str | None) -> None:
     handler = DefaultRequestHandler(
         agent_executor=DummyAgentExecutor(),
         task_store=task_store,
-        agent_card=AgentCard(name='test_agent', version='1.0'),
+        agent_card=agent_card,
         queue_manager=InMemoryQueueManager(),
         push_config_store=InMemoryPushNotificationConfigStore(),
     )

tests/integration/test_end_to_end.py

@@ -171,8 +171,8 @@ def base_e2e_setup(agent_card):
     handler = DefaultRequestHandler(
         agent_executor=MockAgentExecutor(),
         task_store=task_store,
-        queue_manager=InMemoryQueueManager(),
         agent_card=agent_card,
+        queue_manager=InMemoryQueueManager(),
     )
     return task_store, handler