From 83591704b59c9f3746bf59994f91221f00ba4ec0 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 16 Jan 2023 15:48:00 +0100
Subject: [PATCH] Adjust sensor validation warning (#86017)

---
 homeassistant/components/sensor/__init__.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/homeassistant/components/sensor/__init__.py b/homeassistant/components/sensor/__init__.py
index d254bfa8666..893d5f3728b 100644
--- a/homeassistant/components/sensor/__init__.py
+++ b/homeassistant/components/sensor/__init__.py
@@ -156,6 +156,7 @@ class SensorEntity(Entity):
     _attr_unit_of_measurement: None = (
         None  # Subclasses of SensorEntity should not set this
     )
+    _invalid_numeric_value_reported = False
     _invalid_state_class_reported = False
     _invalid_unit_of_measurement_reported = False
     _last_reset_reported = False
@@ -512,20 +513,27 @@ class SensorEntity(Entity):
         if not device_class and not state_class and not unit_of_measurement:
             return value
 
-        if not isinstance(value, (int, float, Decimal)):
+        if not self._invalid_numeric_value_reported and not isinstance(
+            value, (int, float, Decimal)
+        ):
             try:
                 _ = float(value)  # type: ignore[arg-type]
             except (TypeError, ValueError):
+                # This should raise in Home Assistant Core 2023.4
+                self._invalid_numeric_value_reported = True
+                report_issue = self._suggest_report_issue()
                 _LOGGER.warning(
                     "Sensor %s has device class %s, state class %s and unit %s "
                     "thus indicating it has a numeric value; however, it has the "
-                    "non-numeric value: %s (%s). This will stop working in 2023.4",
+                    "non-numeric value: %s (%s); Please update your configuration "
+                    "if your entity is manually configured, otherwise %s",
                     self.entity_id,
                     device_class,
                     state_class,
                     unit_of_measurement,
                     value,
                     type(value),
+                    report_issue,
                 )
                 return value