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

pytests/webui/test_config_schema.py

@@ -1,5 +1,6 @@
 from src.config.official_configs import ChatConfig, MessageReceiveConfig
 from src.config.config import Config
+from src.config.config_base import ConfigBase, Field
 from src.webui.config_schema import ConfigSchemaGenerator
 
 
@@ -127,3 +128,20 @@ def test_set_field_is_mapped_as_array():
 
     assert ban_words["type"] == "array"
     assert ban_words["items"]["type"] == "string"
+
+
+def test_advanced_fields_are_hidden_from_webui_schema():
+    """advanced=True 的字段不应出现在 WebUI 配置 schema 中，未声明时默认展示。"""
+
+    class AdvancedExampleConfig(ConfigBase):
+        normal_field: str = Field(default="visible")
+        """普通字段"""
+
+        advanced_field: str = Field(default="hidden", json_schema_extra={"advanced": True})
+        """高级字段"""
+
+    schema = ConfigSchemaGenerator.generate_schema(AdvancedExampleConfig)
+    field_names = {field["name"] for field in schema["fields"]}
+
+    assert "normal_field" in field_names
+    assert "advanced_field" not in field_names

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):

pytests/webui/test_memory_routes_integration.py

@@ -14,6 +14,7 @@ import pytest
 import tomlkit
 
 from src.A_memorix import host_service as host_service_module
+from src.A_memorix.core.runtime import sdk_memory_kernel as kernel_module
 from src.A_memorix.core.utils import retrieval_tuning_manager as tuning_manager_module
 from src.webui.dependencies import require_auth
 from src.webui.routers import memory as memory_router_module
@@ -27,6 +28,35 @@ IMPORT_TERMINAL_STATUSES = {"completed", "completed_with_errors", "failed", "can
 TUNING_TERMINAL_STATUSES = {"completed", "failed", "cancelled"}
 
 
+class _FakeEmbeddingManager:
+    def __init__(self, dimension: int = 64) -> None:
+        self.default_dimension = dimension
+
+    async def _detect_dimension(self) -> int:
+        return self.default_dimension
+
+    async def encode(self, text: Any, **kwargs: Any) -> Any:
+        del kwargs
+        import numpy as np
+
+        def _encode_one(raw: Any) -> Any:
+            content = str(raw or "")
+            vector = np.zeros(self.default_dimension, dtype=np.float32)
+            for index, byte in enumerate(content.encode("utf-8")):
+                vector[index % self.default_dimension] += float((byte % 17) + 1)
+            norm = float(np.linalg.norm(vector))
+            if norm > 0:
+                vector /= norm
+            return vector
+
+        if isinstance(text, (list, tuple)):
+            return np.stack([_encode_one(item) for item in text]).astype(np.float32)
+        return _encode_one(text).astype(np.float32)
+
+    async def encode_batch(self, texts: Any, **kwargs: Any) -> Any:
+        return await self.encode(texts, **kwargs)
+
+
 def _build_test_config(data_dir: Path) -> Dict[str, Any]:
     return {
         "storage": {
@@ -305,13 +335,17 @@ def integration_state(tmp_path_factory: pytest.TempPathFactory) -> Generator[Dic
     data_dir = (tmp_root / "data").resolve()
     staging_dir = (tmp_root / "upload_staging").resolve()
     artifacts_dir = (tmp_root / "artifacts").resolve()
-    config_file = (tmp_root / "config" / "a_memorix.toml").resolve()
-
-    config_file.parent.mkdir(parents=True, exist_ok=True)
-    config_file.write_text(tomlkit.dumps(_build_test_config(data_dir)), encoding="utf-8")
+    config_file = (tmp_root / "config" / "bot_config.toml").resolve()
+    runtime_config = _build_test_config(data_dir)
 
     patches = pytest.MonkeyPatch()
-    patches.setattr(host_service_module, "config_path", lambda: config_file)
+    patches.setattr(host_service_module.a_memorix_host_service, "_read_config", lambda: dict(runtime_config))
+    patches.setattr(host_service_module.a_memorix_host_service, "get_config_path", lambda: config_file)
+    patches.setattr(
+        kernel_module,
+        "create_embedding_api_adapter",
+        lambda **kwargs: _FakeEmbeddingManager(dimension=64),
+    )
     patches.setattr(memory_router_module, "STAGING_ROOT", staging_dir)
     patches.setattr(tuning_manager_module, "artifacts_root", lambda: artifacts_dir)