审查修复: 任务配置恢复、执行器容错与续局状态、识别性能
正确性 - 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:
+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