Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-22 07:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1892 from xinnan-tech/py_fix_mcp

Browse Source 
update:添加Home Assistant插件超时处理和错误日志
This commit is contained in:
hrz
2025-07-22 17:43:33 +08:00
committed by GitHub
parent 35fd4d2770 1b8963f311
commit d9b632c031
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/xiaozhi-server/plugins_func/functions/hass_get_state.py
+8 -2
View File
@@ -33,10 +33,16 @@ def hass_get_state(conn, entity_id=""):
future = asyncio.run_coroutine_threadsafe(
handle_hass_get_state(conn, entity_id), conn.loop
)
ha_response = future.result()
# 添加10秒超时
ha_response = future.result(timeout=10)
return ActionResponse(Action.REQLLM, ha_response, None)
except asyncio.TimeoutError:
logger.bind(tag=TAG).error("获取Home Assistant状态超时")
return ActionResponse(Action.ERROR, "请求超时", None)
except Exception as e:
logger.bind(tag=TAG).error(f"处理设置属性意图错误: {e}")
error_msg = f"执行Home Assistant操作失败"
logger.bind(tag=TAG).error(error_msg)
return ActionResponse(Action.ERROR, error_msg, None)
async def handle_hass_get_state(conn, entity_id):
main/xiaozhi-server/plugins_func/functions/hass_set_state.py
+8 -2
View File
@@ -55,10 +55,16 @@ def hass_set_state(conn, entity_id="", state={}):
future = asyncio.run_coroutine_threadsafe(
handle_hass_set_state(conn, entity_id, state), conn.loop
)
ha_response = future.result()
# 添加10秒超时
ha_response = future.result(timeout=10)
return ActionResponse(Action.REQLLM, ha_response, None)
except asyncio.TimeoutError:
logger.bind(tag=TAG).error("设置Home Assistant状态超时")
return ActionResponse(Action.ERROR, "请求超时", None)
except Exception as e:
logger.bind(tag=TAG).error(f"处理设置属性意图错误: {e}")
error_msg = f"执行Home Assistant操作失败"
logger.bind(tag=TAG).error(error_msg)
return ActionResponse(Action.ERROR, error_msg, None)
async def handle_hass_set_state(conn, entity_id, state):