diff --git a/backend/route_registry.py b/backend/route_registry.py index fd6f69d..a2f51e2 100644 --- a/backend/route_registry.py +++ b/backend/route_registry.py @@ -117,6 +117,7 @@ ROUTES: tuple[RouteSpec, ...] = ( RouteSpec("GET", "logs/errors", "backend.routes.log_routes.get_error_logs", "read"), RouteSpec("GET", "logs/integrations", "backend.routes.log_routes.get_integration_logs", "read"), RouteSpec("GET", "security/audit-logs", "backend.routes.log_routes.get_audit_logs", "config"), + RouteSpec("GET", "events/stream", "backend.routes.event_routes.get_event_stream", "read"), RouteSpec("GET", "api-discovery/dialects", "backend.routes.api_discovery_routes.list_dialects", "read"), RouteSpec("POST", "api-discovery/probe-provider", "backend.routes.api_discovery_routes.probe_provider", "config"), RouteSpec("POST", "api-discovery/probe-model", "backend.routes.api_discovery_routes.probe_model", "config"), diff --git a/backend/routes/event_routes.py b/backend/routes/event_routes.py new file mode 100644 index 0000000..e9ad1d6 --- /dev/null +++ b/backend/routes/event_routes.py @@ -0,0 +1,42 @@ +"""Event stream route handlers.""" + +from __future__ import annotations + +from typing import Any + +from backend.routes.common import handle_request +from backend.services.event_stream_service import EventStreamService +from core.identity import RequestContext +from core.security import require_authenticated + + +def get_event_stream( + ctx: RequestContext, + query: dict[str, Any] | None = None, + service: EventStreamService | None = None, +) -> dict: + event_service = service or EventStreamService() + params = query or {} + + def action() -> dict[str, Any]: + require_authenticated(ctx) + return event_service.recent_events( + event_type=_optional_str(params.get("event_type")), + limit=_int_or_default(params.get("limit"), 50), + ) + + return handle_request(ctx, action) + + +def _optional_str(value: Any) -> str | None: + if value is None: + return None + text = str(value).strip() + return text or None + + +def _int_or_default(value: Any, default: int) -> int: + try: + return int(value) + except (TypeError, ValueError): + return default diff --git a/backend/routes/job_routes.py b/backend/routes/job_routes.py index 2c1ab9b..041ab76 100644 --- a/backend/routes/job_routes.py +++ b/backend/routes/job_routes.py @@ -5,6 +5,7 @@ from __future__ import annotations from typing import Any from backend.routes.common import handle_request +from backend.services.event_stream_service import get_default_event_bus from backend.services.queue_service import QueueService from core.audit_service import AuditService from core.identity import RequestContext @@ -111,6 +112,7 @@ def _create_queue_service() -> QueueService: return QueueService( repository=JobRepository(database), audit_service=AuditService(database), + event_bus=get_default_event_bus(), ) diff --git a/backend/routes/node_routes.py b/backend/routes/node_routes.py index 4c47b22..3c15031 100644 --- a/backend/routes/node_routes.py +++ b/backend/routes/node_routes.py @@ -7,6 +7,7 @@ from uuid import uuid4 from backend.dto.common import ApiError, ErrorCode from backend.routes.common import handle_request +from backend.services.event_stream_service import get_default_event_bus from backend.services.generation_service import GenerationService from backend.services.image_service import ImageService from backend.services.queue_service import QueueService @@ -178,10 +179,12 @@ def _resolve_services( return image_service, workflow_service database = Database(load_database_settings()) audit_service = AuditService(database) + event_bus = get_default_event_bus() resolved_workflow_service = workflow_service or WorkflowService( workflow_repository=WorkflowRepository(database), profile_repository=ProfileRepository(database), audit_service=audit_service, + event_bus=event_bus, ) resolved_image_service = image_service or ImageService( image_repository=ImageRepository(database), @@ -197,6 +200,7 @@ def _create_workflow_service() -> WorkflowService: workflow_repository=WorkflowRepository(database), profile_repository=ProfileRepository(database), audit_service=AuditService(database), + event_bus=get_default_event_bus(), ) @@ -204,19 +208,23 @@ def _create_generation_service() -> GenerationService: database = Database(load_database_settings()) audit_service = AuditService(database) workflow_repository = WorkflowRepository(database) + event_bus = get_default_event_bus() return GenerationService( workflow_service=WorkflowService( workflow_repository=workflow_repository, profile_repository=ProfileRepository(database), audit_service=audit_service, + event_bus=event_bus, ), queue_service=QueueService( repository=JobRepository(database), audit_service=audit_service, + event_bus=event_bus, ), image_service=ImageService( image_repository=ImageRepository(database), workflow_repository=workflow_repository, audit_service=audit_service, ), + event_bus=event_bus, ) diff --git a/backend/routes/workflow_routes.py b/backend/routes/workflow_routes.py index ffc2570..3a6e45f 100644 --- a/backend/routes/workflow_routes.py +++ b/backend/routes/workflow_routes.py @@ -5,6 +5,7 @@ from __future__ import annotations from typing import Any from backend.routes.common import handle_request +from backend.services.event_stream_service import get_default_event_bus from backend.services.workflow_service import WorkflowService from core.audit_service import AuditService from core.identity import RequestContext @@ -117,4 +118,5 @@ def _create_workflow_service() -> WorkflowService: workflow_repository=WorkflowRepository(database), profile_repository=ProfileRepository(database), audit_service=AuditService(database), + event_bus=get_default_event_bus(), ) diff --git a/backend/services/event_stream_service.py b/backend/services/event_stream_service.py new file mode 100644 index 0000000..35b3bb6 --- /dev/null +++ b/backend/services/event_stream_service.py @@ -0,0 +1,42 @@ +"""Event stream service for AstrBot-mounted routes.""" + +from __future__ import annotations + +from typing import Any + +from core.event_bus import Event, EventBus +from core.webhook import WebhookEvent, event_from_bus, to_sse + + +DEFAULT_EVENT_BUS = EventBus(history_limit=500) + + +def get_default_event_bus() -> EventBus: + return DEFAULT_EVENT_BUS + + +class EventStreamService: + def __init__(self, event_bus: EventBus | None = None): + self.event_bus = event_bus or DEFAULT_EVENT_BUS + + def recent_events(self, *, event_type: str | None = None, limit: int = 50) -> dict[str, Any]: + events = self.event_bus.history(event_type) + normalized_limit = min(max(int(limit or 50), 1), 200) + selected = events[-normalized_limit:] + webhook_events = [_event_to_webhook(event) for event in selected] + return { + "content_type": "text/event-stream", + "events": [event.to_dict() for event in webhook_events], + "body": "".join(to_sse(event) for event in webhook_events), + "count": len(webhook_events), + } + + +def _event_to_webhook(event: Event) -> WebhookEvent: + webhook_event = event_from_bus(event.event_type, event.payload) + return WebhookEvent( + event_type=webhook_event.event_type, + data=webhook_event.data, + event_id=event.event_id, + created_at=event.created_at, + ) diff --git a/tests/test_event_routes.py b/tests/test_event_routes.py new file mode 100644 index 0000000..4ded3ef --- /dev/null +++ b/tests/test_event_routes.py @@ -0,0 +1,48 @@ +from __future__ import annotations + +import unittest + +from backend.routes.event_routes import get_event_stream +from backend.services.event_stream_service import EventStreamService +from core.event_bus import EventBus +from core.identity import RequestContext + + +class EventRoutesTests(unittest.TestCase): + def setUp(self): + self.event_bus = EventBus() + self.service = EventStreamService(self.event_bus) + self.ctx = RequestContext.from_astrbot(username="admin", user_id="user_001") + + def test_event_stream_returns_sse_payload(self): + event = self.event_bus.publish("task.completed", {"task_id": "task_001"}) + self.event_bus.publish("workflow.updated", {"workflow_id": "workflow_001"}) + + response = get_event_stream(self.ctx, {"limit": 10}, self.service) + + self.assertTrue(response["ok"]) + data = response["data"] + self.assertEqual(data["content_type"], "text/event-stream") + self.assertEqual(data["count"], 2) + self.assertIn("event: task.completed", data["body"]) + self.assertEqual(data["events"][0]["event_id"], event.event_id) + + def test_event_stream_filters_event_type(self): + self.event_bus.publish("task.completed", {"task_id": "task_001"}) + self.event_bus.publish("workflow.updated", {"workflow_id": "workflow_001"}) + + response = get_event_stream(self.ctx, {"event_type": "workflow.updated"}, self.service) + + self.assertTrue(response["ok"]) + self.assertEqual(response["data"]["count"], 1) + self.assertEqual(response["data"]["events"][0]["event_type"], "workflow.updated") + + def test_event_stream_requires_authentication(self): + response = get_event_stream(RequestContext(), {}, self.service) + + self.assertFalse(response["ok"]) + self.assertEqual(response["error_code"], "UNAUTHORIZED") + + +if __name__ == "__main__": + unittest.main() diff --git a/tests/test_route_registry.py b/tests/test_route_registry.py index 40753f7..4633b41 100644 --- a/tests/test_route_registry.py +++ b/tests/test_route_registry.py @@ -30,6 +30,7 @@ class RouteRegistryTests(unittest.TestCase): self.assertIn(("GET", "settings/snapshots"), keys) self.assertIn(("GET", "settings/snapshots/{snapshot_id}"), keys) self.assertIn(("POST", "settings/rollback"), keys) + self.assertIn(("GET", "events/stream"), keys) self.assertEqual(len(routes), len(ROUTES)) def test_webui_adapter_manifest_includes_api_routes(self):