soia-client 1.1.9__tar.gz → 1.1.18__tar.gz

{soia_client-1.1.9/soia_client.egg-info → soia_client-1.1.18}/PKG-INFO

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

{soia_client-1.1.9 → soia_client-1.1.18}/pyproject.toml

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

{soia_client-1.1.9 → soia_client-1.1.18}/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_client-1.1.9 → soia_client-1.1.18}/soia/_impl/enums.py

@@ -633,7 +633,7 @@ def _make_decode_fn(
     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]")
@@ -673,7 +673,7 @@ def _make_decode_fn(
         # The field was either removed or is an unrecognized field.
         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]")
@@ -682,7 +682,7 @@ def _make_decode_fn(
         builder.append_ln(f"if number not in {value_field_numbers}:")
         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_client-1.1.9 → soia_client-1.1.18}/soia/_impl/primitives.py

@@ -66,7 +66,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(
@@ -339,7 +339,7 @@ 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):
+    elif isinstance(json, float) or isinstance(json, str):
         return Timestamp(unix_millis=int(json))
     else:
         return Timestamp(unix_millis=json["unix_millis"])
@@ -386,7 +386,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
@@ -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.9 → soia_client-1.1.18}/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_client-1.1.9 → soia_client-1.1.18/soia_client.egg-info}/PKG-INFO

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

{soia_client-1.1.9 → soia_client-1.1.18}/tests/test_serializers.py

@@ -13,6 +13,9 @@ class SerializersTestCase(unittest.TestCase):
         self.assertEqual(primitive_serializer("bool").from_json_code("true"), True)
         self.assertEqual(primitive_serializer("bool").from_json_code("false"), False)
         self.assertEqual(primitive_serializer("bool").from_json_code("0"), False)
+        self.assertEqual(primitive_serializer("bool").from_json_code('"0"'), False)
+        self.assertEqual(primitive_serializer("bool").from_json_code("1"), True)
+        self.assertEqual(primitive_serializer("bool").from_json_code('"1"'), True)
 
         self.assertEqual(primitive_serializer("int32").to_json_code(7), "7")
         self.assertEqual(
@@ -144,6 +147,19 @@ class SerializersTestCase(unittest.TestCase):
             ),
             "[\n  true,\n  false\n]",
         )
+        self.assertEqual(
+            array_serializer(primitive_serializer("bool")).from_json_code(
+                "[ true, false ]"
+            ),
+            (
+                True,
+                False,
+            ),
+        )
+        self.assertEqual(
+            array_serializer(primitive_serializer("bool")).from_json_code("0"),
+            (),
+        )
 
     def test_optional_serializer(self):
         self.assertEqual(

{soia_client-1.1.9 → soia_client-1.1.18}/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),
-        ),
     ],
 )