Initial orjson support take 3 (#73849)
* Initial orjson support take 2 Still need to work out problem building wheels -- Redux of #72754 / #32153 Now possible since the following is solved: ijl/orjson#220 (comment) This implements orjson where we use our default encoder. This does not implement orjson where `ExtendedJSONEncoder` is used as these areas tend to be called far less frequently. If its desired, this could be done in a followup, but it seemed like a case of diminishing returns (except maybe for large diagnostics files, or traces, but those are not expected to be downloaded frequently). Areas where this makes a perceptible difference: - Anything that subscribes to entities (Initial subscribe_entities payload) - Initial download of registries on first connection / restore - History queries - Saving states to the database - Large logbook queries - Anything that subscribes to events (appdaemon) Cavets: orjson supports serializing dataclasses natively (and much faster) which eliminates the need to implement `as_dict` in many places when the data is already in a dataclass. This works well as long as all the data in the dataclass can also be serialized. I audited all places where we have an `as_dict` for a dataclass and found only backups needs to be adjusted (support for `Path` needed to be added for backups). I was a little bit worried about `SensorExtraStoredData` with `Decimal` but it all seems to work out from since it converts it before it gets to the json encoding cc @dgomes If it turns out to be a problem we can disable this with option |= [orjson.OPT_PASSTHROUGH_DATACLASS](https://github.com/ijl/orjson#opt_passthrough_dataclass) and it will fallback to `as_dict` Its quite impressive for history queries <img width="1271" alt="Screen_Shot_2022-05-30_at_23_46_30" src="https://user-images.githubusercontent.com/663432/171145699-661ad9db-d91d-4b2d-9c1a-9d7866c03a73.png"> * use for views as well * handle UnicodeEncodeError * tweak * DRY * DRY * not needed * fix tests * Update tests/components/http/test_view.py * Update tests/components/http/test_view.py * black * templates
This commit is contained in:
parent
9ac28d2076
commit
8b067e83f7
22 changed files with 149 additions and 80 deletions
|
@ -1,7 +1,12 @@
|
|||
"""Helpers to help with encoding Home Assistant objects in JSON."""
|
||||
import datetime
|
||||
import json
|
||||
from typing import Any
|
||||
from pathlib import Path
|
||||
from typing import Any, Final
|
||||
|
||||
import orjson
|
||||
|
||||
JSON_ENCODE_EXCEPTIONS = (TypeError, ValueError)
|
||||
|
||||
|
||||
class JSONEncoder(json.JSONEncoder):
|
||||
|
@ -22,6 +27,20 @@ class JSONEncoder(json.JSONEncoder):
|
|||
return json.JSONEncoder.default(self, o)
|
||||
|
||||
|
||||
def json_encoder_default(obj: Any) -> Any:
|
||||
"""Convert Home Assistant objects.
|
||||
|
||||
Hand other objects to the original method.
|
||||
"""
|
||||
if isinstance(obj, set):
|
||||
return list(obj)
|
||||
if hasattr(obj, "as_dict"):
|
||||
return obj.as_dict()
|
||||
if isinstance(obj, Path):
|
||||
return obj.as_posix()
|
||||
raise TypeError
|
||||
|
||||
|
||||
class ExtendedJSONEncoder(JSONEncoder):
|
||||
"""JSONEncoder that supports Home Assistant objects and falls back to repr(o)."""
|
||||
|
||||
|
@ -40,3 +59,31 @@ class ExtendedJSONEncoder(JSONEncoder):
|
|||
return super().default(o)
|
||||
except TypeError:
|
||||
return {"__type": str(type(o)), "repr": repr(o)}
|
||||
|
||||
|
||||
def json_bytes(data: Any) -> bytes:
|
||||
"""Dump json bytes."""
|
||||
return orjson.dumps(
|
||||
data, option=orjson.OPT_NON_STR_KEYS, default=json_encoder_default
|
||||
)
|
||||
|
||||
|
||||
def json_dumps(data: Any) -> str:
|
||||
"""Dump json string.
|
||||
|
||||
orjson supports serializing dataclasses natively which
|
||||
eliminates the need to implement as_dict in many places
|
||||
when the data is already in a dataclass. This works
|
||||
well as long as all the data in the dataclass can also
|
||||
be serialized.
|
||||
|
||||
If it turns out to be a problem we can disable this
|
||||
with option |= orjson.OPT_PASSTHROUGH_DATACLASS and it
|
||||
will fallback to as_dict
|
||||
"""
|
||||
return orjson.dumps(
|
||||
data, option=orjson.OPT_NON_STR_KEYS, default=json_encoder_default
|
||||
).decode("utf-8")
|
||||
|
||||
|
||||
JSON_DUMP: Final = json_dumps
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue