Reuse conversion to serializable

Signed-off-by: David Rapan <[email protected]>

Author: davidrapan

homeassistant/components/sql/sensor.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from datetime import date
-import decimal
 import logging
 from typing import TYPE_CHECKING, Any
 
@@ -44,6 +42,7 @@
 from .const import CONF_ADVANCED_OPTIONS, CONF_COLUMN_NAME, CONF_QUERY, DOMAIN
 from .util import (
     async_create_sessionmaker,
+    ensure_serializable,
     generate_lambda_stmt,
     redact_credentials,
     resolve_db_url,
@@ -247,19 +246,13 @@ def extra_state_attributes(self) -> dict[str, Any] | None:
     def _process(self, result: Result) -> None:
         """Process the SQL result."""
         data = None
-        extra_state_attributes = {}
-        for res in result.mappings():
-            _LOGGER.debug("Query %s result in %s", self._query, res.items())
-            data = res[self._column_name]
-            for key, value in res.items():
-                if isinstance(value, decimal.Decimal):
-                    value = float(value)
-                elif isinstance(value, date):
-                    value = value.isoformat()
-                elif isinstance(value, (bytes, bytearray)):
-                    value = f"0x{value.hex()}"
-                extra_state_attributes[key] = value
-                self._attr_extra_state_attributes[key] = value
+
+        for row in result.mappings():
+            row_items = row.items()
+            _LOGGER.debug("Query %s result in %s", self._query, row_items)
+            data = row[self._column_name]
+            for key, value in row_items:
+                self._attr_extra_state_attributes[key] = ensure_serializable(value)
 
         if data is not None and isinstance(data, (bytes, bytearray)):
             data = f"0x{data.hex()}"

homeassistant/components/sql/services.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-import datetime
-import decimal
 import logging
 from typing import TYPE_CHECKING
 
@@ -28,6 +26,7 @@
 from .const import CONF_QUERY, DOMAIN
 from .util import (
     async_create_sessionmaker,
+    ensure_serializable,
     generate_lambda_stmt,
     redact_credentials,
     resolve_db_url,
@@ -77,14 +76,7 @@ def _process(result: Result) -> list[JsonValueType]:
         for row in result.mappings():
             processed_row: dict[str, JsonValueType] = {}
             for key, value in row.items():
-                if isinstance(value, decimal.Decimal):
-                    processed_row[key] = float(value)
-                elif isinstance(value, datetime.date):
-                    processed_row[key] = value.isoformat()
-                elif isinstance(value, (bytes, bytearray)):
-                    processed_row[key] = f"0x{value.hex()}"
-                else:
-                    processed_row[key] = value
+                processed_row[key] = ensure_serializable(value)
             rows.append(processed_row)
         return rows
 

homeassistant/components/sql/util.py

@@ -3,7 +3,10 @@
 from __future__ import annotations
 
 import asyncio
+from datetime import date
+from decimal import Decimal
 import logging
+from typing import Any
 
 import sqlalchemy
 from sqlalchemy import lambda_stmt
@@ -210,7 +213,7 @@ async def _shutdown_db_engines(_: Event) -> None:
 async def _async_validate_and_get_session_maker_for_db_url(
     hass: HomeAssistant, db_url: str
 ) -> async_scoped_session[AsyncSession] | scoped_session[Session] | None:
-    """Validate the db_url and return a async session maker."""
+    """Validate the db_url and return a session maker."""
     try:
         if "+aiomysql" in db_url or "+aiosqlite" in db_url or "+asyncpg" in db_url:
             maker = async_scoped_session(
@@ -254,3 +257,16 @@ def generate_lambda_stmt(query: str) -> StatementLambdaElement:
     """Generate the lambda statement."""
     text = sqlalchemy.text(query)
     return lambda_stmt(lambda: text, lambda_cache=_SQL_LAMBDA_CACHE)
+
+
+def ensure_serializable(value: Any) -> Any:
+    """Ensure value is serializable."""
+    match value:
+        case Decimal():
+            return float(value)
+        case date():
+            return value.isoformat()
+        case bytes() | bytearray():
+            return f"0x{value.hex()}"
+        case _:
+            return value

tests/components/sql/test_sensor.py

@@ -305,7 +305,7 @@ def rollback(self) -> None:
 async def test_query_from_yaml(
     recorder_mock: Recorder, hass: HomeAssistant, async_driver: bool
 ) -> None:
-    """Test the SQL sensor from yaml config using async driver."""
+    """Test the SQL sensor from yaml config."""
 
     config = YAML_CONFIG