Merge pull request #61 from alepee/copilot/fix-default-base-temperature

Default base temperature and improve configuration UI

Author: alepee

custom_components/heating_cooling_degree_days/config_flow.py

@@ -6,7 +6,6 @@
 
 from homeassistant import config_entries
 from homeassistant.components.sensor import SensorDeviceClass
-from homeassistant.const import UnitOfTemperature
 from homeassistant.helpers import selector
 
 from .const import (
@@ -16,24 +15,18 @@
     CONF_INCLUDE_WEEKLY,
     CONF_TEMPERATURE_SENSOR,
     CONF_TEMPERATURE_UNIT,
-    DEFAULT_BASE_TEMPERATURE,
+    DEFAULT_BASE_TEMPERATURE_CELSIUS,
     DEFAULT_INCLUDE_COOLING,
     DEFAULT_INCLUDE_MONTHLY,
     DEFAULT_INCLUDE_WEEKLY,
+    DEFAULT_NAME_WITH_HEATING,
+    DEFAULT_NAME_WITH_HEATING_AND_COOLING,
     DOMAIN,
+    MAP_DEFAULT_BASE_TEMPERATURE,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
-TEMPERATURE_UNIT_MAPPING = {
-    "celsius": UnitOfTemperature.CELSIUS,
-    "fahrenheit": UnitOfTemperature.FAHRENHEIT,
-}
-
-# Fixed titles in English
-TITLE_STANDARD = "Heating Degree Days"
-TITLE_WITH_COOLING = "Heating & Cooling Degree Days"
-
 
 class HDDConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Heating & Cooling Degree Days."""
@@ -54,17 +47,17 @@ async def async_step_user(self, user_input=None):
                 errors["base"] = "invalid_temperature_sensor"
 
             if not errors:
-                # Map the temperature unit selection to the actual unit
-                user_input[CONF_TEMPERATURE_UNIT] = TEMPERATURE_UNIT_MAPPING[
-                    user_input[CONF_TEMPERATURE_UNIT]
-                ]
+                # Set the temperature unit to the user's preferred unit
+                user_input[CONF_TEMPERATURE_UNIT] = (
+                    self.hass.config.units.temperature_unit
+                )
 
                 include_cooling = user_input.get(
                     CONF_INCLUDE_COOLING, DEFAULT_INCLUDE_COOLING
                 )
 
                 # Use simple fixed titles
-                title = TITLE_WITH_COOLING if include_cooling else TITLE_STANDARD
+                title = self._get_default_name(include_cooling)
 
                 _LOGGER.debug("Creating integration with title: %s", title)
 
@@ -84,16 +77,9 @@ async def async_step_user(self, user_input=None):
                         ),
                     ),
                     vol.Required(
-                        CONF_BASE_TEMPERATURE, default=DEFAULT_BASE_TEMPERATURE
+                        CONF_BASE_TEMPERATURE,
+                        default=self._get_default_base_temperature(),
                     ): vol.Coerce(float),
-                    vol.Required(
-                        CONF_TEMPERATURE_UNIT, default="celsius"
-                    ): selector.SelectSelector(
-                        selector.SelectSelectorConfig(
-                            options=["celsius", "fahrenheit"],
-                            translation_key="temperature_unit",
-                        )
-                    ),
                     vol.Required(
                         CONF_INCLUDE_COOLING, default=DEFAULT_INCLUDE_COOLING
                     ): selector.BooleanSelector(),
@@ -108,6 +94,20 @@ async def async_step_user(self, user_input=None):
             errors=errors,
         )
 
+    def _get_default_base_temperature(self) -> float:
+        """Get the default base temperature based on user preferred unit system."""
+        return MAP_DEFAULT_BASE_TEMPERATURE.get(
+            self.hass.config.units.temperature_unit, DEFAULT_BASE_TEMPERATURE_CELSIUS
+        )
+
+    def _get_default_name(self, include_cooling: bool) -> str:
+        """Get the default name based on heating and cooling degree days configuration."""
+        return (
+            DEFAULT_NAME_WITH_HEATING_AND_COOLING
+            if include_cooling
+            else DEFAULT_NAME_WITH_HEATING
+        )
+
     def _validate_sensor(self, entity_id):
         """Validate the temperature sensor entity exists."""
         state = self.hass.states.get(entity_id)

custom_components/heating_cooling_degree_days/const.py

@@ -2,6 +2,8 @@
 
 from datetime import timedelta
 
+from homeassistant.const import UnitOfTemperature
+
 DOMAIN = "heating_cooling_degree_days"
 
 CONF_TEMPERATURE_SENSOR = "temperature_sensor"
@@ -11,8 +13,16 @@
 CONF_INCLUDE_WEEKLY = "include_weekly"
 CONF_INCLUDE_MONTHLY = "include_monthly"
 
-DEFAULT_BASE_TEMPERATURE = 65.0
-DEFAULT_NAME = "Heating & Cooling Degree Days"
+DEFAULT_BASE_TEMPERATURE_CELSIUS = 18.0
+DEFAULT_BASE_TEMPERATURE_FAHRENHEIT = 65.0
+MAP_DEFAULT_BASE_TEMPERATURE = {
+    UnitOfTemperature.CELSIUS: DEFAULT_BASE_TEMPERATURE_CELSIUS,
+    UnitOfTemperature.FAHRENHEIT: DEFAULT_BASE_TEMPERATURE_FAHRENHEIT,
+}
+
+DEFAULT_NAME_WITH_HEATING = "Heating Degree Days"
+DEFAULT_NAME_WITH_HEATING_AND_COOLING = "Heating & Cooling Degree Days"
+
 DEFAULT_INCLUDE_COOLING = False
 DEFAULT_INCLUDE_WEEKLY = True
 DEFAULT_INCLUDE_MONTHLY = True

custom_components/heating_cooling_degree_days/sensor.py

@@ -9,7 +9,6 @@
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -109,11 +108,7 @@ def __init__(
             sensor_type_desc = "Heating"
 
         # Set the unit of measurement based on temperature unit
-        if coordinator.temperature_unit == UnitOfTemperature.FAHRENHEIT:
-            self._attr_native_unit_of_measurement = "°F·d"
-        else:
-            # Default to Celsius
-            self._attr_native_unit_of_measurement = "°C·d"
+        self._attr_native_unit_of_measurement = f"{coordinator.temperature_unit}·d"
 
         _LOGGER.debug(
             "Initialized %s Degree Days sensor: %s with unit %s",

custom_components/heating_cooling_degree_days/translations/en.json

@@ -7,25 +7,19 @@
         "data": {
           "temperature_sensor": "Outdoor Temperature Sensor",
           "base_temperature": "Base Temperature",
-          "temperature_unit": "Temperature Unit",
           "include_cooling": "Include Cooling Degree Days (CDD)",
           "include_weekly": "Include Weekly Sensors",
           "include_monthly": "Include Monthly Sensors"
+        },
+        "data_description": {
+          "base_temperature": "The default base temperature is 18°C for Celsius or 65°F for Fahrenheit, depending on your unit system"
         }
       }
     },
     "error": {
       "invalid_temperature_sensor": "Invalid temperature sensor. Please select a valid temperature sensor."
     }
   },
-  "selector": {
-    "temperature_unit": {
-      "options": {
-        "celsius": "Celsius (°C)",
-        "fahrenheit": "Fahrenheit (°F)"
-      }
-    }
-  },
   "entity": {
     "sensor": {
       "hdd_daily": {
@@ -48,4 +42,4 @@
       }
     }
   }
-}
+}

custom_components/heating_cooling_degree_days/translations/fr.json

@@ -7,25 +7,19 @@
         "data": {
           "temperature_sensor": "Capteur de température extérieure",
           "base_temperature": "Température de base",
-          "temperature_unit": "Unité de température",
           "include_cooling": "Inclure les degrés-jours de refroidissement (DJR)",
           "include_weekly": "Inclure les capteurs hebdomadaires",
           "include_monthly": "Inclure les capteurs mensuels"
+        },
+        "data_description": {
+          "base_temperature": "La température de base par défaut est de 18°C pour Celsius ou 65°F pour Fahrenheit, selon votre système d'unités"
         }
       }
     },
     "error": {
       "invalid_temperature_sensor": "Capteur de température invalide. Veuillez sélectionner un capteur de température valide."
     }
   },
-  "selector": {
-    "temperature_unit": {
-      "options": {
-        "celsius": "Celsius (°C)",
-        "fahrenheit": "Fahrenheit (°F)"
-      }
-    }
-  },
   "entity": {
     "sensor": {
       "hdd_daily": {
@@ -48,4 +42,4 @@
       }
     }
   }
-}
+}