Marshalling: Refactor

Author: amotl

src/crate/client/http.py

@@ -113,6 +113,14 @@ def cratedb_json_encoder(obj):
     return obj
 
 
+def json_dumps(obj):
+    return orjson.dumps(
+        obj,
+        default=cratedb_json_encoder,
+        option=(orjson.OPT_PASSTHROUGH_DATETIME | orjson.OPT_SERIALIZE_NUMPY),
+    )
+
+
 class Server:
     def __init__(self, server, **pool_kw):
         socket_options = _get_socket_opts(
@@ -340,11 +348,7 @@ def _create_sql_payload(stmt, args, bulk_args):
         data["args"] = args
     if bulk_args:
         data["bulk_args"] = bulk_args
-    return orjson.dumps(
-        data,
-        default=cratedb_json_encoder,
-        option=(orjson.OPT_PASSTHROUGH_DATETIME | orjson.OPT_SERIALIZE_NUMPY),
-    )
+    return json_dumps(data)
 
 
 def _get_socket_opts(

tests/client/test_http.py

@@ -51,7 +51,7 @@
     Client,
     _get_socket_opts,
     _remove_certs_for_non_https,
-    cratedb_json_encoder,
+    json_dumps,
 )
 
 REQUEST = "crate.client.http.Server.request"
@@ -724,10 +724,10 @@ def test_username(self):
 class TestCrateJsonEncoder(TestCase):
     def test_naive_datetime(self):
         data = dt.datetime.fromisoformat("2023-06-26T09:24:00.123")
-        result = cratedb_json_encoder(data)
-        self.assertEqual(result, 1687771440123)
+        result = json_dumps(data)
+        self.assertEqual(result, b"1687771440123")
 
     def test_aware_datetime(self):
         data = dt.datetime.fromisoformat("2023-06-26T09:24:00.123+02:00")
-        result = cratedb_json_encoder(data)
-        self.assertEqual(result, 1687764240123)
+        result = json_dumps(data)
+        self.assertEqual(result, b"1687764240123")