Skip to content

fix(server): Improve event consumer error handling #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
holtskinner merged 4 commits into from
Jul 8, 2025
Merged

fix(server): Improve event consumer error handling #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f211a9e
feat(server): Improve event consumer error handling
pankaj-bind Jul 7, 2025
88fce4b
feat(server): Improve event consumer error handling
pankaj-bind Jul 7, 2025
e7689d5
Merge branch 'main' into fix-event-consumer
holtskinner Jul 8, 2025
c424e79
Merge branch 'main' into fix-event-consumer
holtskinner Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/a2a/server/events/event_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from collections.abc import AsyncGenerator

from pydantic import ValidationError

from a2a.server.events.event_queue import Event, EventQueue
from a2a.types import (
InternalError,
Expand Down Expand Up @@ -138,6 +140,9 @@ async def consume_all(self) -> AsyncGenerator[Event]:
# python 3.12 and get a queue empty error on an open queue
if self.queue.is_closed():
break
except ValidationError as e:
logger.error(f"Invalid event format received: {e}")
continue
except Exception as e:
logger.error(
f'Stopping event consumption due to exception: {e}'
Expand Down
23 changes: 22 additions & 1 deletion tests/server/events/test_event_consumer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import asyncio

from typing import Any
from unittest.mock import AsyncMock, MagicMock, patch

import pytest
from pydantic import ValidationError

from a2a.server.events.event_consumer import EventConsumer, QueueClosed
from a2a.server.events.event_queue import EventQueue
Expand Down Expand Up @@ -343,3 +343,24 @@ def test_agent_task_callback_no_exception(event_consumer: EventConsumer):

assert event_consumer._exception is None # Should remain None
mock_task.exception.assert_called_once()


@pytest.mark.asyncio
async def test_consume_all_handles_validation_error(
event_consumer: EventConsumer, mock_event_queue: AsyncMock
):
"""Test that consume_all gracefully handles a pydantic.ValidationError."""
# Simulate dequeue_event raising a ValidationError
mock_event_queue.dequeue_event.side_effect = [
ValidationError.from_exception_data(title="Test Error", line_errors=[]),
asyncio.CancelledError # To stop the loop for the test
]

with patch("a2a.server.events.event_consumer.logger.error") as logger_error_mock:
with pytest.raises(asyncio.CancelledError):
async for _ in event_consumer.consume_all():
pass

# Check that the specific error was logged and the consumer continued
logger_error_mock.assert_called_once()
assert "Invalid event format received" in logger_error_mock.call_args[0][0]
Loading