update:优化日志对象

main/xiaozhi-server/plugins_func/functions/play_music.py

@@ -11,9 +11,7 @@ from core.utils import p3
 from core.handle.sendAudioHandle import send_stt_message
 from plugins_func.register import register_function, ToolType, ActionResponse, Action
 
-
 TAG = __name__
-logger = setup_logging()
 
 MUSIC_CACHE = {}
 
@@ -45,7 +43,7 @@ def play_music(conn, song_name: str):
 
         # 检查事件循环状态
         if not conn.loop.is_running():
-            logger.bind(tag=TAG).error("事件循环未运行，无法提交任务")
+            conn.logger.bind(tag=TAG).error("事件循环未运行，无法提交任务")
             return ActionResponse(
                 action=Action.RESPONSE, result="系统繁忙", response="请稍后再试"
             )
@@ -59,9 +57,9 @@ def play_music(conn, song_name: str):
         def handle_done(f):
             try:
                 f.result()  # 可在此处理成功逻辑
-                logger.bind(tag=TAG).info("播放完成")
+                conn.logger.bind(tag=TAG).info("播放完成")
             except Exception as e:
-                logger.bind(tag=TAG).error(f"播放失败: {e}")
+                conn.logger.bind(tag=TAG).error(f"播放失败: {e}")
 
         future.add_done_callback(handle_done)
 
@@ -69,7 +67,7 @@ def play_music(conn, song_name: str):
             action=Action.NONE, result="指令已接收", response="正在为您播放音乐"
         )
     except Exception as e:
-        logger.bind(tag=TAG).error(f"处理音乐意图错误: {e}")
+        conn.logger.bind(tag=TAG).error(f"处理音乐意图错误: {e}")
         return ActionResponse(
             action=Action.RESPONSE, result=str(e), response="播放音乐时出错了"
         )
@@ -150,7 +148,7 @@ async def handle_music_command(conn, text):
 
     """处理音乐播放指令"""
     clean_text = re.sub(r"[^\w\s]", "", text).strip()
-    logger.bind(tag=TAG).debug(f"检查是否是音乐命令: {clean_text}")
+    conn.logger.bind(tag=TAG).debug(f"检查是否是音乐命令: {clean_text}")
 
     # 尝试匹配具体歌名
     if os.path.exists(MUSIC_CACHE["music_dir"]):
@@ -165,7 +163,7 @@ async def handle_music_command(conn, text):
         if potential_song:
             best_match = _find_best_match(potential_song, MUSIC_CACHE["music_files"])
             if best_match:
-                logger.bind(tag=TAG).info(f"找到最匹配的歌曲: {best_match}")
+                conn.logger.bind(tag=TAG).info(f"找到最匹配的歌曲: {best_match}")
                 await play_local_music(conn, specific_file=best_match)
                 return True
     # 检查是否是通用播放音乐命令
@@ -195,7 +193,9 @@ async def play_local_music(conn, specific_file=None):
     """播放本地音乐文件"""
     try:
         if not os.path.exists(MUSIC_CACHE["music_dir"]):
-            logger.bind(tag=TAG).error(f"音乐目录不存在: " + MUSIC_CACHE["music_dir"])
+            conn.logger.bind(tag=TAG).error(
+                f"音乐目录不存在: " + MUSIC_CACHE["music_dir"]
+            )
             return
 
         # 确保路径正确性
@@ -204,13 +204,13 @@ async def play_local_music(conn, specific_file=None):
             music_path = os.path.join(MUSIC_CACHE["music_dir"], specific_file)
         else:
             if not MUSIC_CACHE["music_files"]:
-                logger.bind(tag=TAG).error("未找到MP3音乐文件")
+                conn.logger.bind(tag=TAG).error("未找到MP3音乐文件")
                 return
             selected_music = random.choice(MUSIC_CACHE["music_files"])
             music_path = os.path.join(MUSIC_CACHE["music_dir"], selected_music)
 
         if not os.path.exists(music_path):
-            logger.bind(tag=TAG).error(f"选定的音乐文件不存在: {music_path}")
+            conn.logger.bind(tag=TAG).error(f"选定的音乐文件不存在: {music_path}")
             return
         text = _get_random_play_prompt(selected_music)
         await send_stt_message(conn, text)
@@ -233,5 +233,5 @@ async def play_local_music(conn, specific_file=None):
         conn.audio_play_queue.put((opus_packets, None, conn.tts_last_text_index))
 
     except Exception as e:
-        logger.bind(tag=TAG).error(f"播放音乐失败: {str(e)}")
-        logger.bind(tag=TAG).error(f"详细错误: {traceback.format_exc()}")
+        conn.logger.bind(tag=TAG).error(f"播放音乐失败: {str(e)}")
+        conn.logger.bind(tag=TAG).error(f"详细错误: {traceback.format_exc()}")

main/xiaozhi-server/plugins_func/functions/plugin_loader.py

@@ -1,51 +1,56 @@
-from plugins_func.register import register_function,ToolType, ActionResponse, Action
-from config.logger import setup_logging
-
-TAG = __name__
-logger = setup_logging()
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
 
 plugin_loader_function_desc = {
-                "type": "function",
-                "function": {
-                    "name": "plugin_loader",
-                    "description": "当用户想加载或卸载插件/function时，调用此函数：支持的插件列表为[plugins]",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "oper": {
-                                "type": "string",
-                                "description": "load or unload"
-                            },
-                            "name":{
-                                "type": "string",
-                                "description": "要加载或卸载的插件名字"
-                            }
-                        },
-                        "required": ["oper","name"]
-                    }
-                }
-            }
+    "type": "function",
+    "function": {
+        "name": "plugin_loader",
+        "description": "当用户想加载或卸载插件/function时，调用此函数：支持的插件列表为[plugins]",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "oper": {"type": "string", "description": "load or unload"},
+                "name": {"type": "string", "description": "要加载或卸载的插件名字"},
+            },
+            "required": ["oper", "name"],
+        },
+    },
+}
 
-@register_function('plugin_loader', plugin_loader_function_desc, ToolType.SYSTEM_CTL)
+
+@register_function("plugin_loader", plugin_loader_function_desc, ToolType.SYSTEM_CTL)
 def plugin_loader(conn, oper: str, name: str):
     """插件加载"""
     if oper not in ["load", "unload"]:
-        return ActionResponse(action=Action.RESPONSE, result="插件操作失败", response="不支持的操作")
-    
+        return ActionResponse(
+            action=Action.RESPONSE, result="插件操作失败", response="不支持的操作"
+        )
+
     cur_support = conn.func_handler.current_support_functions()
     if oper == "load":
         if name in cur_support:
-            return ActionResponse(action=Action.RESPONSE, result="插件加载失败", response=f"{name}插件已加载,无需重复加载")
+            return ActionResponse(
+                action=Action.RESPONSE,
+                result="插件加载失败",
+                response=f"{name}插件已加载,无需重复加载",
+            )
         func = conn.func_handler.function_registry.register_function(name)
         if not func:
-            return ActionResponse(action=Action.RESPONSE, result="插件加载失败", response="插件未找到")
+            return ActionResponse(
+                action=Action.RESPONSE, result="插件加载失败", response="插件未找到"
+            )
         res = f"{name}插件加载成功"
     else:
         if name not in cur_support:
-            return ActionResponse(action=Action.RESPONSE, result="插件卸载失败", response=f"{name}插件未加载")
+            return ActionResponse(
+                action=Action.RESPONSE,
+                result="插件卸载失败",
+                response=f"{name}插件未加载",
+            )
         bOK = conn.func_handler.function_registry.unregister_function(name)
         if not bOK:
-            return ActionResponse(action=Action.RESPONSE, result="插件卸载失败", response="插件未找到")
+            return ActionResponse(
+                action=Action.RESPONSE, result="插件卸载失败", response="插件未找到"
+            )
         res = f"{name}插件卸载成功"
     conn.func_handler.upload_functions_desc()
     return ActionResponse(action=Action.RESPONSE, result="插件操作成功", response=res)