soia-client 1.1.16__tar.gz → 1.1.20__tar.gz

{soia_client-1.1.16/soia_client.egg-info → soia_client-1.1.20}/PKG-INFO

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

{soia_client-1.1.16 → soia_client-1.1.20}/pyproject.toml

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

{soia_client-1.1.16 → soia_client-1.1.20}/soia/_impl/enums.py

@@ -630,7 +630,6 @@ 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 stream.keep_unrecognized_fields:"
@@ -671,6 +670,7 @@ 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 stream.keep_unrecognized_fields:"
@@ -680,6 +680,7 @@ def _make_decode_fn(
         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 stream.keep_unrecognized_fields:"

{soia_client-1.1.16 → soia_client-1.1.20}/soia/_impl/primitives.py

@@ -1,4 +1,5 @@
 import base64
+import math
 import struct
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -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

{soia_client-1.1.16 → soia_client-1.1.20}/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")
@@ -953,7 +952,7 @@ def _make_decode_fn(
             "    ", 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_client-1.1.16 → soia_client-1.1.20/soia_client.egg-info}/PKG-INFO

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

{soia_client-1.1.16 → soia_client-1.1.20}/tests/test_serializers.py

@@ -87,24 +87,24 @@ class SerializersTestCase(unittest.TestCase):
 
         self.assertEqual(primitive_serializer("float32").to_json_code(3.14), "3.14")
         self.assertEqual(
-            primitive_serializer("float32").to_json_code(float("inf")), "Infinity"
+            primitive_serializer("float32").to_json_code(float("inf")), '"Infinity"'
         )
         self.assertEqual(
-            primitive_serializer("float32").to_json_code(-float("inf")), "-Infinity"
+            primitive_serializer("float32").to_json_code(-float("inf")), '"-Infinity"'
         )
         self.assertEqual(
-            primitive_serializer("float32").to_json_code(float("nan")), "NaN"
+            primitive_serializer("float32").to_json_code(float("nan")), '"NaN"'
         )
         self.assertEqual(primitive_serializer("float32").from_json_code("3.14"), 3.14)
         self.assertEqual(
-            primitive_serializer("float32").from_json_code("Infinity"), float("inf")
+            primitive_serializer("float32").from_json_code('"Infinity"'), float("inf")
         )
         self.assertEqual(
-            primitive_serializer("float32").from_json_code("-Infinity"), -float("inf")
+            primitive_serializer("float32").from_json_code('"-Infinity"'), -float("inf")
         )
         self.assertNotEqual(
-            primitive_serializer("float32").from_json_code("NaN"),
-            primitive_serializer("float32").from_json_code("NaN"),
+            primitive_serializer("float32").from_json_code('"NaN"'),
+            primitive_serializer("float32").from_json_code('"NaN"'),
         )
 
         self.assertEqual(primitive_serializer("float64").to_json_code(3.14), "3.14")