jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-23 13:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code quality for Shelly integration (#109061)

Browse Source
This commit is contained in:
Simone Chemelli 2024-01-30 09:47:52 +01:00 committed by GitHub
parent b3c1e165db
commit 7359449636
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
homeassistant/components/shelly/binary_sensor.py
View File

@ -55,7 +55,7 @@ class RestBinarySensorDescription(RestEntityDescription, BinarySensorEntityDescr
"""Class to describe a REST binary sensor."""
SENSORS: Final = {
SENSORS: dict[tuple[str, str], BlockBinarySensorDescription] = {
("device", "overtemp"): BlockBinarySensorDescription(
key="device|overtemp",
name="Overheating",

12
homeassistant/components/shelly/config_flow.py
View File

@ -201,12 +201,18 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
if get_info_gen(self.info) in RPC_GENERATIONS:
schema = {
vol.Required(CONF_PASSWORD, default=user_input.get(CONF_PASSWORD)): str,
vol.Required(
CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
): str,
}
else:
schema = {
vol.Required(CONF_USERNAME, default=user_input.get(CONF_USERNAME)): str,
vol.Required(CONF_PASSWORD, default=user_input.get(CONF_PASSWORD)): str,
vol.Required(
CONF_USERNAME, default=user_input.get(CONF_USERNAME, "")
): str,
vol.Required(
CONF_PASSWORD, default=user_input.get(CONF_PASSWORD, "")
): str,
}
return self.async_show_form(

5
homeassistant/components/shelly/coordinator.py
View File

@ -7,10 +7,9 @@ from dataclasses import dataclass
from datetime import timedelta
from typing import Any, Generic, TypeVar, cast
import aioshelly
from aioshelly.ble import async_ensure_ble_enabled, async_stop_scanner
from aioshelly.block_device import BlockDevice, BlockUpdateType
from aioshelly.const import MODEL_VALVE
from aioshelly.const import MODEL_NAMES, MODEL_VALVE
from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError, RpcCallError
from aioshelly.rpc_device import RpcDevice, RpcUpdateType
@ -137,7 +136,7 @@ class ShellyCoordinatorBase(DataUpdateCoordinator[None], Generic[_DeviceT]):
name=self.name,
connections={(CONNECTION_NETWORK_MAC, self.mac)},
manufacturer="Shelly",
model=aioshelly.const.MODEL_NAMES.get(self.model, self.model),
model=MODEL_NAMES.get(self.model, self.model),
sw_version=self.sw_version,
hw_version=f"gen{get_device_entry_gen(self.entry)} ({self.model})",
configuration_url=f"http://{self.entry.data[CONF_HOST]}",

4
homeassistant/components/shelly/cover.py
View File

@ -71,7 +71,7 @@ class BlockShellyCover(ShellyBlockEntity, CoverEntity):
"""Entity that controls a cover on block based Shelly devices."""
_attr_device_class = CoverDeviceClass.SHUTTER
_attr_supported_features = (
_attr_supported_features: CoverEntityFeature = (
CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
)
@ -147,7 +147,7 @@ class RpcShellyCover(ShellyRpcEntity, CoverEntity):
"""Entity that controls a cover on RPC based Shelly devices."""
_attr_device_class = CoverDeviceClass.SHUTTER
_attr_supported_features = (
_attr_supported_features: CoverEntityFeature = (
CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE | CoverEntityFeature.STOP
)

1
homeassistant/components/shelly/entity.py
View File

@ -172,6 +172,7 @@ def async_setup_rpc_attribute_entities(
coordinator = get_entry_data(hass)[config_entry.entry_id].rpc
assert coordinator
polling_coordinator = None
if not (sleep_period := config_entry.data[CONF_SLEEP_PERIOD]):
polling_coordinator = get_entry_data(hass)[config_entry.entry_id].rpc_poll
assert polling_coordinator

8
homeassistant/components/shelly/light.py
View File

@ -221,7 +221,7 @@ class BlockShellyLight(ShellyBlockEntity, LightEntity):
red = self.block.red
green = self.block.green
blue = self.block.blue
return (red, green, blue)
return (cast(int, red), cast(int, green), cast(int, blue))
@property
def rgbw_color(self) -> tuple[int, int, int, int]:
@ -231,7 +231,7 @@ class BlockShellyLight(ShellyBlockEntity, LightEntity):
else:
white = self.block.white
return (*self.rgb_color, white)
return (*self.rgb_color, cast(int, white))
@property
def color_temp_kelvin(self) -> int:
@ -262,9 +262,9 @@ class BlockShellyLight(ShellyBlockEntity, LightEntity):
effect_index = self.block.effect
if self.coordinator.model == MODEL_BULB:
return SHBLB_1_RGB_EFFECTS[effect_index]
return SHBLB_1_RGB_EFFECTS[cast(int, effect_index)]
return STANDARD_RGB_EFFECTS[effect_index]
return STANDARD_RGB_EFFECTS[cast(int, effect_index)]
async def async_turn_on(self, **kwargs: Any) -> None:
"""Turn on light."""

4
homeassistant/components/shelly/number.py
View File

@ -2,7 +2,7 @@
from __future__ import annotations
from dataclasses import dataclass
from typing import Any, Final, cast
from typing import Any, cast
from aioshelly.block_device import Block
from aioshelly.exceptions import DeviceConnectionError, InvalidAuthError
@ -37,7 +37,7 @@ class BlockNumberDescription(BlockEntityDescription, NumberEntityDescription):
rest_arg: str = ""
NUMBERS: Final = {
NUMBERS: dict[tuple[str, str], BlockNumberDescription] = {
("device", "valvePos"): BlockNumberDescription(
key="device|valvepos",
icon="mdi:pipe-valve",

2
homeassistant/components/shelly/sensor.py
View File

@ -69,7 +69,7 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
"""Class to describe a REST sensor."""
SENSORS: Final = {
SENSORS: dict[tuple[str, str], BlockSensorDescription] = {
("device", "battery"): BlockSensorDescription(
key="device|battery",
name="Battery",