soia-client 1.0.28__py3-none-any.whl → 1.0.30__py3-none-any.whl

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/_impl/service.py

@@ -177,14 +177,11 @@ class _HandleRequestFlow(Generic[Request, Response, RequestHeaders, ResponseHead
             )
         try:
             req: Any
+            request_serializer = method_impl.method.request_serializer
             if request_data[0] == "json-code":
-                req = method_impl.method.request_serializer.from_json_code(
-                    request_data
-                )
+                req = request_serializer.from_json_code(request_data[1])
             elif request_data[0] == "json":
-                req = method_impl.method.request_serializer.from_json(
-                    request_data
-                )
+                req = request_serializer.from_json(request_data[1])
             else:
                 _: Never = request_data[0]
                 del _

{soia_client-1.0.28.dist-info → soia_client-1.0.30.dist-info}/METADATA

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

{soia_client-1.0.28.dist-info → soia_client-1.0.30.dist-info}/RECORD

@@ -10,17 +10,17 @@ soia/_impl/keyed_items.py,sha256=EoPrdeLJ8i7zCH-oW-7qOcyadyrzykB6lkrf3xRVmyk,337
 soia/_impl/method.py,sha256=C6ygh-Li4zADxFR_gfeBTuPUzLjZ1XHCp0ZI4-uiRYs,455
 soia/_impl/never.py,sha256=T7PHtIipuXlici4wa0yuJKrn9JgcT-ODC3QVCwsPprY,46
 soia/_impl/optionals.py,sha256=KTgmbfYLJLrju5v10jgnnnW98QG6NYw2We3gdgi9i2E,2414
-soia/_impl/primitives.py,sha256=Xk26Fv4oQG2oXd3tS_2sAnJYQdXYX9nva09713AcJvs,8940
+soia/_impl/primitives.py,sha256=jH8MVhD2GSZx7TYXVBgzd0wzXEAEapyBFU8vozE_LbE,9000
 soia/_impl/repr.py,sha256=7WX0bEAVENTjlyZIcbT8TcJylS7IRIyafGCmqaIMxFM,1413
 soia/_impl/serializer.py,sha256=28IwkjtUnLpbnPQfVNfJXkApCK4JhXHwLkC5MVhF8xo,3529
 soia/_impl/serializers.py,sha256=IL9jHHMo11pgrL1-crarOEElvTyV5YM6FTcgumjW6IU,2564
-soia/_impl/service.py,sha256=kJU1kSQ8e5t0b3D4KCSWisJSViABeaPL46nIQl4ay1s,14829
+soia/_impl/service.py,sha256=3dpcH4XEBTEShyjzxMA_zDGg9_amTFF5A49U6hivAdQ,14792
 soia/_impl/service_client.py,sha256=0WgiN6Stg548FAdZQMuezZoooe4MYw2frEQ5KUE7xag,5311
 soia/_impl/structs.py,sha256=KrqucOqSxXda4-3gKyCmx_Oj4osTFBLk9ORyRkV_7dk,26785
 soia/_impl/timestamp.py,sha256=lXBNH8mPmzflkNjSKZSBl2XS-ot9N8N92B_zGO2SMtU,4078
 soia/_impl/type_adapter.py,sha256=RyIyh4Fnt9rMy0HRzC-a2v2JAdZsV9FBzoGEUVygVRE,2101
-soia_client-1.0.28.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.0.28.dist-info/METADATA,sha256=4lovuRXIllqSL6KOzdFEtny--QiPF9GEjDUaToyh6AA,2122
-soia_client-1.0.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.0.28.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.0.28.dist-info/RECORD,,
+soia_client-1.0.30.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.0.30.dist-info/METADATA,sha256=wDHdwHbIjPphBsvbyABOZrRKISu3cfzbQ9Rlwdol1LA,2122
+soia_client-1.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.0.30.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.0.30.dist-info/RECORD,,