soia-client 1.1.8__py3-none-any.whl → 1.1.20__py3-none-any.whl

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

@@ -630,10 +630,9 @@ def _make_decode_fn(
     builder.append_ln("  try:")
     builder.append_ln("    return ", number_to_constant_local, "[number]")
     builder.append_ln("  except:")
-    builder.append_ln("    ", Expr.local("decode_unused", decode_unused), "(stream)")
     if removed_numbers:
         builder.append_ln(
-            f"    if number in {removed_numbers_tuple} or not keep_unrecognized_fields:"
+            f"    if number in {removed_numbers_tuple} or not stream.keep_unrecognized_fields:"
         )
         builder.append_ln("      return ", unknown_constant_local)
     builder.append_ln("    bytes = stream.buffer[start_offset:stream.position]")
@@ -671,18 +670,20 @@ def _make_decode_fn(
 
     if not value_fields:
         # The field was either removed or is an unrecognized field.
+        builder.append_ln(Expr.local("decode_unused", decode_unused), "(stream)")
         if removed_numbers:
             builder.append_ln(
-                f"if number in {removed_numbers_tuple} or not keep_unrecognized_fields:"
+                f"if number in {removed_numbers_tuple} or not stream.keep_unrecognized_fields:"
             )
             builder.append_ln("  return ", unknown_constant_local)
         builder.append_ln("bytes = stream.buffer[start_offset:stream.position]")
         builder.append_ln("return ", unrecognized_class_local, "(0, bytes)")
     else:
         builder.append_ln(f"if number not in {value_field_numbers}:")
+        builder.append_ln("  ", Expr.local("decode_unused", decode_unused), "(stream)")
         if removed_numbers:
             builder.append_ln(
-                f"  if number in {removed_numbers_tuple} or not keep_unrecognized_fields:"
+                f"  if number in {removed_numbers_tuple} or not stream.keep_unrecognized_fields:"
             )
             builder.append_ln("    return ", unknown_constant_local)
         builder.append_ln("  bytes = stream.buffer[start_offset:stream.position]")

soia/_impl/primitives.py

@@ -1,4 +1,5 @@
 import base64
+import math
 import struct
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -66,7 +67,7 @@ class _BoolAdapter(AbstractPrimitiveAdapter[bool]):
     def from_json_expr(
         self, json_expr: ExprLike, keep_unrecognized_expr: ExprLike
     ) -> Expr:
-        return Expr.join("(True if ", json_expr, " else False)")
+        return Expr.join("(", json_expr, " not in (0, '0'))")
 
     @staticmethod
     def encode(
@@ -210,6 +211,20 @@ INT64_ADAPTER: Final[TypeAdapter[int]] = _Int64Adapter()
 UINT64_ADAPTER: Final[TypeAdapter[int]] = _Uint64Adapter()
 
 
+_SPECIAL_FLOAT_TO_STRING: Final[dict[str, str]] = {
+    "nan": "NaN",
+    "inf": "Infinity",
+    "-inf": "-Infinity",
+}
+
+
+_STRING_TO_SPECIAL_FLOAT: Final[dict[str, float]] = {
+    "NaN": float("nan"),
+    "Infinity": float("inf"),
+    "-Infinity": float("-inf"),
+}
+
+
 @dataclass(frozen=True)
 class _AbstractFloatAdapter(AbstractPrimitiveAdapter[float]):
     """Type adapter implementation for float32 and float64."""
@@ -224,12 +239,40 @@ class _AbstractFloatAdapter(AbstractPrimitiveAdapter[float]):
         return arg_expr
 
     def to_json_expr(self, in_expr: ExprLike, readable: bool) -> ExprLike:
-        return in_expr
+        return Expr.join(
+            "(",
+            in_expr,
+            " if ",
+            Expr.local("_isfinite", math.isfinite),
+            "(",
+            in_expr,
+            ") else ",
+            Expr.local(
+                "_SPECIAL_FLOAT_TO_STRING",
+                _SPECIAL_FLOAT_TO_STRING,
+            ),
+            "[f'{",
+            in_expr,
+            "}'])",
+        )
 
     def from_json_expr(
         self, json_expr: ExprLike, keep_unrecognized_expr: ExprLike
     ) -> Expr:
-        return Expr.join("(", json_expr, " + 0.0)")
+        return Expr.join(
+            "(",
+            Expr.local(
+                "_STRING_TO_SPECIAL_FLOAT",
+                _STRING_TO_SPECIAL_FLOAT,
+            ),
+            "[",
+            json_expr,
+            "] if ",
+            json_expr,
+            " in ('NaN', 'Infinity', '-Infinity') else (",
+            json_expr,
+            " + 0.0))",
+        )
 
     def decode_fn(self) -> Callable[[ByteStream], float]:
         return decode_float
@@ -339,6 +382,8 @@ class _TimestampAdapter(AbstractPrimitiveAdapter[Timestamp]):
 def _timestamp_from_json(json: Any) -> Timestamp:
     if json.__class__ is int or isinstance(json, int):
         return Timestamp(unix_millis=json)
+    elif isinstance(json, float) or isinstance(json, str):
+        return Timestamp(unix_millis=int(json))
     else:
         return Timestamp(unix_millis=json["unix_millis"])
 
@@ -384,7 +429,7 @@ class _StringAdapter(AbstractPrimitiveAdapter[str]):
     @staticmethod
     def decode(stream: ByteStream) -> str:
         wire = stream.read(1)[0]
-        if wire == 242:
+        if wire in (0, 242):
             return ""
         else:
             # Should be wire 243
@@ -405,6 +450,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""'
@@ -420,18 +472,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/_impl/structs.py

@@ -852,14 +852,6 @@ def _make_from_json_fn(
         f"  if array_len <= {num_slots_incl_removed} or not keep_unrecognized_fields:"
     )
     builder.append_ln("    ret._unrecognized = None")
-    builder.append_ln(
-        "    ret._array_len = ",
-        _adjust_array_len_expr(
-            "array_len",
-            removed_numbers=removed_numbers,
-            num_slots_excl_removed=num_slots_excl_removed,
-        ),
-    )
     builder.append_ln("  else:")
     builder.append_ln(
         "    ret._unrecognized = ",
@@ -868,7 +860,14 @@ def _make_from_json_fn(
         Expr.local("deepcopy", copy.deepcopy),
         f"(json[{num_slots_incl_removed}:]), adjusted_json_array_len=array_len)",
     )
-    builder.append_ln(f"    ret._array_len = {num_slots_excl_removed}")
+    builder.append_ln(
+        "  ret._array_len = ",
+        _adjust_array_len_expr(
+            "array_len",
+            removed_numbers=removed_numbers,
+            num_slots_excl_removed=num_slots_excl_removed,
+        ),
+    )
 
     builder.append_ln("else:")
     builder.append_ln("  array_len = 0")
@@ -946,14 +945,14 @@ def _make_decode_fn(
 
     builder.append_ln(f"if array_len > {num_slots_excl_removed}:")
     builder.append_ln(
-        f"  if array_len > {num_slots_incl_removed} and keep_unrecognized_fields:"
+        f"  if array_len > {num_slots_incl_removed} and stream.keep_unrecognized_fields:"
     )
     for _ in range(num_slots_incl_removed - num_slots_excl_removed):
         builder.append_ln(
             "    ", Expr.local("decode_unused", decode_unused), "(stream)"
         )
     builder.append_ln("    start_offset = stream.position")
-    builder.append_ln("    for _ in range(array_len - {num_slots_incl_removed}):")
+    builder.append_ln(f"    for _ in range(array_len - {num_slots_incl_removed}):")
     builder.append_ln("      ", Expr.local("decode_unused", decode_unused), "(stream)")
     builder.append_ln("    end_offset = stream.position")
     builder.append_ln(
@@ -969,7 +968,7 @@ def _make_decode_fn(
     builder.append_ln("  ret._unrecognized = None")
 
     builder.append_ln(
-        "  ret._array_len = ",
+        "ret._array_len = ",
         _adjust_array_len_expr(
             "array_len",
             removed_numbers=removed_numbers,

soia/reflection.py

@@ -316,15 +316,15 @@ _FIELD_SERIALIZER: Final = _dataclass_serializer(
             "name",
             _primitive_serializer(str),
         ),
+        _FieldSerializer(
+            "number",
+            _primitive_serializer(int),
+        ),
         _FieldSerializer[Optional[Type]](
             "type",
             _optional_serializer(_forwarding_serializer(_type_serializer)),
             default=None,
         ),
-        _FieldSerializer(
-            "number",
-            _primitive_serializer(int),
-        ),
     ],
 )
 

{soia_client-1.1.8.dist-info → soia_client-1.1.20.dist-info}/METADATA

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

{soia_client-1.1.8.dist-info → soia_client-1.1.20.dist-info}/RECORD

@@ -1,28 +1,28 @@
 soia/__init__.py,sha256=WPhdlu7zKBSWd4DVFWXQKQoptD0gU7xGFm4tbQHrVc8,787
 soia/_module_initializer.py,sha256=JHZMcLqpYuWoC3cN4wBFFCHlHR60-LNvrjo_EMCFkAE,4220
 soia/_spec.py,sha256=Y5EHHQa6qNeJc29aaqGrFPnPFXxlL7TED9_AXUGBjf0,3663
-soia/reflection.py,sha256=SEFHNlzmWZEOQwoVUTIxzjjnbkiKSwo2rbpSU-qXhC4,9375
+soia/reflection.py,sha256=rBwoA6iqT6ELXpuZyJg3Gjj4XadlT4U7Veu-JgcEZUg,9375
 soia/_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-soia/_impl/arrays.py,sha256=xX9xBvdk_-DcI9PiylRzszkf25uXk0SJOi8rRLcxYCw,7252
+soia/_impl/arrays.py,sha256=_4aayjMJkoCh_Nz28QXOUr5h7YWKBkoeBdLAEbjagNY,7260
 soia/_impl/binary.py,sha256=JK8W_xjVBHUmJoGrmMZX1EKWXXFpfnTbCmQGid4t5z8,8986
-soia/_impl/enums.py,sha256=qZCFQTOWuzNidkxCEXY71lJ1rT5-HHgzYxZIPD6_6LY,24968
+soia/_impl/enums.py,sha256=RcHAHQUNynngiJWbQMwnzpx-Sc_f12xZwFXg1GFqroY,25073
 soia/_impl/function_maker.py,sha256=MvCDv1WwzKGJzZbNCnJ_8-MP3m1xTIabumXA-9Ydd9M,5639
 soia/_impl/keep.py,sha256=GDeMKKUcvUFXWJVzBPB9CuLkcQb93sWKvo0PcyKUBzg,370
 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=hjUxMmd584je6DANjWlZ9shHO5PX6vrK5zJAAfdrA-4,13436
+soia/_impl/primitives.py,sha256=N5Z9VWYSihqPKZ32WR7OAjNsHJp-OUvpJKiEuDcD9-Q,14864
 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
 soia/_impl/service.py,sha256=4FZ7yY4EJTw4xFmfg3Ya9IfbI0s8qN97aIuqa8TifjM,15535
 soia/_impl/service_client.py,sha256=FWfbFswbhMBw1snR9JLEpSJagY2ntZbFaVxTUGEDA5s,5303
-soia/_impl/structs.py,sha256=7hHula-mJnKbYyl6crYvv1U5uxj5lcvLeyD1fCbJIrc,35945
+soia/_impl/structs.py,sha256=cddVUo1wzXccl5WtxpMSpjup6Wej6fc3OiKLtXEG_Vg,35877
 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.8.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.1.8.dist-info/METADATA,sha256=gGzPD_379bwWLs0YBwu7ljW-gPzxYkaBAMPZNptH6QE,2121
-soia_client-1.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.1.8.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.1.8.dist-info/RECORD,,
+soia_client-1.1.20.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.1.20.dist-info/METADATA,sha256=rPdH_a2Fn_wCoRk3SxVBs3L4P8AADh6A-74G9kgxMqA,2122
+soia_client-1.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.1.20.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.1.20.dist-info/RECORD,,