mirror of
https://github.com/OpenHands/OpenHands.git
synced 2025-12-26 05:48:36 +08:00
a63001e106
The SQLSharedConversationInfoServiceInjector class was being registered twice because the same module was being imported via two different paths: - enterprise.server.sharing.sql_shared_conversation_info_service - server.sharing.sql_shared_conversation_info_service This happened because the enterprise pyproject.toml defines packages without the 'enterprise.' prefix (e.g., 'server' not 'enterprise.server'), and the PYTHONPATH includes both '.' and the poetry virtualenv. Fixed by changing all imports to use the canonical 'server.sharing.xxx' path that matches the package configuration. Co-authored-by: openhands <openhands@all-hands.dev>
126 lines
4.1 KiB
Python
126 lines
4.1 KiB
Python
"""Shared Event router for OpenHands Server."""
|
|
|
|
from datetime import datetime
|
|
from typing import Annotated
|
|
from uuid import UUID
|
|
|
|
from fastapi import APIRouter, Depends, Query
|
|
from server.sharing.filesystem_shared_event_service import (
|
|
SharedEventServiceImplInjector,
|
|
)
|
|
from server.sharing.shared_event_service import SharedEventService
|
|
from openhands.agent_server.models import EventPage, EventSortOrder
|
|
from openhands.app_server.event_callback.event_callback_models import EventKind
|
|
from openhands.sdk import Event
|
|
|
|
router = APIRouter(prefix='/api/shared-events', tags=['Sharing'])
|
|
shared_event_service_dependency = Depends(SharedEventServiceImplInjector().depends)
|
|
|
|
|
|
# Read methods
|
|
|
|
|
|
@router.get('/search')
|
|
async def search_shared_events(
|
|
conversation_id: Annotated[
|
|
str,
|
|
Query(title='Conversation ID to search events for'),
|
|
],
|
|
kind__eq: Annotated[
|
|
EventKind | None,
|
|
Query(title='Optional filter by event kind'),
|
|
] = None,
|
|
timestamp__gte: Annotated[
|
|
datetime | None,
|
|
Query(title='Optional filter by timestamp greater than or equal to'),
|
|
] = None,
|
|
timestamp__lt: Annotated[
|
|
datetime | None,
|
|
Query(title='Optional filter by timestamp less than'),
|
|
] = None,
|
|
sort_order: Annotated[
|
|
EventSortOrder,
|
|
Query(title='Sort order for results'),
|
|
] = EventSortOrder.TIMESTAMP,
|
|
page_id: Annotated[
|
|
str | None,
|
|
Query(title='Optional next_page_id from the previously returned page'),
|
|
] = None,
|
|
limit: Annotated[
|
|
int,
|
|
Query(title='The max number of results in the page', gt=0, lte=100),
|
|
] = 100,
|
|
shared_event_service: SharedEventService = shared_event_service_dependency,
|
|
) -> EventPage:
|
|
"""Search / List events for a shared conversation."""
|
|
assert limit > 0
|
|
assert limit <= 100
|
|
return await shared_event_service.search_shared_events(
|
|
conversation_id=UUID(conversation_id),
|
|
kind__eq=kind__eq,
|
|
timestamp__gte=timestamp__gte,
|
|
timestamp__lt=timestamp__lt,
|
|
sort_order=sort_order,
|
|
page_id=page_id,
|
|
limit=limit,
|
|
)
|
|
|
|
|
|
@router.get('/count')
|
|
async def count_shared_events(
|
|
conversation_id: Annotated[
|
|
str,
|
|
Query(title='Conversation ID to count events for'),
|
|
],
|
|
kind__eq: Annotated[
|
|
EventKind | None,
|
|
Query(title='Optional filter by event kind'),
|
|
] = None,
|
|
timestamp__gte: Annotated[
|
|
datetime | None,
|
|
Query(title='Optional filter by timestamp greater than or equal to'),
|
|
] = None,
|
|
timestamp__lt: Annotated[
|
|
datetime | None,
|
|
Query(title='Optional filter by timestamp less than'),
|
|
] = None,
|
|
sort_order: Annotated[
|
|
EventSortOrder,
|
|
Query(title='Sort order for results'),
|
|
] = EventSortOrder.TIMESTAMP,
|
|
shared_event_service: SharedEventService = shared_event_service_dependency,
|
|
) -> int:
|
|
"""Count events for a shared conversation matching the given filters."""
|
|
return await shared_event_service.count_shared_events(
|
|
conversation_id=UUID(conversation_id),
|
|
kind__eq=kind__eq,
|
|
timestamp__gte=timestamp__gte,
|
|
timestamp__lt=timestamp__lt,
|
|
sort_order=sort_order,
|
|
)
|
|
|
|
|
|
@router.get('')
|
|
async def batch_get_shared_events(
|
|
conversation_id: Annotated[
|
|
UUID,
|
|
Query(title='Conversation ID to get events for'),
|
|
],
|
|
id: Annotated[list[str], Query()],
|
|
shared_event_service: SharedEventService = shared_event_service_dependency,
|
|
) -> list[Event | None]:
|
|
"""Get a batch of events for a shared conversation given their ids, returning null for any missing event."""
|
|
assert len(id) <= 100
|
|
events = await shared_event_service.batch_get_shared_events(conversation_id, id)
|
|
return events
|
|
|
|
|
|
@router.get('/{conversation_id}/{event_id}')
|
|
async def get_shared_event(
|
|
conversation_id: UUID,
|
|
event_id: str,
|
|
shared_event_service: SharedEventService = shared_event_service_dependency,
|
|
) -> Event | None:
|
|
"""Get a single event from a shared conversation by conversation_id and event_id."""
|
|
return await shared_event_service.get_shared_event(conversation_id, event_id)
|