Revert "Use orjson in the client"

This reverts commit d5e95c0.

Author: Jack Kordas

client/globus_cw_client/client.py

@@ -2,34 +2,31 @@
 Python client API for cwlogs daemon
 """
 
-from __future__ import annotations
-
+import json
 import socket
 import time
 
-import orjson
-
 
 def _checktype(value, types, message):
     if not isinstance(value, types):
         raise TypeError(message)
 
 
-def log_event(message: str | bytes, retries=10, wait=0.1):
+def log_event(message, retries=10, wait=0.1):
     """
     Log the @message string to cloudwatch logs, using the current time.
-    message: bytes (valid utf8 required) or str.
+    message: bytes (valid utf8 required) or unicode.
     retries: number of retries to make on failed socket connection
     wait: number of seconds to wait between retries
     Raises: exception if the message is too long or invalid utf8
     Raises: exception if the daemon is down or too backlogged
     Returns when the message was queued to the daemon's memory queue.
     (Does not mean the message is safe in cloudwatch)
     """
-
+    # python3 json library can't handle bytes, so preemptively decode utf-8
     if isinstance(message, bytes):
         message = message.decode("utf-8")
-    _checktype(message, str, "message type must be bytes or str")
+    _checktype(message, str, "message type must be bytes or unicode")
 
     _checktype(retries, int, "retries must be an int")
     if retries < 0:
@@ -39,10 +36,9 @@ def log_event(message: str | bytes, retries=10, wait=0.1):
     if wait < 0:
         raise ValueError("wait must be non-negative")
 
-    req = {
-        "message": message,
-        "timestamp": int(time.time() * 1000),
-    }
+    req = {}
+    req["message"] = message
+    req["timestamp"] = int(time.time() * 1000)
     return _request(req, retries, wait)
 
 
@@ -68,21 +64,24 @@ def _connect(retries, wait):
 
 
 def _request(req, retries, wait):
-    buf = orjson.dumps(req) + b"\n"
+    buf = json.dumps(req, indent=None) + "\n"
+    # dumps returns unicode with python3, but sock requires bytes
+    if isinstance(buf, str):
+        buf = buf.encode("utf-8")
 
     sock = _connect(retries, wait)
     sock.sendall(buf)
 
-    resp = b""
+    resp = ""
     while True:
         chunk = sock.recv(4000)
         if not chunk:
             raise Exception("no data")
-        resp += chunk
-        if chunk.endswith(b"\n"):
+        resp += chunk.decode("utf-8")
+        if resp.endswith("\n"):
             break
 
-    d = orjson.loads(resp[:-1])
+    d = json.loads(resp[:-1])
     if isinstance(d, dict):
         status = d["status"]
         if status == "ok":

client/setup.py

@@ -7,7 +7,4 @@
     # descriptive info, non-critical
     description="Client for Globus CloudWatch Logger",
     url="https://github.com/globus/globus-cwlogger",
-    install_requires=[
-        "orjson",
-    ],
 )

client/test/test_log_bad_event.py

@@ -4,7 +4,7 @@
 
 @pytest.mark.parametrize("message", (object(), {"foo": "bar"}))
 def test_log_event_rejects_bad_message_type(message):
-    with pytest.raises(TypeError, match="must be bytes or str"):
+    with pytest.raises(TypeError, match="must be bytes or unicode"):
         log_event(message)