2025.1.4 (#136407)

Co-authored-by: Robert Resch <[email protected]> Co-authored-by: J. Nick Koston <[email protected]> Co-authored-by: Matt Doran <[email protected]> Co-authored-by: G Johansson <[email protected]> Co-authored-by: Makrit <[email protected]> Co-authored-by: Claudio Ruggeri - CR-Tech <[email protected]> Co-authored-by: Simon Lamon <[email protected]> Co-authored-by: Yuxin Wang <[email protected]> Co-authored-by: Åke Strandberg <[email protected]> Co-authored-by: Paul Bottein <[email protected]> Co-authored-by: Joost Lekkerkerker <[email protected]> Co-authored-by: Klaas Schoute <[email protected]> Fix slave id equal to 0 (#136263)
home-assistant · Jan 24, 2025 · 6145ea2 · 6145ea2
2 parents 3e1d13b + 223b437
commit 6145ea2
Show file tree

Hide file tree

Showing 29 changed files with 114 additions and 45 deletions.
diff --git a/homeassistant/components/apcupsd/coordinator.py b/homeassistant/components/apcupsd/coordinator.py
@@ -44,7 +44,10 @@ def model(self) -> str | None:
     @property
     def serial_no(self) -> str | None:
         """Return the unique serial number of the UPS, if available."""
-        return self.get("SERIALNO")
+        sn = self.get("SERIALNO")
+        # We had user reports that some UPS models simply return "Blank" as serial number, in
+        # which case we fall back to `None` to indicate that it is actually not available.
+        return None if sn == "Blank" else sn
 
 
 class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):

diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
@@ -21,5 +21,5 @@
   "documentation": "https://www.home-assistant.io/integrations/frontend",
   "integration_type": "system",
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20250109.0"]
+  "requirements": ["home-assistant-frontend==20250109.2"]
 }
diff --git a/homeassistant/components/holiday/manifest.json b/homeassistant/components/holiday/manifest.json
@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/holiday",
   "iot_class": "local_polling",
-  "requirements": ["holidays==0.64", "babel==2.15.0"]
+  "requirements": ["holidays==0.65", "babel==2.15.0"]
 }
diff --git a/homeassistant/components/hydrawise/binary_sensor.py b/homeassistant/components/hydrawise/binary_sensor.py
@@ -68,7 +68,7 @@ class HydrawiseBinarySensorEntityDescription(BinarySensorEntityDescription):
 )
 
 SCHEMA_START_WATERING: VolDictType = {
-    vol.Optional("duration"): vol.All(vol.Coerce(int), vol.Range(min=0, max=90)),
+    vol.Optional("duration"): vol.All(vol.Coerce(int), vol.Range(min=0, max=1440)),
 }
 SCHEMA_SUSPEND: VolDictType = {
     vol.Required("until"): cv.datetime,

diff --git a/homeassistant/components/hydrawise/services.yaml b/homeassistant/components/hydrawise/services.yaml
@@ -10,7 +10,7 @@ start_watering:
       selector:
         number:
           min: 0
-          max: 90
+          max: 1440
           unit_of_measurement: min
           mode: box
 suspend:

diff --git a/homeassistant/components/linkplay/entity.py b/homeassistant/components/linkplay/entity.py
@@ -44,9 +44,15 @@ def __init__(self, bridge: LinkPlayBridge) -> None:
         if model != MANUFACTURER_GENERIC:
             model_id = bridge.device.properties["project"]
 
+        connections: set[tuple[str, str]] = set()
+        if "MAC" in bridge.device.properties:
+            connections.add(
+                (dr.CONNECTION_NETWORK_MAC, bridge.device.properties["MAC"])
+            )
+
         self._attr_device_info = dr.DeviceInfo(
             configuration_url=bridge.endpoint,
-            connections={(dr.CONNECTION_NETWORK_MAC, bridge.device.properties["MAC"])},
+            connections=connections,
             hw_version=bridge.device.properties["hardware"],
             identifiers={(DOMAIN, bridge.device.uuid)},
             manufacturer=manufacturer,

diff --git a/homeassistant/components/modbus/entity.py b/homeassistant/components/modbus/entity.py
@@ -79,7 +79,10 @@ def __init__(
         """Initialize the Modbus binary sensor."""
 
         self._hub = hub
-        self._slave = entry.get(CONF_SLAVE) or entry.get(CONF_DEVICE_ADDRESS, 0)
+        if (conf_slave := entry.get(CONF_SLAVE)) is not None:
+            self._slave = conf_slave
+        else:
+            self._slave = entry.get(CONF_DEVICE_ADDRESS, 1)
         self._address = int(entry[CONF_ADDRESS])
         self._input_type = entry[CONF_INPUT_TYPE]
         self._value: str | None = None

diff --git a/homeassistant/components/modbus/modbus.py b/homeassistant/components/modbus/modbus.py
@@ -368,7 +368,9 @@ async def low_level_pb_call(
         self, slave: int | None, address: int, value: int | list[int], use_call: str
     ) -> ModbusPDU | None:
         """Call sync. pymodbus."""
-        kwargs = {"slave": slave} if slave else {}
+        kwargs: dict[str, Any] = (
+            {ATTR_SLAVE: slave} if slave is not None else {ATTR_SLAVE: 1}
+        )
         entry = self._pb_request[use_call]
         try:
             result: ModbusPDU = await entry.func(address, value, **kwargs)

diff --git a/homeassistant/components/myuplink/sensor.py b/homeassistant/components/myuplink/sensor.py
@@ -325,10 +325,10 @@ def __init__(
         }
 
     @property
-    def native_value(self) -> str:
+    def native_value(self) -> str | None:
         """Sensor state value for enum sensor."""
         device_point = self.coordinator.data.points[self.device_id][self.point_id]
-        return self.options_map[str(int(device_point.value))]  # type: ignore[no-any-return]
+        return self.options_map.get(str(int(device_point.value)))
 
 
 class MyUplinkEnumRawSensor(MyUplinkDevicePointSensor):

diff --git a/homeassistant/components/peblar/const.py b/homeassistant/components/peblar/const.py
@@ -23,7 +23,7 @@
     ChargeLimiter.INSTALLATION_LIMIT: "installation_limit",
     ChargeLimiter.LOCAL_MODBUS_API: "local_modbus_api",
     ChargeLimiter.LOCAL_REST_API: "local_rest_api",
-    ChargeLimiter.LOCAL_SCHEDULED: "local_scheduled",
+    ChargeLimiter.LOCAL_SCHEDULED_CHARGING: "local_scheduled_charging",
     ChargeLimiter.OCPP_SMART_CHARGING: "ocpp_smart_charging",
     ChargeLimiter.OVERCURRENT_PROTECTION: "overcurrent_protection",
     ChargeLimiter.PHASE_IMBALANCE: "phase_imbalance",

diff --git a/homeassistant/components/peblar/manifest.json b/homeassistant/components/peblar/manifest.json
@@ -7,6 +7,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "quality_scale": "platinum",
-  "requirements": ["peblar==0.3.3"],
+  "requirements": ["peblar==0.4.0"],
   "zeroconf": [{ "type": "_http._tcp.local.", "name": "pblr-*" }]
 }
diff --git a/homeassistant/components/peblar/strings.json b/homeassistant/components/peblar/strings.json
@@ -96,6 +96,7 @@
           "installation_limit": "Installation limit",
           "local_modbus_api": "Modbus API",
           "local_rest_api": "REST API",
+          "local_scheduled_charging": "Scheduled charging",
           "ocpp_smart_charging": "OCPP smart charging",
           "overcurrent_protection": "Overcurrent protection",
           "phase_imbalance": "Phase imbalance",

diff --git a/homeassistant/components/powerfox/manifest.json b/homeassistant/components/powerfox/manifest.json
@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/powerfox",
   "iot_class": "cloud_polling",
   "quality_scale": "silver",
-  "requirements": ["powerfox==1.2.0"],
+  "requirements": ["powerfox==1.2.1"],
   "zeroconf": [
     {
       "type": "_http._tcp.local.",

diff --git a/homeassistant/components/twitch/coordinator.py b/homeassistant/components/twitch/coordinator.py
@@ -122,7 +122,7 @@ async def _async_update_data(self) -> dict[str, TwitchUpdate]:
                 stream.game_name if stream else None,
                 stream.title if stream else None,
                 stream.started_at if stream else None,
-                stream.thumbnail_url if stream else None,
+                stream.thumbnail_url.format(width="", height="") if stream else None,
                 channel.profile_image_url,
                 bool(sub),
                 sub.is_gift if sub else None,

diff --git a/homeassistant/components/withings/manifest.json b/homeassistant/components/withings/manifest.json
@@ -13,5 +13,5 @@
   "documentation": "https://www.home-assistant.io/integrations/withings",
   "iot_class": "cloud_push",
   "loggers": ["aiowithings"],
-  "requirements": ["aiowithings==3.1.4"]
+  "requirements": ["aiowithings==3.1.5"]
 }
diff --git a/homeassistant/components/workday/manifest.json b/homeassistant/components/workday/manifest.json
@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["holidays"],
   "quality_scale": "internal",
-  "requirements": ["holidays==0.64"]
+  "requirements": ["holidays==0.65"]
 }
diff --git a/homeassistant/const.py b/homeassistant/const.py
@@ -25,7 +25,7 @@
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
 MINOR_VERSION: Final = 1
-PATCH_VERSION: Final = "3"
+PATCH_VERSION: Final = "4"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
@@ -35,7 +35,7 @@ habluetooth==3.7.0
 hass-nabucasa==0.87.0
 hassil==2.1.0
 home-assistant-bluetooth==1.13.0
-home-assistant-frontend==20250109.0
+home-assistant-frontend==20250109.2
 home-assistant-intents==2025.1.1
 httpx==0.27.2
 ifaddr==0.2.0

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2025.1.3"
+version     = "2025.1.4"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"

diff --git a/requirements_all.txt b/requirements_all.txt
@@ -416,7 +416,7 @@ aiowatttime==0.1.1
 aiowebostv==0.4.2
 
 # homeassistant.components.withings
-aiowithings==3.1.4
+aiowithings==3.1.5
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
@@ -1131,10 +1131,10 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.64
+holidays==0.65
 
 # homeassistant.components.frontend
-home-assistant-frontend==20250109.0
+home-assistant-frontend==20250109.2
 
 # homeassistant.components.conversation
 home-assistant-intents==2025.1.1
@@ -1603,7 +1603,7 @@ panasonic-viera==0.4.2
 pdunehd==1.3.2
 
 # homeassistant.components.peblar
-peblar==0.3.3
+peblar==0.4.0
 
 # homeassistant.components.peco
 peco==0.0.30
@@ -1650,7 +1650,7 @@ pmsensor==0.4
 poolsense==0.0.8
 
 # homeassistant.components.powerfox
-powerfox==1.2.0
+powerfox==1.2.1
 
 # homeassistant.components.reddit
 praw==7.5.0

diff --git a/requirements_test_all.txt b/requirements_test_all.txt
@@ -398,7 +398,7 @@ aiowatttime==0.1.1
 aiowebostv==0.4.2
 
 # homeassistant.components.withings
-aiowithings==3.1.4
+aiowithings==3.1.5
 
 # homeassistant.components.yandex_transport
 aioymaps==1.2.5
@@ -960,10 +960,10 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.64
+holidays==0.65
 
 # homeassistant.components.frontend
-home-assistant-frontend==20250109.0
+home-assistant-frontend==20250109.2
 
 # homeassistant.components.conversation
 home-assistant-intents==2025.1.1
@@ -1330,7 +1330,7 @@ panasonic-viera==0.4.2
 pdunehd==1.3.2
 
 # homeassistant.components.peblar
-peblar==0.3.3
+peblar==0.4.0
 
 # homeassistant.components.peco
 peco==0.0.30
@@ -1360,7 +1360,7 @@ plumlightpad==0.0.11
 poolsense==0.0.8
 
 # homeassistant.components.powerfox
-powerfox==1.2.0
+powerfox==1.2.1
 
 # homeassistant.components.reddit
 praw==7.5.0

diff --git a/tests/components/apcupsd/test_config_flow.py b/tests/components/apcupsd/test_config_flow.py
@@ -125,6 +125,8 @@ async def test_flow_works(hass: HomeAssistant) -> None:
         ({"UPSNAME": "Friendly Name"}, "Friendly Name"),
         ({"MODEL": "MODEL X"}, "MODEL X"),
         ({"SERIALNO": "ZZZZ"}, "ZZZZ"),
+        # Some models report "Blank" as serial number, which we should treat it as not reported.
+        ({"SERIALNO": "Blank"}, "APC UPS"),
         ({}, "APC UPS"),
     ],
 )

diff --git a/tests/components/apcupsd/test_init.py b/tests/components/apcupsd/test_init.py
@@ -31,6 +31,8 @@
         # Does not contain either "SERIALNO" field.
         # We should _not_ create devices for the entities and their IDs will not have prefixes.
         MOCK_MINIMAL_STATUS,
+        # Some models report "Blank" as SERIALNO, but we should treat it as not reported.
+        MOCK_MINIMAL_STATUS | {"SERIALNO": "Blank"},
     ],
 )
 async def test_async_setup_entry(hass: HomeAssistant, status: OrderedDict) -> None:
@@ -41,7 +43,7 @@ async def test_async_setup_entry(hass: HomeAssistant, status: OrderedDict) -> No
     await async_init_integration(hass, status=status)
 
     prefix = ""
-    if "SERIALNO" in status:
+    if "SERIALNO" in status and status["SERIALNO"] != "Blank":
         prefix = slugify(status.get("UPSNAME", "APC UPS")) + "_"
 
     # Verify successful setup by querying the status sensor.
@@ -56,6 +58,8 @@ async def test_async_setup_entry(hass: HomeAssistant, status: OrderedDict) -> No
     [
         # We should not create device entries if SERIALNO is not reported.
         MOCK_MINIMAL_STATUS,
+        # Some models report "Blank" as SERIALNO, but we should treat it as not reported.
+        MOCK_MINIMAL_STATUS | {"SERIALNO": "Blank"},
         # We should set the device name to be the friendly UPSNAME field if available.
         MOCK_MINIMAL_STATUS | {"SERIALNO": "XXXX", "UPSNAME": "MyUPS"},
         # Otherwise, we should fall back to default device name --- "APC UPS".
@@ -71,7 +75,7 @@ async def test_device_entry(
     await async_init_integration(hass, status=status)
 
     # Verify device info is properly set up.
-    if "SERIALNO" not in status:
+    if "SERIALNO" not in status or status["SERIALNO"] == "Blank":
         assert len(device_registry.devices) == 0
         return
 

diff --git a/tests/components/modbus/test_init.py b/tests/components/modbus/test_init.py
@@ -1265,3 +1265,56 @@ async def test_no_entities(hass: HomeAssistant) -> None:
         ]
     }
     assert await async_setup_component(hass, DOMAIN, config) is False
+
+
+@pytest.mark.parametrize(
+    ("do_config", "expected_slave_value"),
+    [
+        (
+            {
+                CONF_SENSORS: [
+                    {
+                        CONF_NAME: "dummy",
+                        CONF_ADDRESS: 1234,
+                    },
+                ],
+            },
+            1,
+        ),
+        (
+            {
+                CONF_SENSORS: [
+                    {
+                        CONF_NAME: "dummy",
+                        CONF_ADDRESS: 1234,
+                        CONF_SLAVE: 0,
+                    },
+                ],
+            },
+            0,
+        ),
+        (
+            {
+                CONF_SENSORS: [
+                    {
+                        CONF_NAME: "dummy",
+                        CONF_ADDRESS: 1234,
+                        CONF_DEVICE_ADDRESS: 6,
+                    },
+                ],
+            },
+            6,
+        ),
+    ],
+)
+async def test_check_default_slave(
+    hass: HomeAssistant,
+    mock_modbus,
+    do_config,
+    mock_do_cycle,
+    expected_slave_value: int,
+) -> None:
+    """Test default slave."""
+    assert mock_modbus.read_holding_registers.mock_calls
+    first_call = mock_modbus.read_holding_registers.mock_calls[0]
+    assert first_call.kwargs["slave"] == expected_slave_value
diff --git a/tests/components/myuplink/fixtures/device_points_nibe_f730.json b/tests/components/myuplink/fixtures/device_points_nibe_f730.json
@@ -822,7 +822,7 @@
     "parameterUnit": "",
     "writable": false,
     "timestamp": "2024-02-08T19:13:05+00:00",
-    "value": 30,
+    "value": 31,
     "strVal": "Heating",
     "smartHomeCategories": [],
     "minValue": null,

diff --git a/tests/components/myuplink/snapshots/test_diagnostics.ambr b/tests/components/myuplink/snapshots/test_diagnostics.ambr
@@ -883,7 +883,7 @@
                     "parameterUnit": "",
                     "writable": false,
                     "timestamp": "2024-02-08T19:13:05+00:00",
-                    "value": 30,
+                    "value": 31,
                     "strVal": "Heating",
                     "smartHomeCategories": [],
                     "minValue": null,
@@ -2045,7 +2045,7 @@
                     "parameterUnit": "",
                     "writable": false,
                     "timestamp": "2024-02-08T19:13:05+00:00",
-                    "value": 30,
+                    "value": 31,
                     "strVal": "Heating",
                     "smartHomeCategories": [],
                     "minValue": null,