Fixes for logbook filtering and add it to the live stream (#72501)

homeassistant/components/logbook/queries/common.py

@@ -1,22 +1,20 @@
 """Queries for logbook."""
 from __future__ import annotations
 
-from collections.abc import Callable
 from datetime import datetime as dt
-import json
-from typing import Any
 
 import sqlalchemy
-from sqlalchemy import JSON, select, type_coerce
-from sqlalchemy.orm import Query, aliased
+from sqlalchemy import select
+from sqlalchemy.orm import Query
 from sqlalchemy.sql.elements import ClauseList
 from sqlalchemy.sql.expression import literal
 from sqlalchemy.sql.selectable import Select
 
 from homeassistant.components.proximity import DOMAIN as PROXIMITY_DOMAIN
 from homeassistant.components.recorder.models import (
-    JSON_VARIENT_CAST,
-    JSONB_VARIENT_CAST,
+    OLD_FORMAT_ATTRS_JSON,
+    OLD_STATE,
+    SHARED_ATTRS_JSON,
     EventData,
     Events,
     StateAttributes,
@@ -30,36 +28,6 @@ CONTINUOUS_ENTITY_ID_LIKE = [f"{domain}.%" for domain in CONTINUOUS_DOMAINS]
 UNIT_OF_MEASUREMENT_JSON = '"unit_of_measurement":'
 UNIT_OF_MEASUREMENT_JSON_LIKE = f"%{UNIT_OF_MEASUREMENT_JSON}%"
 
-OLD_STATE = aliased(States, name="old_state")
-
-
-class JSONLiteral(JSON):  # type: ignore[misc]
-    """Teach SA how to literalize json."""
-
-    def literal_processor(self, dialect: str) -> Callable[[Any], str]:
-        """Processor to convert a value to JSON."""
-
-        def process(value: Any) -> str:
-            """Dump json."""
-            return json.dumps(value)
-
-        return process
-
-
-EVENT_DATA_JSON = type_coerce(
-    EventData.shared_data.cast(JSONB_VARIENT_CAST), JSONLiteral(none_as_null=True)
-)
-OLD_FORMAT_EVENT_DATA_JSON = type_coerce(
-    Events.event_data.cast(JSONB_VARIENT_CAST), JSONLiteral(none_as_null=True)
-)
-
-SHARED_ATTRS_JSON = type_coerce(
-    StateAttributes.shared_attrs.cast(JSON_VARIENT_CAST), JSON(none_as_null=True)
-)
-OLD_FORMAT_ATTRS_JSON = type_coerce(
-    States.attributes.cast(JSON_VARIENT_CAST), JSON(none_as_null=True)
-)
-
 
 PSUEDO_EVENT_STATE_CHANGED = None
 # Since we don't store event_types and None