feat(memory-gateway): 引入 Memory Gateway 配置、凭据存储和服务编排
* 新增 MemoryGatewayConfig 和 MemoryConfig dataclass，用于配置管理。 * 实现 MemoryGatewayUserCredential 和 MemoryGatewayCredentialStore，用于处理用户凭据。 * 创建 MemoryGatewayService，用于管理与 Memory Gateway 的交互。 * 开发用于记忆设置的 JSON 配置文件。 * 增强单元测试，覆盖新功能，包括凭据存储和服务行为。 * 更新 entrypoint 和实例创建脚本，以初始化 Memory Gateway 用户存储。
This commit is contained in:
@ -15,10 +15,16 @@ from beaver.engine.session import SessionManager
|
||||
from beaver.foundation.config import BeaverConfig, load_config
|
||||
from beaver.integrations.mcp import MCPConnectionManager
|
||||
from beaver.memory.curated.store import MemoryStore
|
||||
from beaver.memory.gateway import (
|
||||
MemoryGatewayConfig,
|
||||
MemoryGatewayCredentialStore,
|
||||
MemoryGatewayService,
|
||||
MemoryGatewayUserCredential,
|
||||
default_memory_gateway_users_path,
|
||||
)
|
||||
from beaver.memory.runs import RunMemoryStore
|
||||
from beaver.memory.skills import SkillLearningStore
|
||||
from beaver.services.memory_service import MemoryService
|
||||
from beaver.services.memory_gateway_service import MemoryGatewayService
|
||||
from beaver.skills.drafts import DraftService
|
||||
from beaver.skills.learning import EvidenceSelector, SkillDraftSynthesizer, SkillLearningPipelineService, SkillLearningService
|
||||
from beaver.skills.learning.safety import SkillDraftSafetyChecker
|
||||
@ -84,7 +90,9 @@ class EngineLoadResult:
|
||||
session_manager: SessionManager | None = None
|
||||
curated_memory_store: MemoryStore | None = None
|
||||
memory_service: MemoryService | None = None
|
||||
memory_gateway_service: MemoryGatewayService | None = None
|
||||
memory_gateway_config: MemoryGatewayConfig | None = None
|
||||
memory_gateway_credentials: MemoryGatewayCredentialStore | None = None
|
||||
memory_gateway_service_factory: Callable[[MemoryGatewayUserCredential], MemoryGatewayService] | None = None
|
||||
run_memory_store: RunMemoryStore | None = None
|
||||
skill_learning_store: SkillLearningStore | None = None
|
||||
tool_registry: ToolRegistry | None = None
|
||||
@ -160,7 +168,8 @@ class EngineLoader:
|
||||
session_manager: SessionManager | None = None,
|
||||
curated_memory_store: MemoryStore | None = None,
|
||||
memory_service: MemoryService | None = None,
|
||||
memory_gateway_service: MemoryGatewayService | None = None,
|
||||
memory_gateway_credentials: MemoryGatewayCredentialStore | None = None,
|
||||
memory_gateway_service_factory: Callable[[MemoryGatewayConfig, MemoryGatewayUserCredential], MemoryGatewayService] | None = None,
|
||||
run_memory_store: RunMemoryStore | None = None,
|
||||
skill_learning_store: SkillLearningStore | None = None,
|
||||
tool_registry: ToolRegistry | None = None,
|
||||
@ -186,7 +195,8 @@ class EngineLoader:
|
||||
self._session_manager = session_manager
|
||||
self._curated_memory_store = curated_memory_store
|
||||
self._memory_service = memory_service
|
||||
self._memory_gateway_service = memory_gateway_service
|
||||
self._memory_gateway_credentials = memory_gateway_credentials
|
||||
self._memory_gateway_service_factory = memory_gateway_service_factory
|
||||
self._run_memory_store = run_memory_store
|
||||
self._skill_learning_store = skill_learning_store
|
||||
self._tool_registry = tool_registry
|
||||
@ -209,7 +219,11 @@ class EngineLoader:
|
||||
"""装配当前主链需要的最小 runtime 对象。"""
|
||||
|
||||
workspace = self.workspace
|
||||
memory_gateway_service = self._resolve_memory_gateway_service()
|
||||
(
|
||||
memory_gateway_config,
|
||||
memory_gateway_credentials,
|
||||
memory_gateway_service_factory,
|
||||
) = self._resolve_memory_gateway_components()
|
||||
session_manager = self._session_manager or SessionManager(workspace)
|
||||
|
||||
curated_root = workspace / "memory" / "curated"
|
||||
@ -306,12 +320,14 @@ class EngineLoader:
|
||||
config=self.config,
|
||||
tools=[spec.name for spec in tool_registry.list_specs()],
|
||||
skills=[record.name for record in skills_loader.list_skills(filter_unavailable=False)],
|
||||
memory_stores=["curated", *(["memory_gateway"] if memory_gateway_service is not None else [])],
|
||||
memory_stores=["curated", *(["memory_gateway"] if memory_gateway_service_factory is not None else [])],
|
||||
permissions=[],
|
||||
session_manager=session_manager,
|
||||
curated_memory_store=memory_service.get_store(),
|
||||
memory_service=memory_service,
|
||||
memory_gateway_service=memory_gateway_service,
|
||||
memory_gateway_config=memory_gateway_config,
|
||||
memory_gateway_credentials=memory_gateway_credentials,
|
||||
memory_gateway_service_factory=memory_gateway_service_factory,
|
||||
run_memory_store=run_memory_store,
|
||||
skill_learning_store=skill_learning_store,
|
||||
tool_registry=tool_registry,
|
||||
@ -337,10 +353,16 @@ class EngineLoader:
|
||||
result.register_closeable("mcp_manager", lambda: _close_mcp_manager(mcp_manager))
|
||||
return result
|
||||
|
||||
def _resolve_memory_gateway_service(self) -> MemoryGatewayService | None:
|
||||
def _resolve_memory_gateway_components(
|
||||
self,
|
||||
) -> tuple[
|
||||
MemoryGatewayConfig | None,
|
||||
MemoryGatewayCredentialStore | None,
|
||||
Callable[[MemoryGatewayUserCredential], MemoryGatewayService] | None,
|
||||
]:
|
||||
memory_config = self.config.memory
|
||||
if memory_config.mode == "curated":
|
||||
return None
|
||||
return None, None, None
|
||||
|
||||
gateway_config = memory_config.gateway
|
||||
if memory_config.explicit and not gateway_config.is_configured:
|
||||
@ -351,8 +373,18 @@ class EngineLoader:
|
||||
logger.warning(
|
||||
"Memory Gateway is not configured; continuing with curated memory only"
|
||||
)
|
||||
return None
|
||||
return self._memory_gateway_service or MemoryGatewayService(gateway_config)
|
||||
return None, None, None
|
||||
|
||||
credential_store = self._memory_gateway_credentials or MemoryGatewayCredentialStore(
|
||||
default_memory_gateway_users_path()
|
||||
)
|
||||
|
||||
def factory(credential: MemoryGatewayUserCredential) -> MemoryGatewayService:
|
||||
if self._memory_gateway_service_factory is not None:
|
||||
return self._memory_gateway_service_factory(gateway_config, credential)
|
||||
return MemoryGatewayService(gateway_config, credential)
|
||||
|
||||
return gateway_config, credential_store, factory
|
||||
|
||||
|
||||
def _close_mcp_manager(manager: MCPConnectionManager) -> None:
|
||||
|
||||
Reference in New Issue
Block a user