dycw-utilities 0.162.6__tar.gz → 0.162.7__tar.gz

{dycw_utilities-0.162.6 → dycw_utilities-0.162.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.162.6
+Version: 0.162.7
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.162.6 → dycw_utilities-0.162.7}/pyproject.toml

@@ -230,7 +230,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.162.6"
+version = "0.162.7"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -263,7 +263,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.162.6"
+current_version = "0.162.7"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.162.6 → dycw_utilities-0.162.7}/src/tests/test_orjson.py

@@ -20,7 +20,6 @@ from hypothesis.strategies import (
     sets,
     tuples,
 )
-from orjson import JSONDecodeError
 from polars import Object, String, UInt64
 from pytest import approx, mark, param, raises
 from whenever import ZonedDateTime
@@ -73,6 +72,7 @@ from utilities.orjson import (
     OrjsonFormatter,
     OrjsonLogRecord,
     Unserializable,
+    _DeserializeInvalidJSONError,
     _DeserializeNoObjectsError,
     _DeserializeObjectNotFoundError,
     _object_hook_get_object,
@@ -428,7 +428,7 @@ class TestGetLogRecords:
         assert result.num_lines_error == 1
         assert result.missing == set()
         assert len(result.other_errors) == 1
-        assert isinstance(one(result.other_errors), JSONDecodeError)
+        assert isinstance(one(result.other_errors), _DeserializeInvalidJSONError)
 
 
 class TestOrjsonFormatter:
@@ -753,6 +753,14 @@ class TestSerialize:
         assert result == expected
 
 
+class TestDeserialize:
+    def test_error_invalid_json(self) -> None:
+        with raises(
+            _DeserializeInvalidJSONError, match="Invalid JSON: b'invalid json'"
+        ):
+            _ = deserialize(b"invalid json")
+
+
 class TestObjectHookGetObject:
     def test_main(self) -> None:
         result = _object_hook_get_object(Sentinel.__qualname__, objects={Sentinel})

{dycw_utilities-0.162.6 → dycw_utilities-0.162.7}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.162.6"
+__version__ = "0.162.7"

{dycw_utilities-0.162.6 → dycw_utilities-0.162.7}/src/utilities/orjson.py

@@ -20,6 +20,7 @@ from orjson import (
     OPT_PASSTHROUGH_DATACLASS,
     OPT_PASSTHROUGH_DATETIME,
     OPT_SORT_KEYS,
+    JSONDecodeError,
     dumps,
     loads,
 )
@@ -371,8 +372,12 @@ def deserialize(
     redirects: Mapping[str, type[Any]] | None = None,
 ) -> Any:
     """Deserialize an object."""
+    try:
+        obj = loads(data)
+    except JSONDecodeError:
+        raise _DeserializeInvalidJSONError(data=data) from None
     return _object_hook(
-        loads(data),
+        obj,
         data=data,
         dataclass_hook=dataclass_hook,
         objects=objects,
@@ -380,6 +385,11 @@ def deserialize(
     )
 
 
+@dataclass(kw_only=True, slots=True)
+class DeerializeError(Exception):
+    obj: Any
+
+
 (
     _DATE_PATTERN,
     _DATE_DELTA_PATTERN,
@@ -739,11 +749,19 @@ def _object_hook_get_object(
 @dataclass(kw_only=True, slots=True)
 class DeserializeError(Exception):
     data: bytes
-    qualname: str
+
+
+@dataclass(kw_only=True, slots=True)
+class _DeserializeInvalidJSONError(DeserializeError):
+    @override
+    def __str__(self) -> str:
+        return f"Invalid JSON: {self.data!r}"
 
 
 @dataclass(kw_only=True, slots=True)
 class _DeserializeNoObjectsError(DeserializeError):
+    qualname: str
+
     @override
     def __str__(self) -> str:
         return f"Objects required to deserialize {self.qualname!r} from {self.data!r}"
@@ -751,6 +769,8 @@ class _DeserializeNoObjectsError(DeserializeError):
 
 @dataclass(kw_only=True, slots=True)
 class _DeserializeObjectNotFoundError(DeserializeError):
+    qualname: str
+
     @override
     def __str__(self) -> str:
         return (