diff --git a/api/app/schemas/app_schema.py b/api/app/schemas/app_schema.py index b350f17c..09410091 100644 --- a/api/app/schemas/app_schema.py +++ b/api/app/schemas/app_schema.py @@ -51,7 +51,7 @@ class ToolOldConfig(BaseModel): class MemoryConfig(BaseModel): """记忆配置""" enabled: bool = Field(default=True, description="是否启用对话历史记忆") - memory_config: Optional[str] = Field(default=None, description="选择记忆的内容类型") + memory_content: Optional[str] = Field(default=None, description="选择记忆的内容类型") max_history: int = Field(default=10, ge=0, le=100, description="最大保留的历史对话轮数") diff --git a/api/app/services/memory_storage_service.py b/api/app/services/memory_storage_service.py index 784288de..eec1007b 100644 --- a/api/app/services/memory_storage_service.py +++ b/api/app/services/memory_storage_service.py @@ -184,14 +184,19 @@ class DataConfigService: # 数据配置服务类(PostgreSQL) for config in configs: # 安全地转换 user_id 为 int config_id_old = None - if config.user_id: + if config.config_id_old: try: - config_id_old = int(config.user_id) + config_id_old = int(config.config_id_old) except (ValueError, TypeError): config_id_old = None - + + + if config_id_old: + memory_config=config_id_old + else: + memory_config=config.config_id config_dict = { - "config_id": config.config_id, + "config_id": memory_config, "config_name": config.config_name, "config_desc": config.config_desc, "workspace_id": str(config.workspace_id) if config.workspace_id else None,