refactor: 全面重构腾讯云人脸识别插件
- 拆分 tencent_cloud_client.py(1311行)为 api_operations.py / image_processor.py / retry.py - 更新 HA 废弃 API: SupportsResponse.OPTIONAL, async_unload_platforms, native_value, 移除 CONNECTION_CLASS - 新增动态人员传感器管理(自动增/删) - 新增 detect_face 服务定义(services.yaml) - 移除 secret_key 持久化存储,增强安全性 - 完善错误映射前缀匹配 + 异常类型安全退避 - 修复 Coordinator 双重人员 ID 跟踪死代码 - 添加 _sanitize_error 脱敏,ImageCache LRU 缓存 - manifest.json 版本 2.1.0 + Pillow 依赖
This commit is contained in:
+64
-24
@@ -1,44 +1,60 @@
|
||||
"""
|
||||
腾讯云人脸识别Home Assistant插件
|
||||
腾讯云人脸识别 Home Assistant 插件
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from typing import Dict, Any
|
||||
from typing import Any, Dict
|
||||
|
||||
from homeassistant.config_entries import ConfigEntry
|
||||
from homeassistant.core import HomeAssistant
|
||||
from homeassistant.exceptions import ConfigEntryNotReady
|
||||
|
||||
from .const import (
|
||||
DOMAIN,
|
||||
PLATFORMS,
|
||||
CONF_PERSON_GROUP_ID,
|
||||
CONF_REGION,
|
||||
CONF_SECRET_ID,
|
||||
CONF_SECRET_KEY,
|
||||
CONF_REGION,
|
||||
CONF_PERSON_GROUP_ID,
|
||||
DOMAIN,
|
||||
PLATFORMS,
|
||||
get_entry_value,
|
||||
)
|
||||
from .tencent_cloud_client import TencentCloudClient
|
||||
from .errors import AuthenticationError, NetworkError
|
||||
from .face_recognition import FaceRecognition
|
||||
from .services import async_setup_services, async_unload_services
|
||||
from .tencent_cloud_client import TencentCloudClient
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
|
||||
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""设置配置项"""
|
||||
_LOGGER.info("设置腾讯云人脸识别插件")
|
||||
"""设置配置项。"""
|
||||
_LOGGER.info("设置腾讯云人脸识别插件: %s", entry.entry_id)
|
||||
|
||||
secret_id = entry.data.get(CONF_SECRET_ID)
|
||||
secret_key = entry.data.get(CONF_SECRET_KEY)
|
||||
region = get_entry_value(entry, CONF_REGION, "ap-shanghai")
|
||||
person_group_id = get_entry_value(entry, CONF_PERSON_GROUP_ID, "Hass")
|
||||
|
||||
# 1. 创建客户端
|
||||
try:
|
||||
client = TencentCloudClient(secret_id, secret_key, region)
|
||||
except Exception as ex:
|
||||
_LOGGER.error("创建腾讯云客户端失败")
|
||||
raise ConfigEntryNotReady(f"创建腾讯云客户端失败: {ex}")
|
||||
except Exception as ex: # noqa: BLE001
|
||||
_LOGGER.error("创建腾讯云客户端失败: %s", ex)
|
||||
raise ConfigEntryNotReady(f"创建腾讯云客户端失败: {ex}") from ex
|
||||
|
||||
# 2. 验证凭据(失败则让 HA 稍后重试 setup)
|
||||
try:
|
||||
await hass.async_add_executor_job(client.verify_credentials)
|
||||
except (AuthenticationError, NetworkError) as ex:
|
||||
_LOGGER.error("腾讯云凭据验证失败: %s", ex)
|
||||
await hass.async_add_executor_job(client.close)
|
||||
raise ConfigEntryNotReady(f"腾讯云凭据验证失败: {ex}") from ex
|
||||
except Exception as ex: # noqa: BLE001
|
||||
_LOGGER.warning("腾讯云凭据验证异常(将继续加载): %s", ex)
|
||||
|
||||
# 3. 构建核心功能与存储
|
||||
face_recognition = FaceRecognition(hass, client)
|
||||
|
||||
hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
|
||||
@@ -46,35 +62,59 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"client": client,
|
||||
"face_recognition": face_recognition,
|
||||
"secret_id": secret_id,
|
||||
"secret_key": secret_key,
|
||||
"region": region,
|
||||
"person_group_id": person_group_id
|
||||
"person_group_id": person_group_id,
|
||||
}
|
||||
|
||||
# 4. 注册服务
|
||||
await async_setup_services(hass)
|
||||
|
||||
# 5. 前向设置平台(sensor)
|
||||
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
|
||||
|
||||
# 6. 配置项更新时自动重新加载平台
|
||||
entry.async_on_unload(entry.add_update_listener(_async_update_listener))
|
||||
|
||||
_LOGGER.info("腾讯云人脸识别插件设置完成")
|
||||
return True
|
||||
|
||||
|
||||
async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
|
||||
"""配置项选项变更时重新加载。"""
|
||||
_LOGGER.debug("配置项变更,重新加载: %s", entry.entry_id)
|
||||
await hass.config_entries.async_reload(entry.entry_id)
|
||||
|
||||
|
||||
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
|
||||
"""卸载配置项"""
|
||||
_LOGGER.info("卸载腾讯云人脸识别插件")
|
||||
"""卸载配置项。"""
|
||||
_LOGGER.info("卸载腾讯云人脸识别插件: %s", entry.entry_id)
|
||||
|
||||
unload_ok = await hass.config_entries.async_forward_entry_unload(entry, "sensor")
|
||||
# 使用统一的卸载 API(兼容新版 HA)
|
||||
unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
|
||||
|
||||
if unload_ok:
|
||||
await async_unload_services(hass)
|
||||
entry_data: Dict[str, Any] = hass.data.get(DOMAIN, {}).pop(entry.entry_id, None)
|
||||
|
||||
entry_data = hass.data[DOMAIN].pop(entry.entry_id, None)
|
||||
if entry_data and "client" in entry_data:
|
||||
client = entry_data["client"]
|
||||
if entry_data and "client" in entry_data:
|
||||
client: TencentCloudClient = entry_data["client"]
|
||||
try:
|
||||
await hass.async_add_executor_job(client.close)
|
||||
except Exception as ex: # noqa: BLE001
|
||||
_LOGGER.warning("关闭腾讯云客户端时出错: %s", ex)
|
||||
|
||||
# 若已无该域的配置项,则卸载服务
|
||||
if not hass.data.get(DOMAIN):
|
||||
await async_unload_services(hass)
|
||||
|
||||
return unload_ok
|
||||
|
||||
|
||||
async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
|
||||
"""移除配置项"""
|
||||
_LOGGER.info("移除腾讯云人脸识别插件配置")
|
||||
"""移除配置项。"""
|
||||
_LOGGER.info("移除腾讯云人脸识别插件配置: %s", entry.entry_id)
|
||||
# 客户端资源已在 unload 时释放;这里仅做兜底清理
|
||||
data = hass.data.get(DOMAIN, {}).pop(entry.entry_id, None)
|
||||
if data and "client" in data:
|
||||
try:
|
||||
await hass.async_add_executor_job(data["client"].close)
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user