审查修复: 任务配置恢复、执行器容错与续局状态、识别性能
正确性 - stop_task 强杀后 run_task 的临时次数会残留在 config.yaml (AALC 中途整份存盘); 任务启动时先落盘原值, 强停/异常退出后由 TaskRunner 用 --restore 写回, 写回失败时拒绝启动新任务并在 task_status 显示 pending_restore - Jev 执行器: 工具失败不再抛异常导致整局退出 (Session raise_on_error=False), 原有的"截图暂不可用"等降级分支终于生效; 刷新计数/开战标记只在动作成功后更新 - 一局完成后归档 jev_shop_context.json, 否则 claim_requested 让下一局一启动就判定完成 - 通用按钮直接点已核对的坐标, 不再 click_text 重新搜索 (可能点到背景同名按钮) - 认证行按字节比较, 非 ASCII 输入不再让 compare_digest 抛 TypeError - 单实例互斥改用 use_last_error 读取 ERROR_ALREADY_EXISTS 性能 - find_image 只在窗口尺寸变化时清模板缓存 (原来每次两次全量 gc); 模板列表只扫描一次 - 截图 PNG 压缩级别 1: 1080p 存图 0.66s -> 0.19s - 执行器每帧截图只解码一次 (button_enabled 75ms -> 0.3ms); 地图模板与 ORB 描述子按比例缓存 - 箭头模板用 imdecode 读取, 支持中文路径 (输出与 imread 逐像素一致) 测试 73 -> 84, 修改前的识别输出与修改后逐项比对一致。 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,3 +1,5 @@
|
|||||||
|
import json
|
||||||
|
import os
|
||||||
import tempfile
|
import tempfile
|
||||||
import sys
|
import sys
|
||||||
import unittest
|
import unittest
|
||||||
@@ -435,7 +437,38 @@ class SceneRegressionTest(unittest.TestCase):
|
|||||||
|
|
||||||
def test_disabled_selection_is_not_clickable_candidate(self):
|
def test_disabled_selection_is_not_clickable_candidate(self):
|
||||||
state = {'items': [{'text': '选择', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
|
state = {'items': [{'text': '选择', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
|
||||||
self.assertFalse(any(o['action']['tool'] == 'click_text' for o in agent.candidates(state).values()))
|
self.assertFalse(any(k.startswith('button_') for k in agent.candidates(state)))
|
||||||
|
|
||||||
|
@mock.patch.object(agent, 'button_enabled', return_value=True)
|
||||||
|
def test_generic_button_clicks_the_checked_item(self, _enabled):
|
||||||
|
# 重新按文字搜索会多一次截图+OCR, 且可能点到背景里同名的另一个按钮
|
||||||
|
state = {'items': [{'text': '继续', 'x': 100, 'y': 200, 'w': 80, 'h': 40}]}
|
||||||
|
self.assertEqual(agent.candidates(state)['button_0']['action'],
|
||||||
|
{'tool': 'click', 'args': {'x': 140, 'y': 220}})
|
||||||
|
|
||||||
|
def test_screenshot_decoded_once_for_repeated_checks(self):
|
||||||
|
from PIL import Image
|
||||||
|
with tempfile.TemporaryDirectory() as folder:
|
||||||
|
shot = Path(folder) / 'shot.png'
|
||||||
|
Image.new('L', (200, 100), 200).save(shot)
|
||||||
|
state = {'screen': {'path': str(shot)}}
|
||||||
|
item = {'x': 10, 'y': 10, 'w': 50, 'h': 20}
|
||||||
|
with mock.patch.object(Image, 'open', wraps=Image.open) as opened:
|
||||||
|
self.assertTrue(agent.button_enabled(state, item))
|
||||||
|
self.assertTrue(agent.button_enabled(state, dict(item, x=100)))
|
||||||
|
self.assertEqual(opened.call_count, 1)
|
||||||
|
Image.new('L', (200, 101), 0).save(shot) # 同路径的新内容不能命中旧缓存
|
||||||
|
self.assertFalse(agent.button_enabled(state, item))
|
||||||
|
|
||||||
|
def test_map_templates_are_loaded_once(self):
|
||||||
|
screenshot = Path(__file__).resolve().parent / 'fixtures' / 'floor4_white_events.png'
|
||||||
|
if not (agent.REPO_ROOT / 'vendor' / 'aalc' / 'assets').is_dir():
|
||||||
|
self.skipTest('AALC submodule assets unavailable')
|
||||||
|
state = {'screen': {'path': str(screenshot)}}
|
||||||
|
first = agent.map_candidates(state)
|
||||||
|
loads = agent._map_template.cache_info().misses
|
||||||
|
self.assertEqual(agent.map_candidates(state), first)
|
||||||
|
self.assertEqual(agent._map_template.cache_info().misses, loads)
|
||||||
|
|
||||||
def test_battle_cinematic_keeps_macro_available(self):
|
def test_battle_cinematic_keeps_macro_available(self):
|
||||||
state = {'items': [{'text': '破裂+5', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
|
state = {'items': [{'text': '破裂+5', 'x': 100, 'y': 10, 'w': 80, 'h': 40}]}
|
||||||
@@ -464,5 +497,60 @@ class SceneRegressionTest(unittest.TestCase):
|
|||||||
self.assertNotIn('battle', agent.candidates(state, previous_battle=True))
|
self.assertNotIn('battle', agent.candidates(state, previous_battle=True))
|
||||||
|
|
||||||
|
|
||||||
|
class MainLoopTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def run_main(self, home, bridge, steps=3):
|
||||||
|
config = home / 'cfg.json'
|
||||||
|
config.write_text('{}', encoding='utf-8')
|
||||||
|
with mock.patch.object(agent, 'RUNTIME_HOME', home), \
|
||||||
|
mock.patch.object(agent, 'STOP_FILE', home / 'JEV_STOP'), \
|
||||||
|
mock.patch.object(agent, 'Bridge', return_value=bridge) as make_bridge, \
|
||||||
|
mock.patch.object(agent, 'acquire_single_instance', return_value=lambda: None), \
|
||||||
|
mock.patch.object(agent.time, 'sleep'), \
|
||||||
|
mock.patch.dict(os.environ, {'OPENCODE_API_KEY': 'test-key', 'LC_FIXED_FALLBACK': '1'}), \
|
||||||
|
mock.patch.object(sys, 'argv', ['agent', str(config), '--steps', str(steps)]):
|
||||||
|
agent.main()
|
||||||
|
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):
|
||||||
|
with tempfile.TemporaryDirectory() as folder:
|
||||||
|
home = Path(folder)
|
||||||
|
bridge = mock.Mock()
|
||||||
|
bridge.call.return_value = {'ok': False, 'error': '截图失败'}
|
||||||
|
make_bridge = self.run_main(home, bridge, steps=2)
|
||||||
|
make_bridge.assert_called_once_with(raise_on_error=False)
|
||||||
|
status = json.loads((home / 'jev_mirror_status.json').read_text())
|
||||||
|
self.assertNotIn('error', status) # 没有因异常退出, 而是按“截图暂不可用”继续等待
|
||||||
|
self.assertEqual(status['choice'], 'wait')
|
||||||
|
|
||||||
|
|
||||||
|
class SessionTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def test_tool_errors_can_be_returned_instead_of_raised(self):
|
||||||
|
import mcp_session
|
||||||
|
session = mcp_session.Session.__new__(mcp_session.Session)
|
||||||
|
session.request = mock.Mock(return_value={'isError': True, 'content': [
|
||||||
|
{'type': 'text', 'text': json.dumps({'ok': False, 'error': 'text not found'})}]})
|
||||||
|
session.raise_on_error = False
|
||||||
|
self.assertEqual(session.call('click_text', {'text': 'x'}), {'ok': False, 'error': 'text not found'})
|
||||||
|
session.raise_on_error = True
|
||||||
|
with self.assertRaises(RuntimeError):
|
||||||
|
session.call('click_text', {'text': 'x'})
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|||||||
+110
-2
@@ -153,6 +153,92 @@ class AalcTaskArgsTest(unittest.TestCase):
|
|||||||
self.assertEqual(aalc_task.main(['x', 'mirror', '{"exp": 1}']), 2)
|
self.assertEqual(aalc_task.main(['x', 'mirror', '{"exp": 1}']), 2)
|
||||||
self.assertEqual(aalc_task.main(['x', 'nope']), 2)
|
self.assertEqual(aalc_task.main(['x', 'nope']), 2)
|
||||||
|
|
||||||
|
def test_originals_saved_before_override_and_restored(self):
|
||||||
|
from lc_mcp import aalc_task
|
||||||
|
|
||||||
|
class Cfg:
|
||||||
|
def __init__(self):
|
||||||
|
self.values, self.saved, self.flushes = {'set_mirror_count': 1}, {}, 0
|
||||||
|
|
||||||
|
def get_value(self, key):
|
||||||
|
return self.values[key]
|
||||||
|
|
||||||
|
def unsaved_set_value(self, key, value):
|
||||||
|
self.values[key] = value
|
||||||
|
|
||||||
|
def set_value(self, key, value):
|
||||||
|
self.values[key] = self.saved[key] = value
|
||||||
|
|
||||||
|
def flush(self):
|
||||||
|
self.flushes += 1
|
||||||
|
|
||||||
|
cfg = Cfg()
|
||||||
|
with tempfile.TemporaryDirectory() as d:
|
||||||
|
path = os.path.join(d, 'x.restore.json')
|
||||||
|
originals = aalc_task.apply_overrides(cfg, 'mirror', {'count': 5}, path)
|
||||||
|
self.assertEqual(cfg.values['set_mirror_count'], 5)
|
||||||
|
with open(path, encoding='utf-8') as f:
|
||||||
|
self.assertEqual(json.load(f), {'set_mirror_count': 1})
|
||||||
|
self.assertEqual(originals, {'set_mirror_count': 1})
|
||||||
|
# 任务进程被强杀后, TaskRunner 用 --restore 读文件写回
|
||||||
|
aalc_task.restore_file(path, cfg)
|
||||||
|
self.assertEqual((cfg.saved, cfg.flushes), ({'set_mirror_count': 1}, 1))
|
||||||
|
self.assertFalse(os.path.exists(path))
|
||||||
|
self.assertEqual(aalc_task.apply_overrides(cfg, 'reward', {}, path), {})
|
||||||
|
self.assertFalse(os.path.exists(path)) # 没有覆盖就不留恢复文件
|
||||||
|
|
||||||
|
|
||||||
|
class TaskRestoreTest(unittest.TestCase):
|
||||||
|
"""run_task 的临时次数会随 AALC 中途存盘写进 config.yaml; 强杀后必须写回原值。"""
|
||||||
|
|
||||||
|
CHILD = ('import json, os, time; p = os.environ["LCP_RESTORE_FILE"]; '
|
||||||
|
'open(p, "w").write(json.dumps({"set_mirror_count": 1})); time.sleep(30)')
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.marker = os.path.join(self.tmp.name, 'restored.txt')
|
||||||
|
self.runs = os.path.join(self.tmp.name, 'runs')
|
||||||
|
self.restore_code = 'import os, sys; open(sys.argv[2], "a").write(open(sys.argv[1]).read()); os.remove(sys.argv[1])'
|
||||||
|
self.runner = TaskRunner(self.runs, argv_factory=lambda t, p: [sys.executable, '-c', self.CHILD],
|
||||||
|
restore_argv=lambda path: [sys.executable, '-c', self.restore_code, path, self.marker])
|
||||||
|
|
||||||
|
def tearDown(self):
|
||||||
|
self.runner.stop()
|
||||||
|
self.tmp.cleanup()
|
||||||
|
|
||||||
|
def _wait_for_restore_file(self):
|
||||||
|
deadline = time.time() + 10
|
||||||
|
while time.time() < deadline:
|
||||||
|
if any(n.endswith('.restore.json') for n in os.listdir(self.runs)):
|
||||||
|
return
|
||||||
|
time.sleep(0.05)
|
||||||
|
self.fail('child never wrote its restore file')
|
||||||
|
|
||||||
|
def test_stop_restores_overridden_config(self):
|
||||||
|
self.assertTrue(self.runner.start('mirror', {'count': 5})['ok'])
|
||||||
|
self._wait_for_restore_file()
|
||||||
|
r = self.runner.stop()
|
||||||
|
self.assertEqual((r['ok'], r['state']), (True, 'stopped'), r)
|
||||||
|
with open(self.marker) as f:
|
||||||
|
self.assertEqual(json.load(f), {'set_mirror_count': 1})
|
||||||
|
self.assertFalse([n for n in os.listdir(self.runs) if n.endswith('.restore.json')])
|
||||||
|
|
||||||
|
def test_leftover_restored_before_next_start_or_start_refused(self):
|
||||||
|
leftover = os.path.join(self.runs, 'task_20260101_000000_mirror.restore.json')
|
||||||
|
with open(leftover, 'w') as f:
|
||||||
|
json.dump({'set_mirror_count': 2}, f)
|
||||||
|
self.runner.restore_argv = lambda path: [sys.executable, '-c', 'import sys; sys.exit(1)', path]
|
||||||
|
r = self.runner.start('mirror', {'count': 5})
|
||||||
|
self.assertFalse(r['ok'])
|
||||||
|
self.assertIn('restore', r['error'])
|
||||||
|
self.assertFalse(self.runner.running())
|
||||||
|
self.assertEqual(self.runner.status()['pending_restore'], [os.path.basename(leftover)])
|
||||||
|
self.runner.restore_argv = lambda path: [sys.executable, '-c', self.restore_code, path, self.marker]
|
||||||
|
self.assertTrue(self.runner.start('mirror', {'count': 5})['ok'])
|
||||||
|
with open(self.marker) as f:
|
||||||
|
self.assertEqual(json.load(f), {'set_mirror_count': 2})
|
||||||
|
self.assertFalse(os.path.exists(leftover))
|
||||||
|
|
||||||
|
|
||||||
class RuntimeTest(unittest.TestCase):
|
class RuntimeTest(unittest.TestCase):
|
||||||
|
|
||||||
@@ -261,13 +347,30 @@ server.main(['--stdio'])
|
|||||||
engine.auto.find_image_element.side_effect = match
|
engine.auto.find_image_element.side_effect = match
|
||||||
self.assertEqual(engine.find_image('battle/setting_assets.png'), (1233, 42))
|
self.assertEqual(engine.find_image('battle/setting_assets.png'), (1233, 42))
|
||||||
self.assertEqual(engine.cfg.set_win_size, 1080)
|
self.assertEqual(engine.cfg.set_win_size, 1080)
|
||||||
self.assertEqual(engine.auto.clear_img_cache.call_count, 2)
|
self.assertEqual(engine.auto.clear_img_cache.call_count, 1)
|
||||||
engine.auto.find_image_element.side_effect = RuntimeError('match failed')
|
engine.auto.find_image_element.side_effect = RuntimeError('match failed')
|
||||||
with self.assertRaises(RuntimeError):
|
with self.assertRaises(RuntimeError):
|
||||||
engine.find_image('battle/setting_assets.png')
|
engine.find_image('battle/setting_assets.png')
|
||||||
self.assertEqual(engine.cfg.set_win_size, 1080)
|
self.assertEqual(engine.cfg.set_win_size, 1080)
|
||||||
self.assertEqual(engine.auto.clear_img_cache.call_count, 4)
|
# 同一窗口尺寸复用已缩放的模板缓存 (clear_img_cache 每次都会全量 gc)
|
||||||
|
self.assertEqual(engine.auto.clear_img_cache.call_count, 1)
|
||||||
engine.cfg.set_value.assert_not_called()
|
engine.cfg.set_value.assert_not_called()
|
||||||
|
engine.auto.find_image_element.side_effect = lambda *a, **k: (10, 10)
|
||||||
|
engine._grab.return_value = mock.Mock(width=1920, height=1080)
|
||||||
|
engine.find_image('battle/setting_assets.png')
|
||||||
|
self.assertEqual(engine.auto.clear_img_cache.call_count, 2)
|
||||||
|
|
||||||
|
def test_template_list_is_scanned_once(self):
|
||||||
|
from lc_mcp import aalc_engine
|
||||||
|
engine = aalc_engine.AalcEngine.__new__(aalc_engine.AalcEngine)
|
||||||
|
with tempfile.TemporaryDirectory() as root:
|
||||||
|
os.makedirs(os.path.join(root, 'default', 'share', 'battle'))
|
||||||
|
open(os.path.join(root, 'default', 'share', 'battle', 'turn_assets.png'), 'wb').close()
|
||||||
|
engine.images_root = root
|
||||||
|
with mock.patch.object(aalc_engine.glob, 'glob', wraps=aalc_engine.glob.glob) as scan:
|
||||||
|
self.assertEqual(engine.list_images('battle/'), ['battle/turn_assets.png'])
|
||||||
|
self.assertEqual(engine.list_images(), ['battle/turn_assets.png'])
|
||||||
|
self.assertEqual(scan.call_count, 6) # 2 主题 x 3 语言, 只扫一轮
|
||||||
|
|
||||||
|
|
||||||
def free_port():
|
def free_port():
|
||||||
@@ -308,6 +411,11 @@ class TransportTest(unittest.TestCase):
|
|||||||
s.sendall(b'AUTH wrong\n')
|
s.sendall(b'AUTH wrong\n')
|
||||||
self.assertEqual(s.makefile('rb').readline().strip(), b'DENIED')
|
self.assertEqual(s.makefile('rb').readline().strip(), b'DENIED')
|
||||||
|
|
||||||
|
def test_non_ascii_token_is_denied_not_crashed(self):
|
||||||
|
with socket.create_connection(('127.0.0.1', self.port)) as s:
|
||||||
|
s.sendall('AUTH 密码\n'.encode('utf-8'))
|
||||||
|
self.assertEqual(s.makefile('rb').readline().strip(), b'DENIED')
|
||||||
|
|
||||||
def test_bridge_end_to_end(self):
|
def test_bridge_end_to_end(self):
|
||||||
env = dict(os.environ, LCP_PORT=str(self.port), HOME=self.tmp.name, USERPROFILE=self.tmp.name)
|
env = dict(os.environ, LCP_PORT=str(self.port), HOME=self.tmp.name, USERPROFILE=self.tmp.name)
|
||||||
os.makedirs(os.path.join(self.tmp.name, 'lc_mcp'))
|
os.makedirs(os.path.join(self.tmp.name, 'lc_mcp'))
|
||||||
|
|||||||
Reference in New Issue
Block a user