feat: 增强日历功能并集成 AgentScope 代理服务

backend/src/v1/agent/dependencies.py

@@ -2,21 +2,20 @@ from __future__ import annotations
 
 import asyncio
 from typing import Any
-from uuid import UUID
 
 from fastapi import Depends
 from redis.asyncio import Redis
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from core.agent.infrastructure.events.redis_stream import RedisStreamEventStore
-from core.agent.infrastructure.storage.tool_result_storage import (
-    create_tool_result_storage,
-)
-from core.agent.infrastructure.queue.tasks import (
+from core.agentscope.events import RedisStreamBus
+from core.agentscope.runtime.tasks import (
     run_command_task,
     run_command_task_bulk,
     run_command_task_critical,
 )
+from core.agent.infrastructure.storage.tool_result_storage import (
+    create_tool_result_storage,
+)
 from core.config.settings import config
 from core.db import get_db
 from services.base.redis import get_or_init_redis_client
@@ -84,18 +83,18 @@ class TaskiqQueueClient:
 
 class RedisEventStream:
     def __init__(self) -> None:
-        self._store: RedisStreamEventStore | None = None
+        self._bus: RedisStreamBus | None = None
 
-    async def _get_store(self) -> RedisStreamEventStore:
-        if self._store is None:
+    async def _get_bus(self) -> RedisStreamBus:
+        if self._bus is None:
             client = await get_or_init_redis_client()
-            self._store = RedisStreamEventStore(
+            self._bus = RedisStreamBus(
                 client=client,
                 stream_prefix=config.agent_runtime.redis_stream_prefix,
                 read_count=config.agent_runtime.redis_stream_read_count,
                 block_ms=config.agent_runtime.redis_stream_block_ms,
             )
-        return self._store
+        return self._bus
 
     async def read(
         self,
@@ -103,12 +102,9 @@ class RedisEventStream:
         session_id: str,
         last_event_id: str | None,
     ) -> list[dict[str, Any]]:
-        store = await self._get_store()
-        rows = await store.read_events(
-            session_id=UUID(session_id),
-            last_event_id=last_event_id,
-        )
-        return [{**row, "cursor": last_event_id} for row in rows]
+        bus = await self._get_bus()
+        rows = await bus.read(session_id=session_id, last_event_id=last_event_id)
+        return [{**row, "cursor": row.get("id")} for row in rows]
 
 
 def get_agent_service(session: AsyncSession = Depends(get_db)) -> AgentService: