mirror of
https://github.com/All-Hands-AI/OpenHands.git
synced 2026-04-29 03:00:45 -04:00
9b371b1b5f
This PR fixes #1897. In addition, this PR fixes and tweaks a few micro-agents. For the first time, I am able to use ManagerAgent to complete test_write_simple_script and test_edits tasks in integration tests, so this PR also adds ManagerAgent as part of integration tests. test_write_simple_script involves delegation to CoderAgent while test_edits involves delegation to TypoFixerAgent. Also for the first time, I am able to use DelegateAgent to complete test_write_simple_script and test_edits tasks in integration tests, so this PR also adds DelegateAgent as part of integration tests. It involves delegation to StudyRepoForTaskAgent, CoderAgent and VerifierAgent. This PR is a blocker for #1735 and likely #1945.
106 lines
3.5 KiB
Python
106 lines
3.5 KiB
Python
import asyncio
|
|
import json
|
|
from datetime import datetime
|
|
from enum import Enum
|
|
from typing import Callable, Iterable
|
|
|
|
from opendevin.core.logger import opendevin_logger as logger
|
|
from opendevin.events.serialization.event import event_from_dict, event_to_dict
|
|
from opendevin.storage import FileStore, get_file_store
|
|
|
|
from .event import Event, EventSource
|
|
|
|
|
|
class EventStreamSubscriber(str, Enum):
|
|
AGENT_CONTROLLER = 'agent_controller'
|
|
SERVER = 'server'
|
|
RUNTIME = 'runtime'
|
|
MAIN = 'main'
|
|
TEST = 'test'
|
|
|
|
|
|
class EventStream:
|
|
sid: str
|
|
# For each subscriber ID, there is a stack of callback functions - useful
|
|
# when there are agent delegates
|
|
_subscribers: dict[str, list[Callable]]
|
|
_cur_id: int
|
|
_lock: asyncio.Lock
|
|
_file_store: FileStore
|
|
|
|
def __init__(self, sid: str):
|
|
self.sid = sid
|
|
self._file_store = get_file_store()
|
|
self._subscribers = {}
|
|
self._cur_id = 0
|
|
self._lock = asyncio.Lock()
|
|
self._reinitialize_from_file_store()
|
|
|
|
def _reinitialize_from_file_store(self):
|
|
try:
|
|
events = self._file_store.list(f'sessions/{self.sid}/events')
|
|
except FileNotFoundError:
|
|
logger.warning(f'No events found for session {self.sid}')
|
|
return
|
|
for event_str in events:
|
|
id = self._get_id_from_filename(event_str)
|
|
if id >= self._cur_id:
|
|
self._cur_id = id + 1
|
|
|
|
def _get_filename_for_id(self, id: int) -> str:
|
|
return f'sessions/{self.sid}/events/{id}.json'
|
|
|
|
def _get_id_from_filename(self, filename: str) -> int:
|
|
return int(filename.split('/')[-1].split('.')[0])
|
|
|
|
def get_events(self, start_id=0, end_id=None) -> Iterable[Event]:
|
|
event_id = start_id
|
|
while True:
|
|
if end_id is not None and event_id > end_id:
|
|
break
|
|
try:
|
|
event = self.get_event(event_id)
|
|
except FileNotFoundError:
|
|
break
|
|
yield event
|
|
event_id += 1
|
|
|
|
def get_event(self, id: int) -> Event:
|
|
filename = self._get_filename_for_id(id)
|
|
content = self._file_store.read(filename)
|
|
data = json.loads(content)
|
|
return event_from_dict(data)
|
|
|
|
def subscribe(self, id: EventStreamSubscriber, callback: Callable, append=False):
|
|
if id in self._subscribers:
|
|
if append:
|
|
self._subscribers[id].append(callback)
|
|
else:
|
|
raise ValueError('Subscriber already exists: ' + id)
|
|
else:
|
|
self._subscribers[id] = [callback]
|
|
|
|
def unsubscribe(self, id: EventStreamSubscriber):
|
|
if id not in self._subscribers:
|
|
logger.warning('Subscriber not found during unsubscribe: ' + id)
|
|
else:
|
|
self._subscribers[id].pop()
|
|
if len(self._subscribers[id]) == 0:
|
|
del self._subscribers[id]
|
|
|
|
# TODO: make this not async
|
|
async def add_event(self, event: Event, source: EventSource):
|
|
async with self._lock:
|
|
event._id = self._cur_id # type: ignore [attr-defined]
|
|
self._cur_id += 1
|
|
event._timestamp = datetime.now() # type: ignore [attr-defined]
|
|
event._source = source # type: ignore [attr-defined]
|
|
data = event_to_dict(event)
|
|
if event.id is not None:
|
|
self._file_store.write(
|
|
self._get_filename_for_id(event.id), json.dumps(data)
|
|
)
|
|
for key, stack in self._subscribers.items():
|
|
callback = stack[-1]
|
|
await callback(event)
|