fix(octopus): name the car charging rate setting with the entity prefix in use (#5438)

The ambiguous-charger warning told the user to set
input_number.predbat_car_charging_rate, but the entity prefix is
configurable (apps.yaml prefix), so with a custom prefix it named an
entity that doesn't exist. It now uses the component's own prefix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: bootc

apps/predbat/octopus.py

@@ -58,11 +58,12 @@
 CATALOGUE_FRESH_MINUTES = 24 * 60
 CATALOGUE_STALE_MINUTES = 25 * 60
 # Logged by log_catalogue_ambiguity() when the catalogue gives a make and model more than one value (issue #5438).
-# A charge point's power only ever raises input_number.predbat_car_charging_rate (fetch.py), so that is what decides
+# A charge point's power only ever raises input_number.{prefix}_car_charging_rate (fetch.py), so that is what decides
 # the rate; a vehicle's battery size from Octopus replaces car_charging_battery_size, so there is no setting to change.
+# {prefix} is the entity prefix in use (apps.yaml prefix, "predbat" by default).
 CATALOGUE_AMBIGUOUS_CHARGER = (
     "Octopus's catalogue lists charge point {device} at more than one power ({values} {unit}) and Predbat can't tell which yours is,"
-    " so it uses the lowest, {value} {unit}, unless input_number.predbat_car_charging_rate (_1, _2 for further cars) is higher. Set that to your charger's rate"
+    " so it uses the lowest, {value} {unit}, unless input_number.{prefix}_car_charging_rate (_1, _2 for further cars) is higher. Set that to your charger's rate"
 )
 CATALOGUE_AMBIGUOUS_VEHICLE = (
     "Octopus's catalogue lists vehicle {device} with more than one battery size ({values} {unit}) and Predbat can't tell which yours is,"
@@ -2491,7 +2492,8 @@ def log_catalogue_ambiguity(self, message, make, model, values, value, unit):
 
         Args:
             message (str): What was looked up and what the user can do about it, formatted with the
-                device ({device}), the values ({values}), the one in use ({value}) and the unit ({unit})
+                device ({device}), the values ({values}), the one in use ({value}), the unit ({unit}) and
+                the entity prefix in use ({prefix})
             make (str): The device's make
             model (str): The device's model
             values (list): The distinct values the catalogue gave, from catalogue_value()
@@ -2504,7 +2506,7 @@ def log_catalogue_ambiguity(self, message, make, model, values, value, unit):
         if key in self.catalogue_ambiguity_logged:
             return
         self.catalogue_ambiguity_logged.add(key)
-        self.log("Warn: OctopusAPI: " + message.format(device="{} '{}'".format(make, model), values=", ".join("{:g}".format(v) for v in values), value="{:g}".format(value), unit=unit))
+        self.log("Warn: OctopusAPI: " + message.format(device="{} '{}'".format(make, model), values=", ".join("{:g}".format(v) for v in values), value="{:g}".format(value), unit=unit, prefix=self.prefix))
 
     async def async_get_vehicle_catalogue(self):
         """

apps/predbat/tests/test_octopus_intelligent_devices.py

@@ -8,7 +8,7 @@
 from datetime import datetime, timezone, timedelta
 from unittest.mock import AsyncMock, MagicMock, patch
 
-from octopus import OctopusAPI, DATE_TIME_STR_FORMAT, OCTOPUS_CAR_ENTITY_SPEC
+from octopus import OctopusAPI, DATE_TIME_STR_FORMAT, OCTOPUS_CAR_ENTITY_SPEC, CATALOGUE_AMBIGUOUS_CHARGER
 
 
 def test_octopus_intelligent_devices_wrapper(my_predbat):
@@ -1707,6 +1707,14 @@ def check(condition, message):
         zappi_warning.startswith("Warn:") and "(7.4, 22 kW)" in zappi_warning and "the lowest, 7.4 kW" in zappi_warning and "input_number.predbat_car_charging_rate" in zappi_warning,
         "the zappi warning should list both powers, the one used and the setting to change: {!r}".format(zappi_warning),
     )
+    # The setting is named with the entity prefix in use, which apps.yaml can change from "predbat"
+    custom = _make_catalogue_api(my_predbat, "ambiguous-catalogue-prefix", [])
+    custom.prefix = "house2"
+    custom.log_catalogue_ambiguity(CATALOGUE_AMBIGUOUS_CHARGER, "Myenergi", "zappi (all models)", [7.4, 22.0], 7.4, "kW")
+    check(
+        len(custom.logged) == 1 and "input_number.house2_car_charging_rate" in custom.logged[0] and "predbat_car_charging_rate" not in custom.logged[0],
+        "with prefix house2 the warning should name input_number.house2_car_charging_rate: {}".format(custom.logged),
+    )
     ev6_warning = next((message for message in warnings if "EV6" in message), "")
     check(
         ev6_warning.startswith("Warn:") and "(74, 77.4, 80 kWh)" in ev6_warning and "the largest, 80 kWh" in ev6_warning and "car_charging_battery_size" in ev6_warning,