feat: 实时通道改 SSE、服务器换 uvicorn+zttp、节奏改 40 分钟一天，并重建测试与优化热路径
三件事凑成一次不兼容变更：WebSocket 通道、Hypercorn 服务器、「手动推进一天」都消失了。 实时通道：WebSocket -> SSE - hub 改为 SSE 订阅池，GET /api/stream 单向推送 welcome/state/day/notice/bye， 250ms 节流 + 15s 心跳注释；写操作一律走 HTTP POST /api/actions，不再有 WS 回执。 - 停机三处一起修才干净：close_all() 发 bye + timeout_graceful_shutdown 兜底 + 客户端 stop() 直接 shutdown 底层 socket（光 close() 会等读线程的锁，最长卡到下次心跳）。 - 网页版改 EventSource + fetch；tools/ws_demo.py 换成 tools/sse_demo.py。 服务器：Hypercorn -> uvicorn + zttp 的 HTTP/2 - 同一端口同时说 HTTP/1.1 与 HTTP/2。uvicorn 0.53 不再内置 h2，必须装 zttp 并显式 http="zttp"，否则 Config.load() 直接 raise。 - 信号接管改成子类覆盖 Server.handle_exit（0.53 没有 install_signal_handlers 可覆盖）， 不调 super()、不写 _captured_signals，退出时不重放信号；第二次信号强制退出。 - 入口启动前用 daemon.port_busy() 自检端口：Windows 上 SO_REUSEADDR 会让第二个实例 「绑上」已监听端口并抢走新连接，所以判断「能不能连上」而不是「能不能 bind」。 - 修掉 clear_pid_file 的 Windows 真 bug：文件还开着就 os.remove 会失败且被 except OSError 吞掉，导致每次正常退出都留 stale pid 文件。 节奏：一天 15 秒 -> 40 分钟，并整体移除「休息」 - DEFAULT_TICK_SECONDS=2400，MAX_TICK_SECONDS 放宽到 86400（旧上限会把 40 分钟夹回去）。 - engine.sleep / SLEEP_COOLDOWN / /api/sleep / TUI 的 [N]休息 / 网页版按钮全部删掉， 时间只能自然流动；机器人改为 wait_for_next_day(timeout)，CLI 加 bot --wait。 - 时长显示统一走 models.format_duration()，不再出现 2399.6s 这种写法。 键盘：修复方向键/空格/Tab/ESC 全部静默失效 - keys.py 的具名键统一小写并成为唯一来源，tui.py 一律引用 keys.XXX 而不手写字符串 （历史 bug 就是 Windows 侧产大写 UP、TUI 里写小写 up，字母键正常所以很难发现）。 - 顺带修 POSIX 路径一次 os.read 只取首字节、其余按键静默丢弃的老毛病。 测试：重建 500 项 - test_engine 110 / test_actions 35 / test_server 131(skip 35) / test_tui_keys 75 / test_bot 36 / test_client 113。未安装的第三方依赖用 skipUnless 自动跳过，其余照跑， 所以是全绿而不是靠跳过伪装。 - 被测试逼出两处真隐患并修掉：RemoteFarm._normalize() 必须「先补 scheme 再削尾斜杠」 （顺序反了畸形端点会溜到系统代理、报一个和真实原因无关的 502）；StateView 空视图要 预置 plots/animals，否则连不上服务器时读 state.plots 直接 AttributeError。 优化：先量后改，依据与前后数字都在 tools/bench.py - 新增 engine.brief_source()：brief/summary/动作回执只要十几个标量，不再为它们序列化 整局；to_dict 里 net_worth 只算一次。brief -76%、summary -77%、leaderboard(32) -78%、 GET /api/world -31%、POST /api/actions?full=1 -16%。 - 拆掉三个巨型函数：create_app 475->32 行（_Services + _register_*）、 build_parser 与 available_actions 分组、__main__.main 160->7 行。 - 消除重复：等级门槛 5 处 -> _is_locked/_require_level/_newly_unlocked；hub 的 broadcast/broadcast_all/close_all -> _push_many；daemon.probe/world -> _get_json； main.py 的 _add_endpoint_args/_leaderboard_lines。 - tools/bench.py 作为长期性能守卫（含调用计数器），谁把轻量路径改回 snapshot() 会立刻报警。 门禁：ruff format/check 全绿、pyright 0 错误、500 项测试 OK（skip 35）。
This commit is contained in:
snowy-yang committed
1 parent
47dd818360
commit
f8e093c98f
36 files changed
+6865
-2204
No files matched your search
@@ -0,0 +1,394 @@
|
||||
"""规则机器人测试：打分策略、单步执行、以及"没事可做时怎么办"。
|
||||
|
||||
机器人是「服务器把状态和合法动作摊开后，外面是谁在决策都不重要」这个设计的
|
||||
活证明，所以它走的每一步都应当是**普通客户端**能走的。
|
||||
|
||||
全程使用鸭子类型的假客户端，不碰网络，也不依赖服务器。
|
||||
|
||||
uv run python -m unittest tests.test_bot -v
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import contextlib
|
||||
import io
|
||||
import unittest
|
||||
|
||||
from farm.bot import RuleBot, random_bot
|
||||
from farm.engine import GameError
|
||||
from farm.models import format_duration
|
||||
|
||||
|
||||
class FakeClient:
|
||||
"""只实现机器人真正会用的那几个方法。"""
|
||||
|
||||
def __init__(self, actions=None, state=None, catalog=None) -> None:
|
||||
self.actions = list(actions or [])
|
||||
self.state = dict(state or {})
|
||||
self.catalog_data = catalog or {"crops": [], "animals": []}
|
||||
self.calls: list[tuple[str, dict]] = []
|
||||
self.fail_with: Exception | None = None
|
||||
self.label = "假通道"
|
||||
|
||||
def available_actions(self):
|
||||
return [dict(item) for item in self.actions]
|
||||
|
||||
def snapshot(self):
|
||||
return dict(self.state)
|
||||
|
||||
def catalog(self):
|
||||
return self.catalog_data
|
||||
|
||||
def transport_label(self) -> str:
|
||||
return self.label
|
||||
|
||||
def _action(self, name, params=None):
|
||||
self.calls.append((name, dict(params or {})))
|
||||
if self.fail_with is not None:
|
||||
raise self.fail_with
|
||||
return {"ok": True, "message": f"完成 {name}"}
|
||||
|
||||
|
||||
CATALOG = {
|
||||
"crops": [
|
||||
{"key": "wheat", "name": "小麦", "profit_per_day": 4.5},
|
||||
{"key": "carrot", "name": "胡萝卜", "profit_per_day": 6.0},
|
||||
],
|
||||
"animals": [
|
||||
{"key": "chicken", "name": "鸡", "cost": 90, "profit_per_day": 9.0},
|
||||
{"key": "cow", "name": "牛", "cost": 480, "profit_per_day": 60.0},
|
||||
],
|
||||
}
|
||||
|
||||
BASE_STATE = {
|
||||
"day": 1,
|
||||
"gold": 1000,
|
||||
"feed": 20,
|
||||
"ap": 10,
|
||||
"next_plot_price": 200,
|
||||
"paused": False,
|
||||
"seconds_to_tick": 120.0,
|
||||
}
|
||||
|
||||
|
||||
def make_bot(client=None, **kwargs) -> RuleBot:
|
||||
options = {"verbose": False, "pause": 0.0, "name": "tester"}
|
||||
options.update(kwargs)
|
||||
return RuleBot(client or FakeClient(state=BASE_STATE), **options)
|
||||
|
||||
|
||||
class ScoreTestCase(unittest.TestCase):
|
||||
"""打分表就是整个"策略"——顺序错了机器人就会先乱花钱。"""
|
||||
|
||||
def setUp(self):
|
||||
self.bot = make_bot()
|
||||
|
||||
def score(self, action: dict, **state_overrides) -> float:
|
||||
state = dict(BASE_STATE)
|
||||
state.update(state_overrides)
|
||||
return self.bot.score(action, state, CATALOG)
|
||||
|
||||
def test_harvest_comes_first(self):
|
||||
self.assertEqual(self.score({"action": "harvest"}), 100.0)
|
||||
|
||||
def test_free_money_actions_rank_above_others(self):
|
||||
order = [
|
||||
self.score({"action": "harvest"}),
|
||||
self.score({"action": "collect"}),
|
||||
self.score({"action": "feed"}),
|
||||
self.score({"action": "water"}),
|
||||
]
|
||||
self.assertEqual(order, sorted(order, reverse=True))
|
||||
self.assertEqual(len(set(order)), len(order), "分数要有区分度")
|
||||
|
||||
def test_plant_prefers_the_best_profit_per_day(self):
|
||||
wheat = self.score({"action": "plant", "params": {"crop": "wheat"}})
|
||||
carrot = self.score({"action": "plant", "params": {"crop": "carrot"}})
|
||||
self.assertGreater(carrot, wheat)
|
||||
|
||||
def test_plant_of_an_unknown_crop_still_gets_a_base_score(self):
|
||||
value = self.score({"action": "plant", "params": {"crop": "榴莲"}})
|
||||
self.assertEqual(value, 60.0)
|
||||
|
||||
def test_feed_is_bought_only_when_short_and_affordable(self):
|
||||
action = {"action": "buy_feed"}
|
||||
self.assertEqual(self.score(action, feed=1, gold=500), 40.0)
|
||||
self.assertEqual(self.score(action, feed=0, gold=500), 40.0)
|
||||
self.assertEqual(self.score(action, feed=5, gold=500), 5.0, "库存够就别花钱")
|
||||
self.assertEqual(self.score(action, feed=1, gold=50), 5.0, "钱少也别花")
|
||||
|
||||
def test_land_is_bought_only_with_a_cash_buffer(self):
|
||||
action = {"action": "buy_plot"}
|
||||
self.assertEqual(self.score(action, gold=600, next_plot_price=200), 34.0)
|
||||
self.assertEqual(self.score(action, gold=599, next_plot_price=200), 4.0)
|
||||
self.assertEqual(self.score(action, gold=9999, next_plot_price=-1), 4.0, "没地可买")
|
||||
|
||||
def test_animals_need_a_cash_buffer_and_a_free_action_point(self):
|
||||
action = {"action": "buy_animal", "params": {"kind": "chicken"}}
|
||||
self.assertEqual(self.score(action, gold=270, ap=1), 39.0)
|
||||
self.assertEqual(self.score(action, gold=269, ap=1), 3.0)
|
||||
self.assertEqual(self.score(action, gold=1000, ap=0), 3.0, "没行动点就别想")
|
||||
|
||||
def test_unknown_actions_have_the_lowest_score(self):
|
||||
self.assertEqual(self.score({"action": "fly_to_moon"}), 1.0)
|
||||
self.assertEqual(self.score({}), 1.0)
|
||||
|
||||
def test_score_survives_a_missing_payload(self):
|
||||
"""服务器偶尔给的是精简状态，机器人不能因此崩掉。"""
|
||||
self.assertEqual(self.bot.score({"action": "harvest"}, {}, {}), 100.0)
|
||||
|
||||
|
||||
class ChooseTestCase(unittest.TestCase):
|
||||
def test_picks_the_highest_scoring_action(self):
|
||||
client = FakeClient(
|
||||
actions=[
|
||||
{"action": "water", "params": {"plot": 1}},
|
||||
{"action": "harvest", "params": {"plot": 2}},
|
||||
{"action": "plant", "params": {"plot": 3, "crop": "carrot"}},
|
||||
],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
choice = make_bot(client).choose()
|
||||
assert choice is not None
|
||||
self.assertEqual(choice["action"], "harvest")
|
||||
|
||||
def test_no_actions_means_no_choice(self):
|
||||
self.assertIsNone(make_bot(FakeClient(actions=[], state=BASE_STATE)).choose())
|
||||
|
||||
def test_nothing_worth_doing_means_no_choice(self):
|
||||
"""分数都 <= 1 时应当"什么都不做"，而不是硬挑一个。"""
|
||||
client = FakeClient(actions=[{"action": "fly"}], state=BASE_STATE, catalog=CATALOG)
|
||||
self.assertIsNone(make_bot(client).choose())
|
||||
|
||||
def test_choice_is_json_shaped(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
choice = make_bot(client).choose()
|
||||
assert choice is not None
|
||||
self.assertEqual(choice["params"], {"plot": 1})
|
||||
|
||||
|
||||
class StepTestCase(unittest.TestCase):
|
||||
def test_successful_step_is_recorded(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
bot = make_bot(client)
|
||||
self.assertEqual(bot.step(), "harvest")
|
||||
self.assertEqual(bot.actions_executed, 1)
|
||||
self.assertEqual(bot.done, ["harvest"])
|
||||
self.assertEqual(client.calls, [("harvest", {"plot": 1})])
|
||||
|
||||
def test_nothing_to_do_returns_none(self):
|
||||
bot = make_bot(FakeClient(actions=[], state=BASE_STATE))
|
||||
self.assertIsNone(bot.step())
|
||||
self.assertEqual(bot.actions_executed, 0)
|
||||
|
||||
def test_failure_is_counted_not_raised(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "plant", "params": {"plot": 1, "crop": "wheat"}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
client.fail_with = GameError("no_ap", "行动点不足")
|
||||
bot = make_bot(client)
|
||||
self.assertIsNone(bot.step())
|
||||
self.assertEqual(bot.failures, 1)
|
||||
self.assertEqual(bot.actions_executed, 0)
|
||||
|
||||
def test_a_failed_step_does_not_stop_the_bot(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "plant", "params": {"plot": 1, "crop": "wheat"}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
client.fail_with = GameError("no_ap", "行动点不足")
|
||||
bot = make_bot(client)
|
||||
bot.step()
|
||||
client.fail_with = None
|
||||
self.assertEqual(bot.step(), "plant")
|
||||
|
||||
|
||||
class WaitForNextDayTestCase(unittest.TestCase):
|
||||
"""没有「手动推进一天」之后，等待策略就是机器人的全部节奏感。"""
|
||||
|
||||
def test_paused_time_is_hopeless(self):
|
||||
client = FakeClient(state={**BASE_STATE, "paused": True})
|
||||
bot = make_bot(client)
|
||||
self.assertFalse(bot.wait_for_next_day(10.0))
|
||||
|
||||
def test_zero_timeout_means_clock_out_immediately(self):
|
||||
client = FakeClient(state=BASE_STATE)
|
||||
bot = make_bot(client)
|
||||
self.assertFalse(bot.wait_for_next_day(0))
|
||||
self.assertEqual(client.calls, [], "收工不等于发请求")
|
||||
|
||||
def test_negative_timeout_also_clocks_out(self):
|
||||
self.assertFalse(make_bot().wait_for_next_day(-5))
|
||||
|
||||
def test_waits_until_the_day_actually_changes(self):
|
||||
class TickingClient(FakeClient):
|
||||
"""第三次被问到时，"时间"已经跨天了。"""
|
||||
|
||||
def __init__(self, **kwargs) -> None:
|
||||
super().__init__(**kwargs)
|
||||
self.reads = 0
|
||||
|
||||
def snapshot(self):
|
||||
self.reads += 1
|
||||
data = super().snapshot()
|
||||
if self.reads >= 3:
|
||||
data["day"] = data.get("day", 1) + 1
|
||||
return data
|
||||
|
||||
bot = make_bot(TickingClient(state=BASE_STATE))
|
||||
self.assertTrue(bot.wait_for_next_day(3.0))
|
||||
|
||||
def test_gives_up_when_the_day_never_comes(self):
|
||||
bot = make_bot(FakeClient(state=BASE_STATE))
|
||||
self.assertFalse(bot.wait_for_next_day(0.4))
|
||||
|
||||
def test_the_message_uses_the_human_duration_format(self):
|
||||
client = FakeClient(state={**BASE_STATE, "seconds_to_tick": 1234.5})
|
||||
bot = make_bot(client)
|
||||
buffer = io.StringIO()
|
||||
with contextlib.redirect_stdout(buffer):
|
||||
bot.verbose = True
|
||||
bot.wait_for_next_day(0)
|
||||
self.assertIn(format_duration(1234.5), buffer.getvalue())
|
||||
|
||||
def test_stop_interrupts_the_wait(self):
|
||||
bot = make_bot(FakeClient(state=BASE_STATE))
|
||||
bot.stop()
|
||||
self.assertTrue(bot.stopped)
|
||||
self.assertFalse(bot.wait_for_next_day(5.0), "已经叫停了就不该干等")
|
||||
|
||||
|
||||
class RunTestCase(unittest.TestCase):
|
||||
def test_round_limit_is_respected(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
summary = make_bot(client).run(rounds=3)
|
||||
self.assertEqual(summary["actions"], 3)
|
||||
self.assertEqual(summary["name"], "tester")
|
||||
|
||||
def test_summary_counts_the_days_that_passed(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
summary = make_bot(client).run(rounds=1)
|
||||
self.assertEqual(set(summary) >= {"name", "days", "actions", "failures", "net_worth"}, True)
|
||||
|
||||
def test_no_action_points_means_clocking_out(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state={**BASE_STATE, "ap": 0},
|
||||
catalog=CATALOG,
|
||||
)
|
||||
bot = make_bot(client)
|
||||
summary = bot.run(rounds=5)
|
||||
self.assertEqual(summary["actions"], 0)
|
||||
self.assertEqual(client.calls, [], "没行动点就不该发动作请求")
|
||||
|
||||
def test_idle_limit_triggers_the_waiting_path(self):
|
||||
client = FakeClient(actions=[], state=BASE_STATE)
|
||||
bot = make_bot(client)
|
||||
summary = bot.run(rounds=5, idle_limit=1, wait_seconds=0)
|
||||
self.assertEqual(summary["actions"], 0)
|
||||
self.assertEqual(bot.failures, 0)
|
||||
|
||||
def test_stopped_bot_exits_the_loop(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
bot = make_bot(client)
|
||||
bot.stop()
|
||||
summary = bot.run(rounds=10)
|
||||
self.assertEqual(summary["actions"], 0)
|
||||
|
||||
def test_verbose_mode_prints_a_greeting(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
buffer = io.StringIO()
|
||||
with contextlib.redirect_stdout(buffer):
|
||||
make_bot(client, verbose=True).run(rounds=1)
|
||||
self.assertIn("上线", buffer.getvalue())
|
||||
|
||||
def test_quiet_mode_prints_nothing(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
buffer = io.StringIO()
|
||||
with contextlib.redirect_stdout(buffer):
|
||||
make_bot(client).run(rounds=1)
|
||||
self.assertEqual(buffer.getvalue(), "")
|
||||
|
||||
def test_transport_label_is_mentioned_on_startup(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
client.label = "SSE 实时"
|
||||
buffer = io.StringIO()
|
||||
with contextlib.redirect_stdout(buffer):
|
||||
make_bot(client, verbose=True).run(rounds=1)
|
||||
self.assertIn("SSE 实时", buffer.getvalue())
|
||||
|
||||
def test_max_minutes_zero_means_no_deadline(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
summary = make_bot(client).run(rounds=2, max_minutes=0)
|
||||
self.assertEqual(summary["actions"], 2)
|
||||
|
||||
|
||||
class RandomBotTestCase(unittest.TestCase):
|
||||
def test_random_bot_picks_from_the_legal_list(self):
|
||||
actions = [
|
||||
{"action": "water", "params": {"plot": 1}},
|
||||
{"action": "harvest", "params": {"plot": 2}},
|
||||
]
|
||||
client = FakeClient(actions=actions, state=BASE_STATE, catalog=CATALOG)
|
||||
bot = random_bot(client, verbose=False, pause=0.0)
|
||||
choice = bot.choose()
|
||||
assert choice is not None
|
||||
self.assertIn(choice["action"], {"water", "harvest"})
|
||||
self.assertEqual(bot.name, "random")
|
||||
|
||||
def test_random_bot_returns_none_without_options(self):
|
||||
bot = random_bot(FakeClient(actions=[], state=BASE_STATE), verbose=False, pause=0.0)
|
||||
self.assertIsNone(bot.choose())
|
||||
|
||||
def test_random_bot_still_executes_steps(self):
|
||||
client = FakeClient(
|
||||
actions=[{"action": "harvest", "params": {"plot": 1}}],
|
||||
state=BASE_STATE,
|
||||
catalog=CATALOG,
|
||||
)
|
||||
bot = random_bot(client, verbose=False, pause=0.0)
|
||||
self.assertEqual(bot.step(), "harvest")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main(verbosity=2)
|
||||
Reference in new issue
Block a user