mirror of
https://github.com/pewdiepie-archdaemon/odysseus.git
synced 2026-10-24 15:52:20 +02:00
recover boundedly from action-only replies
This commit is contained in:
@@ -989,6 +989,22 @@ def contentless_final_response(content):
|
|||||||
))
|
))
|
||||||
|
|
||||||
|
|
||||||
|
def action_promise_response(content):
|
||||||
|
"""Recognize a short promise to do work that contains no result yet."""
|
||||||
|
text = re.sub(r'\s+', ' ', str(content or '')).strip()
|
||||||
|
if not text or len(text.split()) > 48:
|
||||||
|
return False
|
||||||
|
if re.search(r'\b(?:answer|result|score|served|created|saved)\s*:', text, re.I):
|
||||||
|
return False
|
||||||
|
return bool(re.match(
|
||||||
|
r"^(?:okay[,.:]?\s*)?(?:let me|i(?:'ll| will)|next[,.:]?\s+i(?:'ll| will))\s+"
|
||||||
|
r"(?:now\s+)?(?:inspect|extract|read|check|review|analy[sz]e|verify|open|"
|
||||||
|
r"search|look|create|write|render|run|use|continue|finish|provide)\b",
|
||||||
|
text,
|
||||||
|
re.I,
|
||||||
|
))
|
||||||
|
|
||||||
|
|
||||||
def broad_current_web_request(user_text):
|
def broad_current_web_request(user_text):
|
||||||
"""Whether the user requested a broad current-information briefing."""
|
"""Whether the user requested a broad current-information briefing."""
|
||||||
return broad_web_briefing_request(user_text)
|
return broad_web_briefing_request(user_text)
|
||||||
@@ -4245,6 +4261,7 @@ async def stream_preview(*, endpoint_url, model, messages, headers, turn_contrac
|
|||||||
search_completion_attempted = False
|
search_completion_attempted = False
|
||||||
budget_completion_attempted = False
|
budget_completion_attempted = False
|
||||||
answer_recovery_attempts = 0
|
answer_recovery_attempts = 0
|
||||||
|
action_promise_recovery_attempts = 0
|
||||||
citation_recovery_attempted = False
|
citation_recovery_attempted = False
|
||||||
force_no_tools_next_round = False
|
force_no_tools_next_round = False
|
||||||
force_web_search_next_round = (
|
force_web_search_next_round = (
|
||||||
@@ -4785,6 +4802,34 @@ async def stream_preview(*, endpoint_url, model, messages, headers, turn_contrac
|
|||||||
})
|
})
|
||||||
yield event({'type': 'completion_recovery', 'reason': 'contentless_answer'})
|
yield event({'type': 'completion_recovery', 'reason': 'contentless_answer'})
|
||||||
continue
|
continue
|
||||||
|
if (
|
||||||
|
not research_expansion_due
|
||||||
|
and action_promise_response(content)
|
||||||
|
and action_promise_recovery_attempts < 2
|
||||||
|
and round_number < round_limit
|
||||||
|
):
|
||||||
|
action_promise_recovery_attempts += 1
|
||||||
|
force_no_tools_next_round = action_promise_recovery_attempts > 1
|
||||||
|
replace_streamed_draft_on_finish = True
|
||||||
|
history.pop()
|
||||||
|
instruction = (
|
||||||
|
'Completion check: the draft only promised a next action and did not '
|
||||||
|
'answer the user. Execute the necessary next action with the offered '
|
||||||
|
'tools now; do not narrate or promise it.'
|
||||||
|
if not force_no_tools_next_round else
|
||||||
|
'Completion check: a second action promise is not an answer. Using only '
|
||||||
|
'the tool evidence already gathered, answer the original request '
|
||||||
|
'directly now, state uncertainty plainly, and do not call another tool.'
|
||||||
|
)
|
||||||
|
history.append({
|
||||||
|
'role': 'user', '_harness_control': True, 'content': instruction,
|
||||||
|
})
|
||||||
|
yield event({
|
||||||
|
'type': 'completion_recovery',
|
||||||
|
'reason': 'action_promise_without_result',
|
||||||
|
'attempt': action_promise_recovery_attempts,
|
||||||
|
})
|
||||||
|
continue
|
||||||
if research_expansion_due:
|
if research_expansion_due:
|
||||||
breadth_recovery_attempted = True
|
breadth_recovery_attempted = True
|
||||||
force_web_search_next_round = True
|
force_web_search_next_round = True
|
||||||
|
|||||||
@@ -553,6 +553,23 @@ def test_required_binary_artifact_forces_python_instead_of_text_writer():
|
|||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def test_action_promise_response_rejects_future_work_but_not_real_answers():
|
||||||
|
import src.clean_agent_preview as module
|
||||||
|
|
||||||
|
assert module.action_promise_response(
|
||||||
|
'Let me extract frames and read the on-screen text directly.'
|
||||||
|
)
|
||||||
|
assert module.action_promise_response(
|
||||||
|
'I will now inspect the remaining segments before answering.'
|
||||||
|
)
|
||||||
|
assert not module.action_promise_response(
|
||||||
|
'I inspected all segments. Alex served: 6, Sam served: 6.'
|
||||||
|
)
|
||||||
|
assert not module.action_promise_response(
|
||||||
|
'Alex served 6 times. Let me know if you want the timestamps.'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_repeated_off_contract_artifact_calls_trigger_single_file_body_handoff():
|
def test_repeated_off_contract_artifact_calls_trigger_single_file_body_handoff():
|
||||||
import src.clean_agent_preview as module
|
import src.clean_agent_preview as module
|
||||||
|
|
||||||
@@ -733,6 +750,83 @@ async def test_binary_artifact_completion_requests_python_not_text_writer(monkey
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_action_promise_resumes_tools_then_forces_final_synthesis(monkeypatch):
|
||||||
|
import src.clean_agent_preview as module
|
||||||
|
|
||||||
|
call = lambda index: {'choices': [{'delta': {'tool_calls': [{
|
||||||
|
'index': 0, 'id': f'inspect-{index}',
|
||||||
|
'function': {'name': 'inspect_media', 'arguments': json.dumps({
|
||||||
|
'path': '/workspace/input/video.mp4',
|
||||||
|
'query': f'segment {index}',
|
||||||
|
})},
|
||||||
|
}]}}]}
|
||||||
|
responses = iter([
|
||||||
|
call(1),
|
||||||
|
{'choices': [{'delta': {'content': 'Let me inspect the remaining segment.'}}]},
|
||||||
|
call(2),
|
||||||
|
{'choices': [{'delta': {'content': 'I will now review the frames.'}}]},
|
||||||
|
{'choices': [{'delta': {'content': 'Alex served: 6, Sam served: 6.'}}]},
|
||||||
|
])
|
||||||
|
requests = []
|
||||||
|
|
||||||
|
class Response:
|
||||||
|
def __init__(self, payload): self.payload = payload
|
||||||
|
async def __aenter__(self): return self
|
||||||
|
async def __aexit__(self, *args): pass
|
||||||
|
def raise_for_status(self): pass
|
||||||
|
async def aiter_lines(self):
|
||||||
|
yield 'data: ' + json.dumps(self.payload)
|
||||||
|
yield 'data: [DONE]'
|
||||||
|
|
||||||
|
class Client:
|
||||||
|
def __init__(self, **kwargs): pass
|
||||||
|
async def __aenter__(self): return self
|
||||||
|
async def __aexit__(self, *args): pass
|
||||||
|
def stream(self, *args, **kwargs):
|
||||||
|
requests.append(kwargs['json'])
|
||||||
|
return Response(next(responses))
|
||||||
|
|
||||||
|
executed = []
|
||||||
|
|
||||||
|
async def execute(block, **kwargs):
|
||||||
|
executed.append(block.tool_type)
|
||||||
|
return block.tool_type, {'output': 'timestamped visual evidence', 'exit_code': 0}
|
||||||
|
|
||||||
|
monkeypatch.setattr(module.httpx, 'AsyncClient', Client)
|
||||||
|
monkeypatch.setattr(module, 'execute_tool_block', execute)
|
||||||
|
schema = next(
|
||||||
|
item for item in FUNCTION_TOOL_SCHEMAS
|
||||||
|
if item['function']['name'] == 'inspect_media'
|
||||||
|
)
|
||||||
|
contract = resolve_full_inventory_contract(schemas=[schema], policy=ToolPolicy())
|
||||||
|
raw = [chunk async for chunk in stream_preview(
|
||||||
|
endpoint_url='http://test', model='kimi-k3',
|
||||||
|
messages=[{'role': 'user', 'content': 'Inspect the full video and report counts.'}],
|
||||||
|
headers={}, turn_contract=contract, session_id='test', owner='test',
|
||||||
|
disabled_tools=set(), tool_policy=ToolPolicy(), workspace='/workspace',
|
||||||
|
client_runtime_context={
|
||||||
|
'surface': 'odysseus-native', 'terminal_agent': True,
|
||||||
|
'unattended_mode': True,
|
||||||
|
}, max_tokens=8192, max_rounds=6,
|
||||||
|
)]
|
||||||
|
|
||||||
|
assert executed == ['inspect_media', 'inspect_media']
|
||||||
|
assert requests[2].get('tools')
|
||||||
|
assert 'tools' not in requests[4]
|
||||||
|
events = [json.loads(chunk[6:]) for chunk in raw if '[DONE]' not in chunk]
|
||||||
|
recoveries = [
|
||||||
|
event for event in events
|
||||||
|
if event.get('reason') == 'action_promise_without_result'
|
||||||
|
]
|
||||||
|
assert [event['attempt'] for event in recoveries] == [1, 2]
|
||||||
|
assert any(
|
||||||
|
event.get('type') == 'final_response'
|
||||||
|
and 'Alex served: 6' in event.get('content', '')
|
||||||
|
for event in events
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_repeated_off_contract_calls_recover_via_required_artifact_body(monkeypatch):
|
async def test_repeated_off_contract_calls_recover_via_required_artifact_body(monkeypatch):
|
||||||
import src.clean_agent_preview as module
|
import src.clean_agent_preview as module
|
||||||
|
|||||||
Reference in New Issue
Block a user