Merge pull request #379 from munrojm/json_fallback

Force `MontyDecoder` to fall back to python JSON decoder when `orjson` errors

.pre-commit-config.yaml

@@ -41,7 +41,7 @@ repos:
         args: ["--profile", "black"]
 
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
 

monty/json.py

@@ -445,7 +445,10 @@ def decode(self, s):
         :return: Object.
         """
         if orjson is not None:
-            d = orjson.loads(s)  # pylint: disable=E1101
+            try:
+                d = orjson.loads(s)  # pylint: disable=E1101
+            except orjson.JSONDecodeError:  # pylint: disable=E1101
+                d = json.loads(s)
         else:
             d = json.loads(s)
         return self.process_decoded(d)
@@ -501,7 +504,11 @@ def jsanitize(obj, strict=False, allow_bson=False, enum_values=False, recursive_
     if isinstance(obj, dict):
         return {
             k.__str__(): jsanitize(
-                v, strict=strict, allow_bson=allow_bson, enum_values=enum_values, recursive_msonable=recursive_msonable
+                v,
+                strict=strict,
+                allow_bson=allow_bson,
+                enum_values=enum_values,
+                recursive_msonable=recursive_msonable,
             )
             for k, v in obj.items()
         }

requirements-ci.txt

@@ -13,7 +13,7 @@ pydocstyle
 pydantic==1.9.0
 flake8
 pandas==1.4.1
-black
+black>=22.3.0
 pylint
 orjson==3.6.8
 types-orjson==3.6.2

tests/test_json.py

@@ -307,6 +307,12 @@ def test_uuid(self):
         d = json.loads(jsonstr, cls=MontyDecoder)
         self.assertEqual(type(d["uuid"]), UUID)
 
+    def test_nan(self):
+        x = [float("NaN")]
+        djson = json.dumps(x, cls=MontyEncoder)
+        d = json.loads(djson)
+        self.assertEqual(type(d[0]), float)
+
     def test_numpy(self):
         x = np.array([1, 2, 3], dtype="int64")
         self.assertRaises(TypeError, json.dumps, x)
@@ -357,7 +363,10 @@ def test_numpy(self):
 
         self.assertEqual(d["np_a"]["a"][0]["b"]["@module"], "numpy")
         self.assertEqual(d["np_a"]["a"][0]["b"]["@class"], "array")
-        self.assertEqual(d["np_a"]["a"][0]["b"]["data"], [[[1.0, 2.0], [3.0, 4.0]], [[1.0, 1.0], [1.0, 1.0]]])
+        self.assertEqual(
+            d["np_a"]["a"][0]["b"]["data"],
+            [[[1.0, 2.0], [3.0, 4.0]], [[1.0, 1.0], [1.0, 1.0]]],
+        )
         self.assertEqual(d["np_a"]["a"][0]["b"]["dtype"], "complex64")
 
         obj = ClassContainingNumpyArray.from_dict(d)