Merge pull request #1262 from xinnan-tech/web-headerbar-modify

update:修复init_memorybug

Author: xinnan-tech

main/xiaozhi-server/core/connection.py

@@ -231,7 +231,9 @@ def save_memory_task():
                         # 创建新事件循环（避免与主循环冲突）
                         loop = asyncio.new_event_loop()
                         asyncio.set_event_loop(loop)
-                        loop.run_until_complete(self.memory.save_memory(self.dialogue.dialogue))
+                        loop.run_until_complete(
+                            self.memory.save_memory(self.dialogue.dialogue)
+                        )
                     except Exception as e:
                         self.logger.bind(tag=TAG).error(f"保存记忆失败: {e}")
                     finally:
@@ -441,10 +443,10 @@ def _initialize_private_config(self):
     def _initialize_memory(self):
         """初始化记忆模块"""
         self.memory.init_memory(
-            self.device_id,
-            self.llm,
-            self.config["summaryMemory"],
-            not self.read_config_from_api,
+            role_id=self.device_id,
+            llm=self.llm,
+            summary_memory=self.config.get("summaryMemory", None),
+            save_to_file=not self.read_config_from_api,
         )
 
     def _initialize_intent(self):

main/xiaozhi-server/core/providers/intent/intent_llm/intent_llm.py

@@ -215,7 +215,7 @@ async def detect_intent(self, conn, dialogue_history: List[Dict], text: str) ->
 
                 # 记录识别到的function call
                 logger.bind(tag=TAG).info(
-                    f"识别到function call: {function_name}, 参数: {function_args}"
+                    f"llm 识别到意图: {function_name}, 参数: {function_args}"
                 )
 
                 # 添加到缓存

main/xiaozhi-server/core/providers/memory/base.py

@@ -21,6 +21,6 @@ async def query_memory(self, query: str) -> str:
         """Query memories for specific role based on similarity"""
         return "please implement query method"
 
-    def init_memory(self, role_id, llm, summary_memory=None):
+    def init_memory(self, role_id, llm, **kwargs):
         self.role_id = role_id
         self.llm = llm

main/xiaozhi-server/core/providers/memory/mem_local_short/mem_local_short.py

@@ -112,8 +112,10 @@ def __init__(self, config, summary_memory):
         self.memory_path = get_project_dir() + "data/.memory.yaml"
         self.load_memory(summary_memory)
 
-    def init_memory(self, role_id, llm, summary_memory=None, save_to_file=True):
-        super().init_memory(role_id, llm)
+    def init_memory(
+        self, role_id, llm, summary_memory=None, save_to_file=True, **kwargs
+    ):
+        super().init_memory(role_id, llm, **kwargs)
         self.save_to_file = save_to_file
         self.load_memory(summary_memory)