adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move bytes decoding to serializer

Browse Source
This commit is contained in:
Timothy Pogue 2022-09-05 23:25:25 -06:00
parent d526dfb171
commit 38f14349e9
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
freqtrade/rpc/api_server/ws/proxy.py
View File

@ -27,12 +27,6 @@ class WebSocketProxy:
""" """
Send data on the wrapped websocket Send data on the wrapped websocket
""" """
if not isinstance(data, str):
# We use HybridJSONWebSocketSerializer, which when serialized returns
# bytes because of ORJSON, so we explicitly decode into a string
data = str(data, "utf-8")
if hasattr(self._websocket, "send_text"): if hasattr(self._websocket, "send_text"):
await self._websocket.send_text(data) await self._websocket.send_text(data)
else: else:

7
freqtrade/rpc/api_server/ws/serializer.py
View File

@ -57,11 +57,10 @@ class RapidJSONWebSocketSerializer(WebSocketSerializer):
class HybridJSONWebSocketSerializer(WebSocketSerializer): class HybridJSONWebSocketSerializer(WebSocketSerializer):
def _serialize(self, data): def _serialize(self, data) -> str:
# ORJSON returns bytes return str(orjson.dumps(data, default=_json_default), "utf-8")
return orjson.dumps(data, default=_json_default)
def _deserialize(self, data): def _deserialize(self, data: str):
# RapidJSON expects strings # RapidJSON expects strings
return rapidjson.loads(data, object_hook=_json_object_hook) return rapidjson.loads(data, object_hook=_json_object_hook)