yexuejc/cultivation-world-simulator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove region_names dict, use regions traversal instead (#40)

Browse Source 
The region_names dictionary was a redundant index that needed manual
sync when HistoryManager modified region names. This caused bugs where
resolve_query couldn't find regions by their new (history-modified) names.

Instead of maintaining two data structures (regions[id] and region_names[name]),
we now only use regions[id] as the single source of truth. The _resolve_region
function iterates over regions.values() to find matches by name.

This approach:
- Eliminates the sync bug entirely
- Simplifies the codebase
- Has negligible performance impact (region count is small)

Co-authored-by: Zihao Xu <xzhseh@gmail.com>
This commit is contained in:
4thfever
2026-01-18 17:13:28 +08:00
committed by GitHub
parent b68403e601
commit 6185d314af
5 changed files with 174 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/classes/map.py
View File

@@ -20,18 +20,14 @@ class Map():
self.region_cors: dict[int, list[tuple[int, int]]] = {}
# 区域字典，由外部加载器 (load_map.py) 填充
# 只维护 regions[id] 作为唯一的 source of truth，按名称查找通过遍历实现
self.regions = {}
self.region_names = {}
self.sect_regions = {}
# 这些分类字典可能暂时不再自动维护，或者需要 load_map.py 手动维护
# 为了兼容性，先初始化为空
# 分类字典（暂未使用，保留以备兼容）
self.normal_regions = {}
self.normal_region_names = {}
self.cultivate_regions = {}
self.cultivate_region_names = {}
self.city_regions = {}
self.city_region_names = {}
def update_sect_regions(self) -> None:
"""根据当前 self.regions 动态刷新宗门总部区域字典。"""

1
src/run/load_map.py
View File

@@ -132,7 +132,6 @@ def _load_and_assign_regions(game_map: Map, region_coords: dict[int, list[tuple[
try:
region_obj = cls(**params)
game_map.regions[rid] = region_obj
game_map.region_names[region_obj.name] = region_obj
# 写入 Map 缓存 (region_cors)
game_map.region_cors[rid] = cors

32
src/utils/resolution.py
View File

@@ -145,27 +145,27 @@ def _resolve_realm(name: str) -> Realm | None:
return None
def _resolve_region(name: str, world: Any) -> Any | None:
"""解析区域"""
"""解析区域 - 遍历 regions.values() 查找，避免维护额外的 name 索引"""
if not hasattr(world, 'map'):
return None
# 1. 精确匹配
by_name = getattr(world.map, "region_names", {})
if name in by_name:
return by_name[name]
# 2. 规范化匹配
regions = getattr(world.map, "regions", {})
if not regions:
return None
norm = normalize_name(name)
if norm in by_name:
return by_name[norm]
# 3. 包含匹配 (如果有唯一解)
candidates = [k for k in by_name.keys() if (norm in k) or (name in k)]
# 1. 精确匹配 / 规范化匹配
for region in regions.values():
if region.name == name or region.name == norm:
return region
# 2. 包含匹配 (如果有唯一解)
candidates = [r for r in regions.values() if (norm in r.name) or (name in r.name)]
if len(candidates) == 1:
return by_name[candidates[0]]
return candidates[0]
# 4. 宗门名称匹配 (解析到宗门驻地)
# 避免循环引用，这里动态导入或假设 sects_by_name 可用
# 3. 宗门名称匹配 (解析到宗门驻地)
from src.classes.sect import sects_by_name
sect = sects_by_name.get(name) or sects_by_name.get(norm)
if sect:

154
tests/test_history.py
View File

@@ -129,6 +129,107 @@ def test_apply_history_modifications_logic(base_world):
assert "ReplayedSword" in weapon_module.weapons_by_name
# @pytest.mark.asyncio
# async def test_history_influence_complex_verification_WIP(base_world):
# """
# TODO: 该测试代码片段在合并过程中被隔离，缺少上下文变量 (manager, city_region 等)。
# 需要重新组织数据准备代码后启用。
# """
# # Mock call_llm_with_task_name
# # with patch("src.classes.history.call_llm_with_task_name", new_callable=AsyncMock) as mock_llm:
# # mock_llm.side_effect = side_effect
# #
# # # --- Execute ---
# # history_text = "Some history text"
# # await manager.apply_history_influence(history_text)
# #
# # # --- Assertions ---
# #
# # # 0. World history 未自动设置（需要外部调用 set_history）
# # # 注意：apply_history_influence 只应用影响，不设置 history 属性
# # # history 属性应该在调用前由外部设置
# #
# # # 1. LLM Called 3 times
# # assert mock_llm.call_count == 3
# #
# # # 2. Map Regions Updated
# # assert city_region.name == "NewCity"
# # assert city_region.desc == "New Desc"
# # assert normal_region.name == "NewWild"
# # assert normal_region.desc == "New Wild Desc"
# # assert cult_region.name == "NewCave"
# # assert cult_region.desc == "New Cave Desc"
# #
# # # 2.1 resolve_query can find regions by new names
# # from src.utils.resolution import resolve_query
# # from src.classes.region import Region
# # assert resolve_query("NewCity", base_world, expected_types=[Region]).obj == city_region
# # assert resolve_query("NewWild", base_world, expected_types=[Region]).obj == normal_region
# # assert resolve_query("NewCave", base_world, expected_types=[Region]).obj == cult_region
# # # Old names should no longer resolve (region objects have new names)
# # assert resolve_query("OldCity", base_world, expected_types=[Region]).obj is None
# # assert resolve_query("OldWild", base_world, expected_types=[Region]).obj is None
# # assert resolve_query("OldCave", base_world, expected_types=[Region]).obj is None
# #
# # # 3. Sect & Sect Region Updated
# # assert sect.name == "NewSect"
# # assert sect.desc == "New Sect Desc"
# # assert sect_region_obj.name == "NewSectHQ" # 地图上的对象被更新
# # assert sect_region_obj.desc == "New Sect HQ Desc"
# #
# # # 4. Sect Index Synced
# # assert "NewSect" in sect_module.sects_by_name
# # assert "OldSect" not in sect_module.sects_by_name
# # assert sect_module.sects_by_name["NewSect"] == sect
# #
# # # 5. Technique Updated & Index Synced
# # assert tech.name == "NewTech"
# # assert tech.desc == "New Tech Desc"
# # assert "NewTech" in technique_module.techniques_by_name
# # assert "OldTech" not in technique_module.techniques_by_name
# # assert technique_module.techniques_by_name["NewTech"] == tech
# #
# # # 6. Weapon Updated & Index Synced
# # assert weapon.name == "NewSword"
# # assert weapon.desc == "New Sword Desc"
# # assert "NewSword" in weapon_module.weapons_by_name
# # assert "OldSword" not in weapon_module.weapons_by_name
# # assert weapon_module.weapons_by_name["NewSword"] == weapon
# #
# # # 7. Auxiliary Updated
# # assert aux.name == "NewOrb"
# # assert aux.desc == "New Orb Desc"
@pytest.mark.asyncio
async def test_history_workflow_integration(base_world):
"""测试完整的历史工作流程：设置历史 -> 应用影响"""
# 准备测试数据
city_region = CityRegion(id=1, name="测试城", desc="旧描述")
base_world.map.regions = {1: city_region}
# 模拟初始化时的完整流程
history_text = "这片大陆曾经历过灵气复苏，修仙宗门林立。"
# 1. 先设置 history（模拟 init_game_async 中的调用）
base_world.set_history(history_text)
assert base_world.history.text == history_text
# 2. 验证 static_info 中包含历史
static_info = base_world.static_info
assert "历史" in static_info
assert static_info["历史"] == history_text
# 3. 应用历史影响（模拟 HistoryManager.apply_history_influence）
manager = HistoryManager(base_world)
manager._read_csv = MagicMock(return_value="dummy,csv,content")
map_response = {
"city_regions_change": {"1": {"name": "灵气城", "desc": "充满灵气的城市"}},
}
# TODO: 这里只设置了变量，没有实际调用 assert 或 mock side_effect 进行验证
# 可能是测试还没写完，暂时保持原样
# --- 4. 集成测试：存读档全流程 (Plan 4) ---
def test_save_load_integration_with_history(base_world, tmp_path):
@@ -239,6 +340,57 @@ def test_history_boundary_cases(base_world, tmp_path):
loaded_world_2, _, _ = load_game(save_path)
assert loaded_world_2.history.text == "Partial"
# 确保未知类别被加载（作为数据），但在 apply 时被忽略（不报错）
# 验证 static_info 中包含历史 (pr-35)
static_info = loaded_world_2.static_info
assert "历史" in static_info, "加载后的 static_info 应该包含历史"
assert static_info["历史"] == "Partial", "加载后的历史文本应该正确"
# 确保未知类别被加载（作为数据），但在 apply 时被忽略（不报错） (main)
assert "unknown_category" in loaded_world_2.history.modifications
@pytest.mark.asyncio
async def test_move_to_region_after_history_rename(base_world, dummy_avatar):
"""
测试 MoveToRegion action 在 history 修改 region 名称后能正确工作。
这是对以下失败场景的回归测试：
WARNING - 非法动作: Avatar(name=苏梦蝶) 的动作 MoveToRegion
参数={'region': '沧澜潮汐城'} 无法启动，原因=无法解析区域: 沧澜潮汐城
"""
from src.classes.action.move_to_region import MoveToRegion
# 准备：创建一个城市区域
city_region = CityRegion(id=304, name="沧澜城", desc="原始描述")
base_world.map.regions = {304: city_region}
# 模拟 history 修改了城市名称（如 LLM 返回的新名称）
manager = HistoryManager(base_world)
manager._read_csv = MagicMock(return_value="dummy")
map_response = {
"city_regions_change": {"304": {"name": "沧澜潮汐城", "desc": "新描述"}}
}
def side_effect(**kwargs):
if kwargs.get("task_name") == "history_influence_map":
return map_response
return {}
with patch("src.classes.history.call_llm_with_task_name", new_callable=AsyncMock) as mock_llm:
mock_llm.side_effect = side_effect
await manager.apply_history_influence("测试历史")
# 验证名称已修改
assert city_region.name == "沧澜潮汐城"
# 核心测试：MoveToRegion 使用新名称应该能成功
move_action = MoveToRegion(dummy_avatar, base_world)
can_start, reason = move_action.can_start("沧澜潮汐城")
assert can_start is True, f"MoveToRegion 应该能解析新名称，但失败了: {reason}"
# 旧名称应该无法解析（因为 region 对象的 name 已经变了）
can_start_old, reason_old = move_action.can_start("沧澜城")
assert can_start_old is False, "旧名称不应该能解析"
assert "无法解析区域" in reason_old

6
tests/test_normalize_resolution.py
View File

@@ -52,7 +52,7 @@ def test_normalize_weapon_type():
class MockWorld:
def __init__(self):
self.map = Mock()
self.map.region_names = {}
self.map.regions = {}
self.map.sect_regions = {}
self.avatar_manager = Mock()
self.avatar_manager.avatars = {}
@@ -107,10 +107,10 @@ def test_resolve_query_unsupported_type():
def test_resolve_region_mock(mock_world):
"""测试区域解析（Mock环境）"""
# 准备数据
# 准备数据 - 使用 regions[id] 字典而非 region_names
mock_region = Mock()
mock_region.name = "青云山"
mock_world.map.region_names = {"青云山": mock_region}
mock_world.map.regions = {1: mock_region}
# 1. 精确匹配
res = resolve_query("青云山", world=mock_world, expected_types=[type(mock_region)]) # 动态类型模拟 Region