diff --git a/homeassistant/components/xiaomi_miio/fan.py b/homeassistant/components/xiaomi_miio/fan.py index 177f84679ee294cf46d2c646e255683b1deb1605..aa4b8a8a1bcd9a70f41199093458a287059cc6f9 100644 --- a/homeassistant/components/xiaomi_miio/fan.py +++ b/homeassistant/components/xiaomi_miio/fan.py @@ -7,14 +7,22 @@ import logging import math from typing import Any -from miio.airfresh import OperationMode as AirfreshOperationMode -from miio.airfresh_t2017 import OperationMode as AirfreshOperationModeT2017 -from miio.airpurifier import OperationMode as AirpurifierOperationMode -from miio.airpurifier_miot import OperationMode as AirpurifierMiotOperationMode from miio.fan_common import ( MoveDirection as FanMoveDirection, OperationMode as FanOperationMode, ) +from miio.integrations.airpurifier.dmaker.airfresh_t2017 import ( + OperationMode as AirfreshOperationModeT2017, +) +from miio.integrations.airpurifier.zhimi.airfresh import ( + OperationMode as AirfreshOperationMode, +) +from miio.integrations.airpurifier.zhimi.airpurifier import ( + OperationMode as AirpurifierOperationMode, +) +from miio.integrations.airpurifier.zhimi.airpurifier_miot import ( + OperationMode as AirpurifierMiotOperationMode, +) from miio.integrations.fan.zhimi.zhimi_miot import ( OperationModeFanZA5 as FanZA5OperationMode, ) diff --git a/homeassistant/components/xiaomi_miio/humidifier.py b/homeassistant/components/xiaomi_miio/humidifier.py index 0a9543ac604b6fd5d2b0cc31fdd0baf7e1211a87..b5a5e738ea0f43c5963f46dfa574fde1e72a7bdc 100644 --- a/homeassistant/components/xiaomi_miio/humidifier.py +++ b/homeassistant/components/xiaomi_miio/humidifier.py @@ -2,9 +2,15 @@ import logging import math -from miio.airhumidifier import OperationMode as AirhumidifierOperationMode -from miio.airhumidifier_miot import OperationMode as AirhumidifierMiotOperationMode -from miio.airhumidifier_mjjsq import OperationMode as AirhumidifierMjjsqOperationMode +from miio.integrations.humidifier.deerma.airhumidifier_mjjsq import ( + OperationMode as AirhumidifierMjjsqOperationMode, +) +from miio.integrations.humidifier.zhimi.airhumidifier import ( + OperationMode as AirhumidifierOperationMode, +) +from miio.integrations.humidifier.zhimi.airhumidifier_miot import ( + OperationMode as AirhumidifierMiotOperationMode, +) from homeassistant.components.humidifier import ( HumidifierDeviceClass, diff --git a/homeassistant/components/xiaomi_miio/manifest.json b/homeassistant/components/xiaomi_miio/manifest.json index 7157e32299a6e9b8c3285206dd260a3ffc332bd1..0f1a9dd92aa2e04d2d2d6d01829fc20252701efa 100644 --- a/homeassistant/components/xiaomi_miio/manifest.json +++ b/homeassistant/components/xiaomi_miio/manifest.json @@ -3,7 +3,7 @@ "name": "Xiaomi Miio", "config_flow": true, "documentation": "https://www.home-assistant.io/integrations/xiaomi_miio", - "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.11"], + "requirements": ["construct==2.10.56", "micloud==0.5", "python-miio==0.5.12"], "codeowners": ["@rytilahti", "@syssi", "@starkillerOG", "@bieniu"], "zeroconf": ["_miio._udp.local."], "iot_class": "local_polling", diff --git a/homeassistant/components/xiaomi_miio/select.py b/homeassistant/components/xiaomi_miio/select.py index 5f8fe8df591dde59cb4de9a995791c2d5e7db32e..b7e6a65775e446508ab3e7febd766182a32513ef 100644 --- a/homeassistant/components/xiaomi_miio/select.py +++ b/homeassistant/components/xiaomi_miio/select.py @@ -3,12 +3,22 @@ from __future__ import annotations from dataclasses import dataclass -from miio.airfresh import LedBrightness as AirfreshLedBrightness -from miio.airhumidifier import LedBrightness as AirhumidifierLedBrightness -from miio.airhumidifier_miot import LedBrightness as AirhumidifierMiotLedBrightness -from miio.airpurifier import LedBrightness as AirpurifierLedBrightness -from miio.airpurifier_miot import LedBrightness as AirpurifierMiotLedBrightness from miio.fan_common import LedBrightness as FanLedBrightness +from miio.integrations.airpurifier.zhimi.airfresh import ( + LedBrightness as AirfreshLedBrightness, +) +from miio.integrations.airpurifier.zhimi.airpurifier import ( + LedBrightness as AirpurifierLedBrightness, +) +from miio.integrations.airpurifier.zhimi.airpurifier_miot import ( + LedBrightness as AirpurifierMiotLedBrightness, +) +from miio.integrations.humidifier.zhimi.airhumidifier import ( + LedBrightness as AirhumidifierLedBrightness, +) +from miio.integrations.humidifier.zhimi.airhumidifier_miot import ( + LedBrightness as AirhumidifierMiotLedBrightness, +) from homeassistant.components.select import SelectEntity, SelectEntityDescription from homeassistant.config_entries import ConfigEntry diff --git a/requirements_all.txt b/requirements_all.txt index d43ee87da12300b84480262da059310a3ab75168..0606ec11933c11392eb908354a2e24386f1d814f 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -1930,7 +1930,7 @@ python-kasa==0.5.0 # python-lirc==1.2.3 # homeassistant.components.xiaomi_miio -python-miio==0.5.11 +python-miio==0.5.12 # homeassistant.components.mpd python-mpd2==3.0.5 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index ee02d6f05a2c01a7216635ecc0ca7a6e326b6c0e..8148e114d6b994383473e9cdcc2484ade2568b89 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -1298,7 +1298,7 @@ python-juicenet==1.1.0 python-kasa==0.5.0 # homeassistant.components.xiaomi_miio -python-miio==0.5.11 +python-miio==0.5.12 # homeassistant.components.nest python-nest==4.2.0