合并 codex/mcp-runtime-reliability: 运行可靠性、局状态与决策交接
与 main 上的审查修复及 2131f89 (story-test) 合并, 冲突处理:
- mcp_session: 保留超时/取消客户端, 补回 raise_on_error
- 执行器: 局状态改用 run_state (run_id 绑定), 取代完成后归档 context;
Jev 请求统一经 jev_client.request_answer (支持 baseUrl/curl, 返回置信度与概率);
保留截图解码缓存、地图模板缓存、按坐标点按钮、use_last_error 单实例互斥;
刷新计数与开战标记只在动作成功后更新
- battle_batch: 取消/预算框架 + 只在看到胜率按钮时点胜率再回车;
回合标签改为包含匹配 (OCR 常输出 'wave1')
- 文档采用 reliability 版本 (已是仓库相对路径), 注明 jev_client
- 测试: 互斥量桩改为 WinDLL/get_last_error, 战斗批次测试按胜率语义重写,
Jev 测试改为对 jev_client 打桩, 生命周期测试改为轮询; 145 项通过
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -7,6 +7,7 @@ from pathlib import Path
|
|||||||
from unittest import mock
|
from unittest import mock
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'scripts'))
|
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'scripts'))
|
||||||
import jev_mirror_agent as agent
|
import jev_mirror_agent as agent
|
||||||
|
import jev_client # noqa: E402 Jev 请求经由 jev_client 发出
|
||||||
|
|
||||||
|
|
||||||
class SceneRegressionTest(unittest.TestCase):
|
class SceneRegressionTest(unittest.TestCase):
|
||||||
@@ -92,13 +93,29 @@ class SceneRegressionTest(unittest.TestCase):
|
|||||||
self.assertEqual(agent.fixed_fallback(options),'prepare_thunderbranch')
|
self.assertEqual(agent.fixed_fallback(options),'prepare_thunderbranch')
|
||||||
|
|
||||||
def test_jev_rate_limit_fails_without_sleep_or_second_request(self):
|
def test_jev_rate_limit_fails_without_sleep_or_second_request(self):
|
||||||
error=agent.urllib.error.HTTPError('https://example.test',429,'rate limit',{},None)
|
error=jev_client.urllib.error.HTTPError('https://example.test',429,'rate limit',{},None)
|
||||||
with mock.patch.object(agent.urllib.request,'urlopen',side_effect=error) as request, mock.patch.object(agent.time,'sleep') as sleep:
|
with mock.patch.object(jev_client.urllib.request,'urlopen',side_effect=error) as request, mock.patch.object(jev_client.time,'sleep') as sleep:
|
||||||
with self.assertRaises(agent.urllib.error.HTTPError):
|
with self.assertRaises(jev_client.urllib.error.HTTPError):
|
||||||
agent.decide({'apiKey':'test'}, {'items':[]},{'wait':{'description':'wait'}},[])
|
agent.decide({'apiKey':'test','model':'jev-test'}, {'items':[]},{'wait':{'description':'wait'}},[])
|
||||||
self.assertEqual(request.call_count,1)
|
self.assertEqual(request.call_count,1)
|
||||||
sleep.assert_not_called()
|
sleep.assert_not_called()
|
||||||
|
|
||||||
|
def test_jev_uses_configured_model_and_returns_probabilities_without_images(self):
|
||||||
|
response = mock.MagicMock()
|
||||||
|
response.__enter__.return_value = response
|
||||||
|
response.read.return_value = b'{"model":"jev-test","answers":{"action":{"type":"choice","choice":"wait","confidence":0.5,"probabilities":{"wait":0.75,"inspect":0.25}}}}'
|
||||||
|
state = {'screen': {'path': 'LOCAL_SCREENSHOT_ONLY.png'},
|
||||||
|
'items': [{'text': 'EVENT', 'x': 10, 'y': 20}]}
|
||||||
|
options = {'wait': {'description': 'wait'}, 'inspect': {'description': 'inspect'}}
|
||||||
|
with mock.patch.object(jev_client.urllib.request, 'urlopen', return_value=response) as request:
|
||||||
|
result = agent.decide({'apiKey': 'test', 'model': 'jev-test'}, state, options, [])
|
||||||
|
payload = agent.json.loads(request.call_args.args[0].data.decode('utf-8'))
|
||||||
|
self.assertEqual(payload['model'], 'jev-test')
|
||||||
|
self.assertIsInstance(payload['state'], str)
|
||||||
|
self.assertNotIn('LOCAL_SCREENSHOT_ONLY', payload['state'])
|
||||||
|
self.assertEqual(result['confidence'], .5)
|
||||||
|
self.assertEqual(result['probabilities'], {'wait': .75, 'inspect': .25})
|
||||||
|
|
||||||
def test_single_extra_gift_decline_preserves_core_and_multi_cards(self):
|
def test_single_extra_gift_decline_preserves_core_and_multi_cards(self):
|
||||||
state = {'items': [{'text':t,'x':100,'y':100,'w':100,'h':40} for t in
|
state = {'items': [{'text':t,'x':100,'y':100,'w':100,'h':40} for t in
|
||||||
('获得E.G.O饰品','石版字符','拒绝饰品','选择')]}
|
('获得E.G.O饰品','石版字符','拒绝饰品','选择')]}
|
||||||
@@ -512,30 +529,19 @@ class MainLoopTest(unittest.TestCase):
|
|||||||
agent.main()
|
agent.main()
|
||||||
return make_bridge
|
return make_bridge
|
||||||
|
|
||||||
def test_completed_run_archives_context_for_next_run(self):
|
|
||||||
with tempfile.TemporaryDirectory() as folder:
|
|
||||||
home = Path(folder)
|
|
||||||
(home / 'jev_shop_context.json').write_text(json.dumps(
|
|
||||||
{'refresh_used': 0, 'floor': 5, 'claim_requested': True, 'battery_obtained': True}))
|
|
||||||
bridge = mock.Mock()
|
|
||||||
bridge.call.return_value = {'ok': True, 'items': [
|
|
||||||
{'text': t, 'x': 0, 'y': 0, 'w': 1, 'h': 1, 'score': 1.0} for t in ('探索状态', '进入')]}
|
|
||||||
self.run_main(home, bridge)
|
|
||||||
self.assertEqual(json.loads((home / 'jev_mirror_status.json').read_text())['state'], 'completed')
|
|
||||||
# 否则下一局一启动就因 claim_requested 被判定为“已完成”
|
|
||||||
self.assertFalse((home / 'jev_shop_context.json').exists())
|
|
||||||
self.assertEqual(len(list(home.glob('jev_shop_context.*.json'))), 1)
|
|
||||||
|
|
||||||
def test_tool_errors_are_observed_instead_of_aborting(self):
|
def test_tool_errors_are_observed_instead_of_aborting(self):
|
||||||
with tempfile.TemporaryDirectory() as folder:
|
with tempfile.TemporaryDirectory() as folder:
|
||||||
home = Path(folder)
|
home = Path(folder)
|
||||||
bridge = mock.Mock()
|
bridge = mock.Mock()
|
||||||
bridge.call.return_value = {'ok': False, 'error': '截图失败'}
|
bridge.call.return_value = {'ok': False, 'error': '截图失败'}
|
||||||
make_bridge = self.run_main(home, bridge, steps=2)
|
make_bridge = self.run_main(home, bridge, steps=2)
|
||||||
make_bridge.assert_called_once_with(raise_on_error=False)
|
make_bridge.assert_called_once()
|
||||||
|
self.assertIs(make_bridge.call_args.kwargs['raise_on_error'], False)
|
||||||
status = json.loads((home / 'jev_mirror_status.json').read_text())
|
status = json.loads((home / 'jev_mirror_status.json').read_text())
|
||||||
self.assertNotIn('error', status) # 没有因异常退出, 而是按“截图暂不可用”继续等待
|
# 没有因异常退出, 而是按“截图暂不可用”等待到步数用完
|
||||||
self.assertEqual(status['choice'], 'wait')
|
self.assertEqual((status['state'], status.get('reason')), ('stopped', 'step_limit'))
|
||||||
|
records = [json.loads(line) for line in (home / 'jev_mirror_log.jsonl').read_text().splitlines()]
|
||||||
|
self.assertEqual([r['choice'] for r in records], ['wait', 'wait'])
|
||||||
|
|
||||||
|
|
||||||
class SessionTest(unittest.TestCase):
|
class SessionTest(unittest.TestCase):
|
||||||
@@ -545,7 +551,7 @@ class SessionTest(unittest.TestCase):
|
|||||||
session = mcp_session.Session.__new__(mcp_session.Session)
|
session = mcp_session.Session.__new__(mcp_session.Session)
|
||||||
session.request = mock.Mock(return_value={'isError': True, 'content': [
|
session.request = mock.Mock(return_value={'isError': True, 'content': [
|
||||||
{'type': 'text', 'text': json.dumps({'ok': False, 'error': 'text not found'})}]})
|
{'type': 'text', 'text': json.dumps({'ok': False, 'error': 'text not found'})}]})
|
||||||
session.raise_on_error = False
|
session.raise_on_error, session.timeout = False, 30
|
||||||
self.assertEqual(session.call('click_text', {'text': 'x'}), {'ok': False, 'error': 'text not found'})
|
self.assertEqual(session.call('click_text', {'text': 'x'}), {'ok': False, 'error': 'text not found'})
|
||||||
session.raise_on_error = True
|
session.raise_on_error = True
|
||||||
with self.assertRaises(RuntimeError):
|
with self.assertRaises(RuntimeError):
|
||||||
|
|||||||
Reference in New Issue
Block a user