Merge branch 'develop' into fix/memory-enduser-config

2026-02-06 15:14:34 +08:00
parent 8a37869489 7b72bf0cd0
commit 157031f23e
85 changed files with 4465 additions and 865 deletions
--- a/api/app/services/app_service.py
+++ b/api/app/services/app_service.py
@@ -964,8 +964,15 @@ class AppService:
        ).order_by(
            AgentConfig.updated_at.desc()
        )
+
        config = self.db.scalars(stmt).first()

+        try:
+            config_memory=config.memory
+            if 'memory_content' in config_memory:
+                config.memory['memory_config_id'] = config.memory.pop('memory_content')
+        except:
+            logger.debug("记忆配置不存在")
        if config:
            return config