merge: 同步上游 dev 并增强人物画像查询

pytests/webui/test_memory_routes.py

@@ -188,6 +188,59 @@ def test_webui_memory_graph_edge_detail_route_returns_404(client: TestClient, mo
     assert response.json()["detail"] == "未找到边: Alice -> Missing"
 
 
+def test_webui_memory_profile_query_resolves_platform_user_id(client: TestClient, monkeypatch):
+    def fake_resolve_person_id_for_memory(**kwargs):
+        assert kwargs == {"platform": "qq", "user_id": "12345", "strict_known": False}
+        return "resolved-person-id"
+
+    async def fake_profile_admin(*, action: str, **kwargs):
+        assert action == "query"
+        assert kwargs["person_id"] == "resolved-person-id"
+        assert kwargs["person_keyword"] == "Alice"
+        assert kwargs["limit"] == 9
+        assert kwargs["force_refresh"] is True
+        return {"success": True, "person_id": kwargs["person_id"], "profile_text": "profile"}
+
+    monkeypatch.setattr(memory_router_module, "resolve_person_id_for_memory", fake_resolve_person_id_for_memory)
+    monkeypatch.setattr(memory_router_module.memory_service, "profile_admin", fake_profile_admin)
+
+    response = client.get(
+        "/api/webui/memory/profiles/query",
+        params={
+            "platform": "qq",
+            "user_id": "12345",
+            "person_keyword": "Alice",
+            "limit": 9,
+            "force_refresh": True,
+        },
+    )
+
+    assert response.status_code == 200
+    assert response.json()["success"] is True
+    assert response.json()["person_id"] == "resolved-person-id"
+
+
+def test_webui_memory_profile_query_prefers_explicit_person_id(client: TestClient, monkeypatch):
+    def fake_resolve_person_id_for_memory(**kwargs):
+        raise AssertionError(f"不应解析平台账号: {kwargs}")
+
+    async def fake_profile_admin(*, action: str, **kwargs):
+        assert action == "query"
+        assert kwargs["person_id"] == "explicit-person-id"
+        return {"success": True, "person_id": kwargs["person_id"]}
+
+    monkeypatch.setattr(memory_router_module, "resolve_person_id_for_memory", fake_resolve_person_id_for_memory)
+    monkeypatch.setattr(memory_router_module.memory_service, "profile_admin", fake_profile_admin)
+
+    response = client.get(
+        "/api/webui/memory/profiles/query",
+        params={"person_id": "explicit-person-id", "platform": "qq", "user_id": "12345"},
+    )
+
+    assert response.status_code == 200
+    assert response.json()["person_id"] == "explicit-person-id"
+
+
 def test_compat_aggregate_route(client: TestClient, monkeypatch):
     async def fake_search(query: str, **kwargs):
         assert kwargs["mode"] == "aggregate"
@@ -236,7 +289,7 @@ def test_memory_config_routes(client: TestClient, monkeypatch):
     monkeypatch.setattr(
         memory_router_module.a_memorix_host_service,
         "get_config_path",
-        lambda: memory_router_module.Path("/tmp/config/a_memorix.toml"),
+        lambda: memory_router_module.Path("/tmp/config/bot_config.toml"),
     )
     monkeypatch.setattr(
         memory_router_module.a_memorix_host_service,
@@ -261,7 +314,7 @@ def test_memory_config_routes(client: TestClient, monkeypatch):
     schema_response = client.get("/api/webui/memory/config/schema")
     config_response = client.get("/api/webui/memory/config")
     raw_response = client.get("/api/webui/memory/config/raw")
-    expected_path = memory_router_module.Path("/tmp/config/a_memorix.toml").as_posix()
+    expected_path = memory_router_module.Path("/tmp/config/bot_config.toml").as_posix()
 
     assert schema_response.status_code == 200
     assert memory_router_module.Path(schema_response.json()["path"]).as_posix() == expected_path
@@ -282,7 +335,7 @@ def test_memory_config_raw_returns_default_template_when_file_missing(client: Te
     monkeypatch.setattr(
         memory_router_module.a_memorix_host_service,
         "get_config_path",
-        lambda: memory_router_module.Path("/tmp/config/a_memorix.toml"),
+        lambda: memory_router_module.Path("/tmp/config/bot_config.toml"),
     )
     monkeypatch.setattr(
         memory_router_module.a_memorix_host_service,
@@ -306,11 +359,11 @@ def test_memory_config_raw_returns_default_template_when_file_missing(client: Te
 def test_memory_config_update_routes(client: TestClient, monkeypatch):
     async def fake_update_config(config):
         assert config == {"plugin": {"enabled": False}}
-        return {"success": True, "config_path": "config/a_memorix.toml"}
+        return {"success": True, "config_path": "config/bot_config.toml"}
 
     async def fake_update_raw(raw_config):
         assert raw_config == "[plugin]\nenabled = false\n"
-        return {"success": True, "config_path": "config/a_memorix.toml"}
+        return {"success": True, "config_path": "config/bot_config.toml"}
 
     monkeypatch.setattr(memory_router_module.a_memorix_host_service, "update_config", fake_update_config)
     monkeypatch.setattr(memory_router_module.a_memorix_host_service, "update_raw_config", fake_update_raw)
@@ -319,10 +372,10 @@ def test_memory_config_update_routes(client: TestClient, monkeypatch):
     raw_response = client.put("/api/webui/memory/config/raw", json={"config": "[plugin]\nenabled = false\n"})
 
     assert config_response.status_code == 200
-    assert config_response.json() == {"success": True, "config_path": "config/a_memorix.toml"}
+    assert config_response.json() == {"success": True, "config_path": "config/bot_config.toml"}
 
     assert raw_response.status_code == 200
-    assert raw_response.json() == {"success": True, "config_path": "config/a_memorix.toml"}
+    assert raw_response.json() == {"success": True, "config_path": "config/bot_config.toml"}
 
 
 def test_memory_config_raw_rejects_invalid_toml(client: TestClient):