feat(agent): migrate to native CrewAI tool loop and async resume enqueue

This commit is contained in:
zl-q
2026-03-08 16:01:16 +08:00
parent 120df903d2
commit 8a23018b6d
29 changed files with 2234 additions and 1115 deletions
+14 -14
View File
@@ -13,7 +13,10 @@ from fastapi import HTTPException
from fastapi.responses import StreamingResponse
from core.agent.infrastructure.agui.stream import to_sse_event
from core.agent.domain.agui_input import parse_run_input
from core.agent.domain.agui_input import (
parse_run_input,
validate_run_request_messages_contract,
)
from core.auth.models import CurrentUser
from services.base.redis import get_or_init_redis_client
from v1.agent.dependencies import get_agent_service
@@ -76,7 +79,8 @@ async def enqueue_run(
current_user: Annotated[CurrentUser, Depends(get_current_user)],
) -> TaskAcceptedResponse:
try:
parse_run_input(request.model_dump(mode="json", by_alias=True))
normalized = parse_run_input(request.model_dump(mode="json", by_alias=True))
validate_run_request_messages_contract(normalized)
except ValueError as exc:
raise HTTPException(status_code=422, detail=str(exc)) from exc
allowed = await _allow_run_request(user_id=str(current_user.id))
@@ -88,9 +92,9 @@ async def enqueue_run(
current_user=current_user,
)
return TaskAcceptedResponse(
task_id=task.task_id,
thread_id=task.thread_id,
run_id=task.run_id,
taskId=task.task_id,
threadId=task.thread_id,
runId=task.run_id,
created=task.created,
)
@@ -118,9 +122,9 @@ async def enqueue_resume(
current_user=current_user,
)
return TaskAcceptedResponse(
task_id=task.task_id,
thread_id=task.thread_id,
run_id=task.run_id,
taskId=task.task_id,
threadId=task.thread_id,
runId=task.run_id,
created=task.created,
)
@@ -134,12 +138,8 @@ async def stream_events(
last_event_id: str | None = Header(default=None, alias="Last-Event-ID"),
idle_limit: int = Query(default=300, ge=1, le=3600),
) -> StreamingResponse:
if (
last_event_id is not None
and (
len(last_event_id) > 32
or _LAST_EVENT_ID_RE.fullmatch(last_event_id) is None
)
if last_event_id is not None and (
len(last_event_id) > 32 or _LAST_EVENT_ID_RE.fullmatch(last_event_id) is None
):
raise HTTPException(status_code=422, detail="Invalid Last-Event-ID")
+20 -1
View File
@@ -56,6 +56,25 @@ class ScheduleItemService(BaseService):
self._auth_gateway = auth_gateway or SupabaseAuthGateway()
async def create(self, request: ScheduleItemCreateRequest) -> ScheduleItemResponse:
return await self._create_with_source(
request=request,
source_type=ScheduleItemSourceType.MANUAL,
)
async def create_agent_generated(
self, request: ScheduleItemCreateRequest
) -> ScheduleItemResponse:
return await self._create_with_source(
request=request,
source_type=ScheduleItemSourceType.AGENT_GENERATED,
)
async def _create_with_source(
self,
*,
request: ScheduleItemCreateRequest,
source_type: ScheduleItemSourceType,
) -> ScheduleItemResponse:
user_id = self.require_user_id()
if request.end_at and request.end_at <= request.start_at:
@@ -69,7 +88,7 @@ class ScheduleItemService(BaseService):
"end_at": request.end_at,
"timezone": request.timezone,
"metadata": request.metadata.model_dump() if request.metadata else {},
"source_type": ScheduleItemSourceType.MANUAL,
"source_type": source_type,
"status": ScheduleItemStatus.ACTIVE,
"created_by": user_id,
}
+23 -1
View File
@@ -1,13 +1,16 @@
from __future__ import annotations
import re
from typing import TYPE_CHECKING, Protocol
from typing import TYPE_CHECKING, Protocol, cast
from uuid import UUID
from fastapi import HTTPException
from sqlalchemy.exc import SQLAlchemyError
from core.auth.models import CurrentUser
from core.agent.infrastructure.persistence.user_context_cache import (
create_user_context_cache,
)
from core.db.base_service import BaseService
from core.logging import get_logger
from v1.users.repository import UserRepository
@@ -31,6 +34,10 @@ class AuthByEmailGateway(Protocol):
async def get_user_by_email(self, email: str) -> "UserByEmailResponse": ...
class UserContextInvalidator(Protocol):
async def invalidate_user(self, *, user_id: UUID) -> int: ...
class AuthLookupAdapter:
def __init__(self, gateway: AuthByEmailGateway) -> None:
self._gateway = gateway
@@ -55,6 +62,7 @@ class UserService(BaseService):
_repository: UserRepository
_session: AsyncSession
_auth_gateway: AuthLookupGateway | None
_user_context_cache: UserContextInvalidator
def __init__(
self,
@@ -62,11 +70,16 @@ class UserService(BaseService):
session: AsyncSession,
current_user: CurrentUser | None,
auth_gateway: AuthLookupGateway | None = None,
user_context_cache: UserContextInvalidator | None = None,
) -> None:
super().__init__(current_user=current_user)
self._repository = repository
self._session = session
self._auth_gateway = auth_gateway
self._user_context_cache = cast(
UserContextInvalidator,
user_context_cache or create_user_context_cache(),
)
async def get_me(self) -> UserResponse:
user_id = self.require_user_id()
@@ -109,6 +122,15 @@ class UserService(BaseService):
if user is None:
raise HTTPException(status_code=404, detail="User not found")
try:
await self._user_context_cache.invalidate_user(user_id=user_id)
except Exception as exc:
logger.warning(
"Failed to invalidate user context cache after profile update",
user_id=str(user_id),
error=str(exc),
)
return UserResponse(
id=str(user.id),
username=user.username,