Rewrite and extend custom JSONEncoder in bfxapi/utils/encoder.py to automatically convert floats to strs. Change every Union[Decimal, str] type to Union[Decimal, float, str]. Fix type hinting bug in labeler.py.

This commit is contained in:
Davide Casale
2023-01-25 18:18:15 +01:00
parent 3a6a863796
commit ed12bf473f
6 changed files with 49 additions and 31 deletions

View File

@@ -2,8 +2,30 @@ import json
from decimal import Decimal
from datetime import datetime
from typing import Type, List, Dict, Union, Any
JSON = Union[Dict[str, "JSON"], List["JSON"], bool, int, float, str, Type[None]]
class JSONEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, Decimal) or isinstance(obj, datetime):
def encode(self, obj: JSON) -> str:
def _convert_float_to_str(data: JSON) -> JSON:
if isinstance(data, float):
return format(Decimal(repr(data)), "f")
elif isinstance(data, list):
return [ _convert_float_to_str(sub_data) for sub_data in data ]
elif isinstance(data, dict):
return { key: _convert_float_to_str(value) for key, value in data.items() }
else: return data
data = _convert_float_to_str(obj)
return json.JSONEncoder.encode(self, data)
def default(self, obj: Any) -> Any:
if isinstance(obj, Decimal):
return format(obj, "f")
if isinstance(obj, datetime):
return str(obj)
return json.JSONEncoder.default(self, obj)