soia-client 1.1.11__tar.gz → 1.1.13__tar.gz

{soia_client-1.1.11/soia_client.egg-info → soia_client-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.11
+Version: 1.1.13
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.11 → soia_client-1.1.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soia-client"
-version = "1.1.11"
+version = "1.1.13"
 description = ""
 readme = "README.md"
 authors = [{ name = "Tyler Fibonacci", email = "gepheum@gmail.com" }]

{soia_client-1.1.11 → soia_client-1.1.13}/soia/_impl/arrays.py

@@ -98,9 +98,9 @@ class _ArrayAdapter(Generic[T], TypeAdapter[tuple[T, ...]]):
             listuple_class_local,
             "([",
             self.item_adapter.from_json_expr("_e", keep_unrecognized_expr),
-            " for _e in ",
+            " for _e in (",
             json_expr,
-            "] or ",
+            " or ())] or ",
             empty_listuple_local,
             ")",
         )

{soia_client-1.1.11 → soia_client-1.1.13}/soia/_impl/primitives.py

@@ -407,6 +407,13 @@ class _StringAdapter(AbstractPrimitiveAdapter[str]):
 STRING_ADAPTER: Final[TypeAdapter] = _StringAdapter()
 
 
+def _bytes_from_json(json: str) -> bytes:
+    if json.startswith("hex:"):
+        return bytes.fromhex(json[4:])
+    else:
+        return base64.b64decode(json)
+
+
 class _BytesAdapter(AbstractPrimitiveAdapter[bytes]):
     def default_expr(self) -> ExprLike:
         return 'b""'
@@ -422,18 +429,25 @@ class _BytesAdapter(AbstractPrimitiveAdapter[bytes]):
         in_expr: ExprLike,
         readable: bool,
     ) -> Expr:
-        return Expr.join(
-            Expr.local("b64encode", base64.b64encode),
-            "(",
-            in_expr,
-            ").decode('utf-8')",
-        )
+        if readable:
+            return Expr.join(
+                "('hex:' + ",
+                in_expr,
+                ".hex())",
+            )
+        else:
+            return Expr.join(
+                Expr.local("b64encode", base64.b64encode),
+                "(",
+                in_expr,
+                ").decode('utf-8')",
+            )
 
     def from_json_expr(
         self, json_expr: ExprLike, keep_unrecognized_expr: ExprLike
     ) -> Expr:
         return Expr.join(
-            Expr.local("b64decode", base64.b64decode), "(", json_expr, ' or "")'
+            Expr.local("bytes_from_json", _bytes_from_json), "(", json_expr, ' or "")'
         )
 
     @staticmethod

{soia_client-1.1.11 → soia_client-1.1.13/soia_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.1.11
+Version: 1.1.13
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.1.11 → soia_client-1.1.13}/tests/test_serializers.py

@@ -147,6 +147,19 @@ class SerializersTestCase(unittest.TestCase):
             ),
             "[\n  true,\n  false\n]",
         )
+        self.assertEqual(
+            array_serializer(primitive_serializer("bool")).from_json_code(
+                "[ true, false ]"
+            ),
+            (
+                True,
+                False,
+            ),
+        )
+        self.assertEqual(
+            array_serializer(primitive_serializer("bool")).from_json_code("0"),
+            (),
+        )
 
     def test_optional_serializer(self):
         self.assertEqual(