Switch to ujson

Author: tonybaloney

.github/workflows/gh-tests-ci.yml

@@ -26,6 +26,10 @@ jobs:
     - name: Test with pytest
       run: |
         pytest --cache-clear --cov=./azure --cov-report=xml --cov-branch tests
+    - name: Test with pytest and ujson
+      run: |
+        python -m pip install ujson
+        pytest --cache-clear tests
     - name: Codecov
       if: ${{ matrix.python-version }} == 3.9
       uses: codecov/codecov-action@v2

azure/functions/_durable_functions.py

@@ -12,7 +12,7 @@ def _serialize_custom_object(obj):
 
     This function gets called when `json.dumps` cannot serialize
     an object and returns a serializable dictionary containing enough
-    metadata to recontrust the original object.
+    metadata to reconstruct the original object.
 
     Parameters
     ----------

azure/functions/_json.py

@@ -4,16 +4,18 @@
 from enum import Enum
 import os
 
+AZUREFUNCTIONS_UJSON_ENV_VAR = 'AZUREFUNCTIONS_UJSON'
+
 try:
-    import orjson
-    if 'AZUREFUNCTIONS_ORJSON' in os.environ:
-        HAS_ORJSON = bool(os.environ['AZUREFUNCTIONS_ORJSON'])
+    import ujson
+    if AZUREFUNCTIONS_UJSON_ENV_VAR in os.environ:
+        HAS_UJSON = bool(os.environ[AZUREFUNCTIONS_UJSON_ENV_VAR])
     else:
-        HAS_ORJSON = True
+        HAS_UJSON = True
     import json
 except ImportError:
     import json
-    HAS_ORJSON = False
+    HAS_UJSON = False
 
 
 class StringifyEnum(Enum):
@@ -22,6 +24,10 @@ class StringifyEnum(Enum):
     def __str__(self):
         return str(self.name)
 
+    def __json__(self):
+        """For ujson encoding."""
+        return f'"{self.name}"'
+
 
 class StringifyEnumJsonEncoder(json.JSONEncoder):
     def default(self, o):
@@ -33,25 +39,21 @@ def default(self, o):
 
 JSONDecodeError = json.JSONDecodeError
 
-if HAS_ORJSON:
+if HAS_UJSON:
     def dumps(v, **kwargs):
-        sort_keys = False
-        if 'sort_keys' in kwargs:
-            del kwargs['sort_keys']
-            sort_keys = True
-        if kwargs:  # Unsupported arguments
-            return json.dumps(v, sort_keys=sort_keys, **kwargs)
-        if sort_keys:
-            r = orjson.dumps(v, option=orjson.OPT_SORT_KEYS)
-        else:
-            r = orjson.dumps(v)
-        return r.decode(encoding='utf-8')
+        if 'default' in kwargs:
+            return json.dumps(v, **kwargs)
+
+        if 'cls' in kwargs:
+            del kwargs['cls']
+        
+        return ujson.dumps(v, **kwargs)
 
     def loads(*args, **kwargs):
         if kwargs:
             return json.loads(*args, **kwargs)
-        else:  # ORjson takes no kwargs
-            return orjson.loads(*args)
+        else:  # ujson takes no kwargs
+            return ujson.loads(*args)
 
 else:
     dumps = json.dumps

setup.py

@@ -14,7 +14,7 @@
         'requests==2.*',
         'coverage'
     ],
-    'orjson': ['orjson>=3.6.8,<4.0']
+    'ujson': ['ujson>=5.3.0,<6.0']
 }
 
 with open("README.md") as readme:
@@ -36,6 +36,7 @@
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Operating System :: Microsoft :: Windows',
         'Operating System :: POSIX',
         'Operating System :: MacOS :: MacOS X',