soia-client 1.1.11__py3-none-any.whl → 1.1.12__py3-none-any.whl

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.dist-info → soia_client-1.1.12.dist-info}/METADATA

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

{soia_client-1.1.11.dist-info → soia_client-1.1.12.dist-info}/RECORD

@@ -12,7 +12,7 @@ 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=nYEQcR_kGzVGSaIhatQmZyusdDfmgmB7a7cgL2OVeJA,3661
-soia/_impl/primitives.py,sha256=P6nxe11euYSnSjN2vPIbmtTDU2OnH2_I3rQYv7taYA4,13540
+soia/_impl/primitives.py,sha256=BIkHP-6M2YO72Xzwp1d5mLrgzMkzRIZnhbQfnJLaMl8,13894
 soia/_impl/repr.py,sha256=Z4sZKFrujdTD49aqB7q3bjXAb1f31I7uuChDBy5XvFg,1418
 soia/_impl/serializer.py,sha256=UrOb5_VaPnRb0t-Nop7mu7j_yaK4fiRQzwMdKOUkmTQ,4627
 soia/_impl/serializers.py,sha256=IL9jHHMo11pgrL1-crarOEElvTyV5YM6FTcgumjW6IU,2564
@@ -21,8 +21,8 @@ soia/_impl/service_client.py,sha256=FWfbFswbhMBw1snR9JLEpSJagY2ntZbFaVxTUGEDA5s,
 soia/_impl/structs.py,sha256=7hHula-mJnKbYyl6crYvv1U5uxj5lcvLeyD1fCbJIrc,35945
 soia/_impl/timestamp.py,sha256=uiDQOVDC1ygA-15Yl_b7-pT_tsbHe1YrtB0kA5FFebY,5637
 soia/_impl/type_adapter.py,sha256=OSZdXbeXANSEkKBb_rAgljB_2qG3HJUk6jK3nPjzRRY,2909
-soia_client-1.1.11.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.1.11.dist-info/METADATA,sha256=ncXGjZw4gmVZMU4FIyUl_uB4i97EBdGcKfDt9ZHaQxI,2122
-soia_client-1.1.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.1.11.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.1.11.dist-info/RECORD,,
+soia_client-1.1.12.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.1.12.dist-info/METADATA,sha256=AyZDoXKXycxmXGBkZ_RIKGqXiHclOIJ_aYGyiHnmftI,2122
+soia_client-1.1.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.1.12.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.1.12.dist-info/RECORD,,