-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Proposal to fix #1064. I'm still a little unhappy with this, as it bites with #1000, but after all it's a different use case. Maybe we can bring both together in some way. --------- Co-authored-by: Sven Eberth <[email protected]>
- Loading branch information
1 parent
e2d74a0
commit b871e6c
Showing
6 changed files
with
144 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| import base64 | ||
| import datetime | ||
| import json | ||
| import pytz | ||
| import typing as t | ||
| from viur.core import db | ||
|
|
||
|
|
||
| class ViURJsonEncoder(json.JSONEncoder): | ||
| """ | ||
| Adds support for db.Key, db.Entity, datetime, bytes and and converts the provided obj | ||
| into a special dict with JSON-serializable values. | ||
| """ | ||
| def default(self, obj: t.Any) -> t.Any: | ||
| if isinstance(obj, bytes): | ||
| return {".__bytes__": base64.b64encode(obj).decode("ASCII")} | ||
| elif isinstance(obj, datetime.datetime): | ||
| return {".__datetime__": obj.astimezone(pytz.UTC).isoformat()} | ||
| elif isinstance(obj, datetime.timedelta): | ||
| return {".__timedelta__": obj / datetime.timedelta(microseconds=1)} | ||
| elif isinstance(obj, set): | ||
| return {".__set__": list(obj)} | ||
| elif hasattr(obj, "__iter__"): | ||
| return tuple(obj) | ||
| # cannot be tested in tests... | ||
| elif isinstance(obj, db.Key): | ||
| return {".__key__": db.encodeKey(obj)} | ||
| elif isinstance(obj, db.Entity): | ||
| # TODO: Handle SkeletonInstance as well? | ||
| return { | ||
| ".__entity__": dict(obj), | ||
| ".__key__": db.encodeKey(obj.key) if obj.key else None | ||
| } | ||
|
|
||
| return super().default(obj) | ||
|
|
||
|
|
||
| def dumps(obj: t.Any, *, cls=ViURJsonEncoder, **kwargs) -> str: | ||
| """ | ||
| Wrapper for json.dumps() which converts additional ViUR datatypes. | ||
| """ | ||
| return json.dumps(obj, cls=cls, **kwargs) | ||
|
|
||
|
|
||
| def _decode_object_hook(obj: t.Any): | ||
| """ | ||
| Inverse for _preprocess_json_object, which is an object-hook for json.loads. | ||
| Check if the object matches a custom ViUR type and recreate it accordingly. | ||
| """ | ||
| if len(obj) == 1: | ||
| if buf := obj.get(".__bytes__"): | ||
| return base64.b64decode(buf) | ||
| elif date := obj.get(".__datetime__"): | ||
| return datetime.datetime.fromisoformat(date) | ||
| elif microseconds := obj.get(".__timedelta__"): | ||
| return datetime.timedelta(microseconds=microseconds) | ||
| elif key := obj.get(".__key__"): | ||
| return db.Key.from_legacy_urlsafe(key) | ||
| elif items := obj.get(".__set__"): | ||
| return set(items) | ||
|
|
||
| elif len(obj) == 2 and all(k in obj for k in (".__entity__", ".__key__")): | ||
| # TODO: Handle SkeletonInstance as well? | ||
| entity = db.Entity(db.Key.from_legacy_urlsafe(obj[".__key__"]) if obj[".__key__"] else None) | ||
| entity.update(obj[".__entity__"]) | ||
| return entity | ||
|
|
||
| return obj | ||
|
|
||
|
|
||
| def loads(s: str, *, object_hook=_decode_object_hook, **kwargs) -> t.Any: | ||
| """ | ||
| Wrapper for json.loads() which recreates additional ViUR datatypes. | ||
| """ | ||
| return json.loads(s, object_hook=object_hook, **kwargs) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters