re-import orjson module for json serialization/deserialization (#294)

* re-import orjson module for json serialization/deserialization

* fix test

Co-authored-by: Vikram Patki <54442035+patkivikram@users.noreply.github.com>

faust/utils/json.py

@@ -28,7 +28,10 @@
 if typing.TYPE_CHECKING:
     import orjson
 else:  # pragma: no cover
-    orjson = None  # noqa
+    try:
+        import orjson
+    except ImportError:
+        orjson = None  # noqa
 
 DEFAULT_TEXTUAL_TYPES: List[Type] = [Decimal, uuid.UUID, bytes]
 
@@ -172,7 +175,6 @@ def dumps(
         return json_dumps(
             obj,
             default=on_default,
-            option=orjson.OPT_NAIVE_UTC,
         )
 
     def loads(s: str, json_loads: Callable = orjson.loads, **kwargs: Any) -> Any:
@@ -188,7 +190,12 @@ def dumps(
         **kwargs: Any,
     ) -> str:
         """Serialize to json.  See :func:`json.dumps`."""
-        return json_dumps(obj, cls=cls, **dict(_JSON_DEFAULT_KWARGS, **kwargs))
+        return json_dumps(
+            obj,
+            cls=cls,
+            **dict(_JSON_DEFAULT_KWARGS, **kwargs),
+            separators=(",", ":"),
+        )
 
     def loads(s: str, json_loads: Callable = json.loads, **kwargs: Any) -> Any:
         """Deserialize json string.  See :func:`json.loads`."""

tests/functional/test_models.py

@@ -106,7 +106,7 @@ def __init__(self, x, y, **kwargs):
     assert p.y == 10
 
     payload = p.dumps(serializer="json")
-    assert payload == b'{"x": 30, "y": 10}'
+    assert payload == b'{"x":30,"y":10}'
 
     data = json.loads(payload)
     p2 = Point.from_data(data)
@@ -128,7 +128,7 @@ def __post_init__(self):
     assert p.z == 40
 
     payload = p.dumps(serializer="json")
-    assert payload == b'{"x": 30, "y": 10}'
+    assert payload == b'{"x":30,"y":10}'
 
     data = json.loads(payload)
     p2 = Point.from_data(data)

tests/unit/stores/test_base.py

@@ -62,15 +62,15 @@ async def test_on_rebalance(self, *, store):
         )
 
     def test_encode_key(self, *, store):
-        assert store._encode_key({"foo": 1}) == b'{"foo": 1}'
+        assert store._encode_key({"foo": 1}) == b'{"foo":1}'
 
     def test_encode_key__cannot_be_None(self, *, store):
         store.key_serializer = "raw"
         with pytest.raises(TypeError):
             store._encode_key(None)
 
     def test_encode_value(self, *, store):
-        assert store._encode_value({"foo": 1}) == b'{"foo": 1}'
+        assert store._encode_value({"foo": 1}) == b'{"foo":1}'
 
     def test_decode_key(self, *, store):
         assert store._decode_key(b'{"foo": 1}') == {"foo": 1}