soia-client 1.0.29__tar.gz → 1.0.30__tar.gz

{soia_client-1.0.29 → soia_client-1.0.30}/PKG-INFO

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

{soia_client-1.0.29 → soia_client-1.0.30}/pyproject.toml

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

{soia_client-1.0.29 → soia_client-1.0.30}/soia/_impl/primitives.py

@@ -1,13 +1,13 @@
+import base64
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Final, final
 
+from soia import _spec, reflection
 from soia._impl.function_maker import Expr, ExprLike
 from soia._impl.timestamp import Timestamp
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 
 class AbstractPrimitiveAdapter(TypeAdapter):
     @final
@@ -280,8 +280,6 @@ STRING_ADAPTER: Final[TypeAdapter] = _StringAdapter()
 
 
 class _BytesAdapter(AbstractPrimitiveAdapter):
-    _fromhex_fn: Final = bytes.fromhex
-
     def default_expr(self) -> ExprLike:
         return 'b""'
 
@@ -296,11 +294,14 @@ class _BytesAdapter(AbstractPrimitiveAdapter):
         in_expr: ExprLike,
         readable: bool,
     ) -> Expr:
-        return Expr.join(in_expr, ".hex()")
+        return Expr.join(
+            Expr.local("b64encode", base64.b64encode),
+            "(", in_expr, ").decode('utf-8')",
+        )
 
     def from_json_expr(self, json_expr: ExprLike) -> Expr:
         return Expr.join(
-            Expr.local("fromhex", _BytesAdapter._fromhex_fn), "(", json_expr, ' or "")'
+            Expr.local("b64decode", base64.b64decode), "(", json_expr, ' or "")'
         )
 
     def get_type(self) -> reflection.Type:

{soia_client-1.0.29 → soia_client-1.0.30}/soia_client.egg-info/PKG-INFO

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

{soia_client-1.0.29 → soia_client-1.0.30}/tests/test_module_initializer.py

@@ -2,11 +2,10 @@ import dataclasses
 import unittest
 from typing import Any
 
+from soia import KeyedItems, Method, Timestamp, _spec
 from soia._module_initializer import init_module
 from soia.reflection import TypeDescriptor
 
-from soia import KeyedItems, Method, Timestamp, _spec
-
 
 class ModuleInitializerTestCase(unittest.TestCase):
     def init_test_module(self) -> dict[str, Any]:
@@ -423,7 +422,7 @@ class ModuleInitializerTestCase(unittest.TestCase):
             u64=3,
             t=Timestamp.from_unix_millis(4),
         )
-        self.assertEqual(serializer.to_json(p), [1, "61", 3.14, 3.14, 1, 2, 3, "", 4])
+        self.assertEqual(serializer.to_json(p), [1, "YQ==", 3.14, 3.14, 1, 2, 3, "", 4])
 
     def test_primitives_from_json(self):
         primitives_cls = self.init_test_module()["Primitives"]
@@ -431,7 +430,7 @@ class ModuleInitializerTestCase(unittest.TestCase):
         json = [0] * 100
         self.assertEqual(serializer.from_json(json), primitives_cls.DEFAULT)
         self.assertEqual(
-            serializer.from_json([1, "61", 3.14, 3.14, 1, 2, 3, "", 4]),
+            serializer.from_json([1, "YQ==", 3.14, 3.14, 1, 2, 3, "", 4]),
             primitives_cls(
                 bool=True,
                 bytes=b"a",