Skip to content

[pull] dev from home-assistant:dev #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 22, 2025
Merged

[pull] dev from home-assistant:dev #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
969ad23
Update aioairzone-cloud to v0.6.16 (#149254)
Noltari Jul 22, 2025
252a46d
Use translation_placeholders in tuya select descriptions (#149251)
epenet Jul 22, 2025
316ac62
Use translation_placeholders in tuya number descriptions (#149250)
epenet Jul 22, 2025
ef3fb50
Use translation_placeholders in tuya light descriptions (#149249)
epenet Jul 22, 2025
55ac4d8
Bump aioautomower to 2.0.1 (#149262)
Thomas55555 Jul 22, 2025
34eb995
Use translation_placeholders in tuya cover descriptions (#149248)
epenet Jul 22, 2025
71c1837
Update OpenAI title to drop "conversation" (#149263)
balloob Jul 22, 2025
45dbf3e
Bump uiprotect to version 7.19.0 (#149266)
RaHehl Jul 22, 2025
993b0bb
Use absolute humidity device class in HomematicIP Cloud (#148905)
mib1185 Jul 22, 2025
dde73c0
Order selectors alphabetically in helper (#149269)
arturpragacz Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion homeassistant/components/airzone_cloud/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
"iot_class": "cloud_push",
"loggers": ["aioairzone_cloud"],
"requirements": ["aioairzone-cloud==0.6.15"]
"requirements": ["aioairzone-cloud==0.6.16"]
}
10 changes: 6 additions & 4 deletions homeassistant/components/homematicip_cloud/sensor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
SensorStateClass,
)
from homeassistant.const import (
CONCENTRATION_GRAMS_PER_CUBIC_METER,
CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
DEGREE,
LIGHT_LUX,
Expand Down Expand Up @@ -542,15 +543,17 @@ def extra_state_attributes(self) -> dict[str, Any]:
class HomematicipAbsoluteHumiditySensor(HomematicipGenericEntity, SensorEntity):
"""Representation of the HomematicIP absolute humidity sensor."""

_attr_native_unit_of_measurement = CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER
_attr_device_class = SensorDeviceClass.ABSOLUTE_HUMIDITY
_attr_native_unit_of_measurement = CONCENTRATION_GRAMS_PER_CUBIC_METER
_attr_suggested_unit_of_measurement = CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER
_attr_state_class = SensorStateClass.MEASUREMENT

def __init__(self, hap: HomematicipHAP, device) -> None:
"""Initialize the thermometer device."""
super().__init__(hap, device, post="Absolute Humidity")

@property
def native_value(self) -> int | None:
def native_value(self) -> float | None:
"""Return the state."""
if self.functional_channel is None:
return None
Expand All @@ -564,8 +567,7 @@ def native_value(self) -> int | None:
):
return None

# Convert from g/m³ to mg/m³
return int(float(value) * 1000)
return round(value, 3)


class HomematicipIlluminanceSensor(HomematicipGenericEntity, SensorEntity):
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/husqvarna_automower/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"iot_class": "cloud_push",
"loggers": ["aioautomower"],
"quality_scale": "silver",
"requirements": ["aioautomower==2.0.0"]
"requirements": ["aioautomower==2.0.1"]
}
2 changes: 1 addition & 1 deletion homeassistant/components/openai_conversation/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"domain": "openai_conversation",
"name": "OpenAI Conversation",
"name": "OpenAI",
"after_dependencies": ["assist_pipeline", "intent"],
"codeowners": ["@balloob"],
"config_flow": true,
Expand Down
18 changes: 12 additions & 6 deletions homeassistant/components/tuya/cover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,24 @@ class TuyaCoverEntityDescription(CoverEntityDescription):
"ckmkzq": (
TuyaCoverEntityDescription(
key=DPCode.SWITCH_1,
translation_key="door",
translation_key="indexed_door",
translation_placeholders={"index": "1"},
current_state=DPCode.DOORCONTACT_STATE,
current_state_inverse=True,
device_class=CoverDeviceClass.GARAGE,
),
TuyaCoverEntityDescription(
key=DPCode.SWITCH_2,
translation_key="door_2",
translation_key="indexed_door",
translation_placeholders={"index": "2"},
current_state=DPCode.DOORCONTACT_STATE_2,
current_state_inverse=True,
device_class=CoverDeviceClass.GARAGE,
),
TuyaCoverEntityDescription(
key=DPCode.SWITCH_3,
translation_key="door_3",
translation_key="indexed_door",
translation_placeholders={"index": "3"},
current_state=DPCode.DOORCONTACT_STATE_3,
current_state_inverse=True,
device_class=CoverDeviceClass.GARAGE,
Expand All @@ -78,14 +81,16 @@ class TuyaCoverEntityDescription(CoverEntityDescription):
),
TuyaCoverEntityDescription(
key=DPCode.CONTROL_2,
translation_key="curtain_2",
translation_key="indexed_curtain",
translation_placeholders={"index": "2"},
current_position=DPCode.PERCENT_STATE_2,
set_position=DPCode.PERCENT_CONTROL_2,
device_class=CoverDeviceClass.CURTAIN,
),
TuyaCoverEntityDescription(
key=DPCode.CONTROL_3,
translation_key="curtain_3",
translation_key="indexed_curtain",
translation_placeholders={"index": "3"},
current_position=DPCode.PERCENT_STATE_3,
set_position=DPCode.PERCENT_CONTROL_3,
device_class=CoverDeviceClass.CURTAIN,
Expand Down Expand Up @@ -122,7 +127,8 @@ class TuyaCoverEntityDescription(CoverEntityDescription):
),
TuyaCoverEntityDescription(
key=DPCode.CONTROL_2,
translation_key="curtain_2",
translation_key="indexed_curtain",
translation_placeholders={"index": "2"},
current_position=DPCode.PERCENT_CONTROL_2,
set_position=DPCode.PERCENT_CONTROL_2,
device_class=CoverDeviceClass.CURTAIN,
Expand Down
21 changes: 14 additions & 7 deletions homeassistant/components/tuya/light.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ class TuyaLightEntityDescription(LightEntityDescription):
# Based on multiple reports: manufacturer customized Dimmer 2 switches
TuyaLightEntityDescription(
key=DPCode.SWITCH_1,
translation_key="light",
translation_key="indexed_light",
translation_placeholders={"index": "1"},
brightness=DPCode.BRIGHT_VALUE_1,
),
),
Expand Down Expand Up @@ -149,7 +150,8 @@ class TuyaLightEntityDescription(LightEntityDescription):
),
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED,
translation_key="light_2",
translation_key="indexed_light",
translation_placeholders={"index": "2"},
brightness=DPCode.BRIGHT_VALUE_1,
),
),
Expand Down Expand Up @@ -313,21 +315,24 @@ class TuyaLightEntityDescription(LightEntityDescription):
"tgkg": (
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED_1,
translation_key="light",
translation_key="indexed_light",
translation_placeholders={"index": "1"},
brightness=DPCode.BRIGHT_VALUE_1,
brightness_max=DPCode.BRIGHTNESS_MAX_1,
brightness_min=DPCode.BRIGHTNESS_MIN_1,
),
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED_2,
translation_key="light_2",
translation_key="indexed_light",
translation_placeholders={"index": "2"},
brightness=DPCode.BRIGHT_VALUE_2,
brightness_max=DPCode.BRIGHTNESS_MAX_2,
brightness_min=DPCode.BRIGHTNESS_MIN_2,
),
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED_3,
translation_key="light_3",
translation_key="indexed_light",
translation_placeholders={"index": "3"},
brightness=DPCode.BRIGHT_VALUE_3,
brightness_max=DPCode.BRIGHTNESS_MAX_3,
brightness_min=DPCode.BRIGHTNESS_MIN_3,
Expand All @@ -345,12 +350,14 @@ class TuyaLightEntityDescription(LightEntityDescription):
),
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED_1,
translation_key="light",
translation_key="indexed_light",
translation_placeholders={"index": "1"},
brightness=DPCode.BRIGHT_VALUE_1,
),
TuyaLightEntityDescription(
key=DPCode.SWITCH_LED_2,
translation_key="light_2",
translation_key="indexed_light",
translation_placeholders={"index": "2"},
brightness=DPCode.BRIGHT_VALUE_2,
),
),
Expand Down
30 changes: 20 additions & 10 deletions homeassistant/components/tuya/number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,32 +266,38 @@
"tgkg": (
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MIN_1,
translation_key="minimum_brightness",
translation_key="indexed_minimum_brightness",
translation_placeholders={"index": "1"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MAX_1,
translation_key="maximum_brightness",
translation_key="indexed_maximum_brightness",
translation_placeholders={"index": "1"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MIN_2,
translation_key="minimum_brightness_2",
translation_key="indexed_minimum_brightness",
translation_placeholders={"index": "2"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MAX_2,
translation_key="maximum_brightness_2",
translation_key="indexed_maximum_brightness",
translation_placeholders={"index": "2"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MIN_3,
translation_key="minimum_brightness_3",
translation_key="indexed_minimum_brightness",
translation_placeholders={"index": "3"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MAX_3,
translation_key="maximum_brightness_3",
translation_key="indexed_maximum_brightness",
translation_placeholders={"index": "3"},
entity_category=EntityCategory.CONFIG,
),
),
Expand All @@ -300,22 +306,26 @@
"tgq": (
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MIN_1,
translation_key="minimum_brightness",
translation_key="indexed_minimum_brightness",
translation_placeholders={"index": "1"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MAX_1,
translation_key="maximum_brightness",
translation_key="indexed_maximum_brightness",
translation_placeholders={"index": "1"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MIN_2,
translation_key="minimum_brightness_2",
translation_key="indexed_minimum_brightness",
translation_placeholders={"index": "2"},
entity_category=EntityCategory.CONFIG,
),
NumberEntityDescription(
key=DPCode.BRIGHTNESS_MAX_2,
translation_key="maximum_brightness_2",
translation_key="indexed_maximum_brightness",
translation_placeholders={"index": "2"},
entity_category=EntityCategory.CONFIG,
),
),
Expand Down
15 changes: 10 additions & 5 deletions homeassistant/components/tuya/select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,17 +320,20 @@
SelectEntityDescription(
key=DPCode.LED_TYPE_1,
entity_category=EntityCategory.CONFIG,
translation_key="led_type",
translation_key="indexed_led_type",
translation_placeholders={"index": "1"},
),
SelectEntityDescription(
key=DPCode.LED_TYPE_2,
entity_category=EntityCategory.CONFIG,
translation_key="led_type_2",
translation_key="indexed_led_type",
translation_placeholders={"index": "2"},
),
SelectEntityDescription(
key=DPCode.LED_TYPE_3,
entity_category=EntityCategory.CONFIG,
translation_key="led_type_3",
translation_key="indexed_led_type",
translation_placeholders={"index": "3"},
),
),
# Dimmer
Expand All @@ -339,12 +342,14 @@
SelectEntityDescription(
key=DPCode.LED_TYPE_1,
entity_category=EntityCategory.CONFIG,
translation_key="led_type",
translation_key="indexed_led_type",
translation_placeholders={"index": "1"},
),
SelectEntityDescription(
key=DPCode.LED_TYPE_2,
entity_category=EntityCategory.CONFIG,
translation_key="led_type_2",
translation_key="indexed_led_type",
translation_placeholders={"index": "2"},
),
),
}
Expand Down
50 changes: 12 additions & 38 deletions homeassistant/components/tuya/strings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,11 @@
"curtain": {
"name": "[%key:component::cover::entity_component::curtain::name%]"
},
"curtain_2": {
"name": "Curtain 2"
"indexed_curtain": {
"name": "Curtain {index}"
},
"curtain_3": {
"name": "Curtain 3"
},
"door": {
"name": "[%key:component::cover::entity_component::door::name%]"
},
"door_2": {
"name": "Door 2"
},
"door_3": {
"name": "Door 3"
"indexed_door": {
"name": "Door {index}"
}
},
"event": {
Expand All @@ -131,11 +122,8 @@
"light": {
"name": "[%key:component::light::title%]"
},
"light_2": {
"name": "Light 2"
},
"light_3": {
"name": "Light 3"
"indexed_light": {
"name": "Light {index}"
},
"night_light": {
"name": "Night light"
Expand Down Expand Up @@ -199,17 +187,11 @@
"maximum_brightness": {
"name": "Maximum brightness"
},
"minimum_brightness_2": {
"name": "Minimum brightness 2"
},
"maximum_brightness_2": {
"name": "Maximum brightness 2"
},
"minimum_brightness_3": {
"name": "Minimum brightness 3"
"indexed_minimum_brightness": {
"name": "Minimum brightness {index}"
},
"maximum_brightness_3": {
"name": "Maximum brightness 3"
"indexed_maximum_brightness": {
"name": "Maximum brightness {index}"
},
"move_down": {
"name": "Move down"
Expand Down Expand Up @@ -296,16 +278,8 @@
"led": "LED"
}
},
"led_type_2": {
"name": "Light 2 source type",
"state": {
"halogen": "[%key:component::tuya::entity::select::led_type::state::halogen%]",
"incandescent": "[%key:component::tuya::entity::select::led_type::state::incandescent%]",
"led": "[%key:component::tuya::entity::select::led_type::state::led%]"
}
},
"led_type_3": {
"name": "Light 3 source type",
"indexed_led_type": {
"name": "Light {index} source type",
"state": {
"halogen": "[%key:component::tuya::entity::select::led_type::state::halogen%]",
"incandescent": "[%key:component::tuya::entity::select::led_type::state::incandescent%]",
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/components/unifiprotect/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"integration_type": "hub",
"iot_class": "local_push",
"loggers": ["uiprotect", "unifi_discovery"],
"requirements": ["uiprotect==7.18.1", "unifi-discovery==1.2.0"],
"requirements": ["uiprotect==7.19.0", "unifi-discovery==1.2.0"],
"ssdp": [
{
"manufacturer": "Ubiquiti Networks",
Expand Down
2 changes: 1 addition & 1 deletion homeassistant/generated/integrations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4633,7 +4633,7 @@
"iot_class": "cloud_polling"
},
"openai_conversation": {
"name": "OpenAI Conversation",
"name": "OpenAI",
"integration_type": "service",
"config_flow": true,
"iot_class": "cloud_polling"
Expand Down
Loading
Loading