diff --git a/homeassistant/components/openweathermap/sensor.py b/homeassistant/components/openweathermap/sensor.py index 15935556ef3..e37ff678708 100644 --- a/homeassistant/components/openweathermap/sensor.py +++ b/homeassistant/components/openweathermap/sensor.py @@ -45,7 +45,6 @@ from .const import ( ATTR_API_WIND_BEARING, ATTR_API_WIND_SPEED, ATTRIBUTION, - DEFAULT_NAME, DOMAIN, MANUFACTURER, OWM_MODE_FREE_FORECAST, @@ -189,6 +188,7 @@ class AbstractOpenWeatherMapSensor(SensorEntity): _attr_should_poll = False _attr_attribution = ATTRIBUTION + _attr_has_entity_name = True def __init__( self, @@ -201,13 +201,12 @@ class AbstractOpenWeatherMapSensor(SensorEntity): self.entity_description = description self._coordinator = coordinator - self._attr_name = f"{name} {description.name}" self._attr_unique_id = f"{unique_id}-{description.key}" self._attr_device_info = DeviceInfo( entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, unique_id)}, manufacturer=MANUFACTURER, - name=DEFAULT_NAME, + name=name, ) @property diff --git a/homeassistant/components/openweathermap/weather.py b/homeassistant/components/openweathermap/weather.py index 12d883c871a..d6cdee77ce9 100644 --- a/homeassistant/components/openweathermap/weather.py +++ b/homeassistant/components/openweathermap/weather.py @@ -79,6 +79,8 @@ class OpenWeatherMapWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordina _attr_attribution = ATTRIBUTION _attr_should_poll = False + _attr_has_entity_name = True + _attr_name = None _attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS _attr_native_pressure_unit = UnitOfPressure.HPA @@ -95,13 +97,12 @@ class OpenWeatherMapWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordina ) -> None: """Initialize the sensor.""" super().__init__(weather_coordinator) - self._attr_name = name self._attr_unique_id = unique_id self._attr_device_info = DeviceInfo( entry_type=DeviceEntryType.SERVICE, identifiers={(DOMAIN, unique_id)}, manufacturer=MANUFACTURER, - name=DEFAULT_NAME, + name=name, ) self.mode = mode diff --git a/tests/components/openweathermap/snapshots/test_sensor.ambr b/tests/components/openweathermap/snapshots/test_sensor.ambr index 1f416f76578..7b0cf4fbf99 100644 --- a/tests/components/openweathermap/snapshots/test_sensor.ambr +++ b/tests/components/openweathermap/snapshots/test_sensor.ambr @@ -15,7 +15,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_cloud_coverage', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -26,7 +26,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Cloud coverage', + 'original_name': 'Cloud coverage', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -65,7 +65,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_condition', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -76,7 +76,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Condition', + 'original_name': 'Condition', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -115,7 +115,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_dew_point', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -126,7 +126,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Dew Point', + 'original_name': 'Dew Point', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -168,7 +168,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_feels_like_temperature', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -179,7 +179,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Feels like temperature', + 'original_name': 'Feels like temperature', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -221,7 +221,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_humidity', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -232,7 +232,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Humidity', + 'original_name': 'Humidity', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -272,7 +272,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_precipitation_kind', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -283,7 +283,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Precipitation kind', + 'original_name': 'Precipitation kind', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -322,7 +322,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_pressure', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -333,7 +333,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Pressure', + 'original_name': 'Pressure', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -375,7 +375,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_rain', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -386,7 +386,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Rain', + 'original_name': 'Rain', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -428,7 +428,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_snow', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -439,7 +439,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Snow', + 'original_name': 'Snow', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -481,7 +481,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_temperature', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -492,7 +492,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Temperature', + 'original_name': 'Temperature', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -534,7 +534,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_uv_index', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -545,7 +545,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap UV Index', + 'original_name': 'UV Index', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -586,7 +586,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_visibility', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -597,7 +597,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Visibility', + 'original_name': 'Visibility', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -637,7 +637,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_weather', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -648,7 +648,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Weather', + 'original_name': 'Weather', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -685,7 +685,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_weather_code', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -696,7 +696,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Weather Code', + 'original_name': 'Weather Code', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -735,7 +735,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_wind_bearing', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -746,7 +746,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Wind bearing', + 'original_name': 'Wind bearing', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -788,7 +788,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_wind_speed', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -802,7 +802,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Wind speed', + 'original_name': 'Wind speed', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -844,7 +844,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_cloud_coverage', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -855,7 +855,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Cloud coverage', + 'original_name': 'Cloud coverage', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -894,7 +894,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_condition', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -905,7 +905,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Condition', + 'original_name': 'Condition', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -944,7 +944,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_dew_point', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -955,7 +955,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Dew Point', + 'original_name': 'Dew Point', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -997,7 +997,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_feels_like_temperature', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1008,7 +1008,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Feels like temperature', + 'original_name': 'Feels like temperature', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1050,7 +1050,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_humidity', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1061,7 +1061,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Humidity', + 'original_name': 'Humidity', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1101,7 +1101,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_precipitation_kind', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1112,7 +1112,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Precipitation kind', + 'original_name': 'Precipitation kind', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1151,7 +1151,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_pressure', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1162,7 +1162,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Pressure', + 'original_name': 'Pressure', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1204,7 +1204,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_rain', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1215,7 +1215,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Rain', + 'original_name': 'Rain', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1257,7 +1257,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_snow', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1268,7 +1268,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Snow', + 'original_name': 'Snow', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1310,7 +1310,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_temperature', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1321,7 +1321,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Temperature', + 'original_name': 'Temperature', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1363,7 +1363,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_uv_index', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1374,7 +1374,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap UV Index', + 'original_name': 'UV Index', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1415,7 +1415,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_visibility', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1426,7 +1426,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Visibility', + 'original_name': 'Visibility', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1466,7 +1466,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_weather', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1477,7 +1477,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Weather', + 'original_name': 'Weather', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1514,7 +1514,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_weather_code', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1525,7 +1525,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap Weather Code', + 'original_name': 'Weather Code', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1564,7 +1564,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_wind_bearing', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1575,7 +1575,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Wind bearing', + 'original_name': 'Wind bearing', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -1617,7 +1617,7 @@ 'domain': 'sensor', 'entity_category': None, 'entity_id': 'sensor.openweathermap_wind_speed', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -1631,7 +1631,7 @@ }), 'original_device_class': , 'original_icon': None, - 'original_name': 'openweathermap Wind speed', + 'original_name': 'Wind speed', 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, diff --git a/tests/components/openweathermap/snapshots/test_weather.ambr b/tests/components/openweathermap/snapshots/test_weather.ambr index 90f583d9db1..1d77d9179a5 100644 --- a/tests/components/openweathermap/snapshots/test_weather.ambr +++ b/tests/components/openweathermap/snapshots/test_weather.ambr @@ -37,7 +37,7 @@ 'domain': 'weather', 'entity_category': None, 'entity_id': 'weather.openweathermap', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -48,7 +48,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap', + 'original_name': None, 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': 0, @@ -98,7 +98,7 @@ 'domain': 'weather', 'entity_category': None, 'entity_id': 'weather.openweathermap', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -109,7 +109,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap', + 'original_name': None, 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': , @@ -160,7 +160,7 @@ 'domain': 'weather', 'entity_category': None, 'entity_id': 'weather.openweathermap', - 'has_entity_name': False, + 'has_entity_name': True, 'hidden_by': None, 'icon': None, 'id': , @@ -171,7 +171,7 @@ }), 'original_device_class': None, 'original_icon': None, - 'original_name': 'openweathermap', + 'original_name': None, 'platform': 'openweathermap', 'previous_unique_id': None, 'supported_features': ,