github/OpenHands
1
1
Fork 0
mirror of https://github.com/All-Hands-AI/OpenHands.git synced 2026-01-09 14:57:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace deprecated get_matching_events with search_events (#12249)

Browse Source 
Co-authored-by: openhands <openhands@all-hands.dev>
This commit is contained in:
Graham Neubig
2026-01-02 16:59:17 -05:00
committed by GitHub
parent 903c047015
commit cdc42130e1
1 changed files with 47 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
enterprise/integrations/utils.py
View File

@@ -20,6 +20,7 @@ from openhands.events.action import (
AgentFinishAction, AgentFinishAction,
MessageAction, MessageAction,
) )
from openhands.events.event_filter import EventFilter
from openhands.events.event_store_abc import EventStoreABC from openhands.events.event_store_abc import EventStoreABC
from openhands.events.observation.agent import AgentStateChangedObservation from openhands.events.observation.agent import AgentStateChangedObservation
from openhands.integrations.service_types import Repository from openhands.integrations.service_types import Repository
@@ -203,18 +204,35 @@ def get_summary_for_agent_state(
def get_final_agent_observation( def get_final_agent_observation(
event_store: EventStoreABC, event_store: EventStoreABC,
) -> list[AgentStateChangedObservation]: ) -> list[AgentStateChangedObservation]:
return event_store.get_matching_events( events = list(
source=EventSource.ENVIRONMENT, event_store.search_events(
event_types=(AgentStateChangedObservation,), filter=EventFilter(
limit=1, source=EventSource.ENVIRONMENT,
reverse=True, include_types=(AgentStateChangedObservation,),
),
limit=1,
reverse=True,
)
) )
result = [e for e in events if isinstance(e, AgentStateChangedObservation)]
assert len(result) == len(events)
return result
def get_last_user_msg(event_store: EventStoreABC) -> list[MessageAction]: def get_last_user_msg(event_store: EventStoreABC) -> list[MessageAction]:
return event_store.get_matching_events( events = list(
source=EventSource.USER, event_types=(MessageAction,), limit=1, reverse='true' event_store.search_events(
filter=EventFilter(
source=EventSource.USER,
include_types=(MessageAction,),
),
limit=1,
reverse=True,
)
) )
result = [e for e in events if isinstance(e, MessageAction)]
assert len(result) == len(events)
return result
def extract_summary_from_event_store( def extract_summary_from_event_store(
@@ -226,18 +244,22 @@ def extract_summary_from_event_store(
conversation_link = CONVERSATION_URL.format(conversation_id) conversation_link = CONVERSATION_URL.format(conversation_id)
summary_instruction = get_summary_instruction() summary_instruction = get_summary_instruction()
instruction_event: list[MessageAction] = event_store.get_matching_events( instruction_events = list(
query=json.dumps(summary_instruction), event_store.search_events(
source=EventSource.USER, filter=EventFilter(
event_types=(MessageAction,), query=json.dumps(summary_instruction),
limit=1, source=EventSource.USER,
reverse=True, include_types=(MessageAction,),
),
limit=1,
reverse=True,
)
) )
final_agent_observation = get_final_agent_observation(event_store) final_agent_observation = get_final_agent_observation(event_store)
# Find summary instruction event ID # Find summary instruction event ID
if len(instruction_event) == 0: if not instruction_events:
logger.warning( logger.warning(
'no_instruction_event_found', extra={'conversation_id': conversation_id} 'no_instruction_event_found', extra={'conversation_id': conversation_id}
) )
@@ -245,19 +267,19 @@ def extract_summary_from_event_store(
final_agent_observation, conversation_link final_agent_observation, conversation_link
) # Agent did not receive summary instruction ) # Agent did not receive summary instruction
event_id: int = instruction_event[0].id summary_events = list(
event_store.search_events(
agent_messages: list[MessageAction | AgentFinishAction] = ( filter=EventFilter(
event_store.get_matching_events( source=EventSource.AGENT,
start_id=event_id, include_types=(MessageAction, AgentFinishAction),
source=EventSource.AGENT, ),
event_types=(MessageAction, AgentFinishAction),
reverse=True,
limit=1, limit=1,
reverse=True,
start_id=instruction_events[0].id,
) )
) )
if len(agent_messages) == 0: if not summary_events:
logger.warning( logger.warning(
'no_agent_messages_found', extra={'conversation_id': conversation_id} 'no_agent_messages_found', extra={'conversation_id': conversation_id}
) )
@@ -265,10 +287,11 @@ def extract_summary_from_event_store(
final_agent_observation, conversation_link final_agent_observation, conversation_link
) # Agent failed to generate summary ) # Agent failed to generate summary
summary_event: MessageAction | AgentFinishAction = agent_messages[0] summary_event = summary_events[0]
if isinstance(summary_event, MessageAction): if isinstance(summary_event, MessageAction):
return summary_event.content return summary_event.content
assert isinstance(summary_event, AgentFinishAction)
return summary_event.final_thought return summary_event.final_thought