soia-client 1.0.6__tar.gz → 1.0.8__tar.gz

{soia_client-1.0.6 → soia_client-1.0.8}/PKG-INFO

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

{soia_client-1.0.6 → soia_client-1.0.8}/pyproject.toml

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

{soia_client-1.0.6 → soia_client-1.0.8}/soia_client.egg-info/PKG-INFO

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

{soia_client-1.0.6 → soia_client-1.0.8}/soia_client.egg-info/SOURCES.txt

@@ -16,7 +16,6 @@ soialib/spec.py
 soialib/timestamp.py
 soialib/impl/__init__.py
 soialib/impl/arrays.py
-soialib/impl/encoding.py
 soialib/impl/enums.py
 soialib/impl/function_maker.py
 soialib/impl/optionals.py

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/arrays.py

@@ -94,7 +94,7 @@ class _ArrayAdapter(TypeAdapter):
             listuple_class_local,
             "([",
             self.item_adapter.from_json_expr(Expr.join("_e")),
-            " for e in ",
+            " for _e in ",
             json_expr,
             "] or ",
             empty_listuple_local,

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/enums.py

@@ -1,20 +1,10 @@
-# TODO: test
-# TODO: unrecognized fields (and handles removed fields)
-
+import copy
 from collections.abc import Callable, Sequence
 from dataclasses import FrozenInstanceError, dataclass
 from typing import Any, Final, Union
 
 from soialib import spec as _spec
-from soialib.impl import primitives
-from soialib.impl.function_maker import (
-    BodyBuilder,
-    BodySpan,
-    Expr,
-    ExprLike,
-    Line,
-    make_function,
-)
+from soialib.impl.function_maker import BodyBuilder, Expr, ExprLike, Line, make_function
 from soialib.impl.repr import repr_impl
 from soialib.impl.type_adapter import TypeAdapter
 
@@ -40,7 +30,6 @@ class EnumAdapter(TypeAdapter):
 
         private_is_enum_attr = _name_private_is_enum_attr(spec.id)
         self.private_is_enum_attr = private_is_enum_attr
-        # TODO: comment
         setattr(base_class, private_is_enum_attr, True)
 
         # Add the constants.
@@ -81,7 +70,10 @@ class EnumAdapter(TypeAdapter):
             setattr(base_class, f"wrap_{value_field.spec.name}", wrap_fn)
 
         base_class._fj = _make_from_json_fn(
-            self.all_constant_fields, value_fields, base_class
+            self.all_constant_fields,
+            value_fields,
+            set(self.spec.removed_numbers),
+            base_class,
         )
 
         # Mark finalization as done.
@@ -116,7 +108,6 @@ class EnumAdapter(TypeAdapter):
 
     def from_json_expr(self, json_expr: ExprLike) -> Expr:
         fn_name = "_fj"
-        # TODO: comment
         from_json_fn = getattr(self.gen_class, fn_name, None)
         if from_json_fn:
             return Expr.join(Expr.local("_fj?", from_json_fn), "(", json_expr, ")")
@@ -149,7 +140,6 @@ def _make_base_class(spec: _spec.Enum) -> type:
             raise FrozenInstanceError(self.__class__.__qualname__)
 
         def __eq__(self, other: Any) -> bool:
-            # TODO: make it work with unrecognized versus UNKNOWN
             if isinstance(other, BaseClass):
                 return other.kind == self.kind and other.value == self.value
             return NotImplemented
@@ -164,7 +154,7 @@ def _make_base_class(spec: _spec.Enum) -> type:
 
 
 def _make_constant_class(base_class: type, spec: _spec.ConstantField) -> type:
-    class ConstantClass(base_class):
+    class Constant(base_class):
         __slots__ = ()
 
         kind: Final[str] = spec.name
@@ -183,7 +173,37 @@ def _make_constant_class(base_class: type, spec: _spec.ConstantField) -> type:
         def __repr__(self) -> str:
             return f"{base_class.__qualname__}.{spec.attribute}"
 
-    return ConstantClass
+    return Constant
+
+
+def _make_unrecognized_class(base_class: type) -> type:
+    """Wraps around an unrecognized dense JSON.
+
+    Looks and acts just like the UNKNOWN constant, except that its JSON representation
+    is the original unrecognized dense JSON.
+    """
+
+    class Unrecognized(base_class):
+        __slots__ = ("_dj",)
+
+        kind: Final[str] = "?"
+        _number: Final[int] = 0
+        # dense JSON
+        _dj: Any
+        # readable JSON
+        _rj: Final[str] = "?"
+        # has value
+        _hv: Final[bool] = False
+
+        def __init__(self, dj: Any):
+            # Do not call super().__init__().
+            object.__setattr__(self, "_dj", copy.deepcopy(dj))
+            object.__setattr__(self, "value", None)
+
+        def __repr__(self) -> str:
+            return f"{base_class.__qualname__}.UNKNOWN"
+
+    return Unrecognized
 
 
 def _make_value_class(
@@ -193,7 +213,7 @@ def _make_value_class(
 ) -> type:
     number = field_spec.number
 
-    class ValueClass(base_class):
+    class Value(base_class):
         __slots__ = ()
 
         kind: Final[str] = field_spec.name
@@ -213,7 +233,7 @@ def _make_value_class(
                 body = value_repr.repr
             return f"{base_class.__qualname__}.wrap_{field_spec.name}({body})"
 
-    ret = ValueClass
+    ret = Value
 
     ret._dj = property(
         make_function(
@@ -286,9 +306,13 @@ def _make_wrap_fn(field: _ValueField) -> Callable[[Any], Any]:
 def _make_from_json_fn(
     constant_fields: Sequence[_spec.ConstantField],
     value_fields: Sequence[_ValueField],
+    removed_numbers: set[int],
     base_class: type,
 ) -> Callable[[Any], Any]:
+    unrecognized_class = _make_unrecognized_class(base_class)
+    unrecognized_class_local = Expr.local("Unrecognized", unrecognized_class)
     obj_setattr_local = Expr.local("obj_settatr", object.__setattr__)
+    removed_numbers_local = Expr.local("removed_numbers", removed_numbers)
 
     key_to_constant: dict[Union[int, str], Any] = {}
     for field in constant_fields:
@@ -318,12 +342,15 @@ def _make_from_json_fn(
         builder.append_ln("  if json == 0:")
         builder.append_ln("    return ", unknown_constant_local)
     else:
+        # `json.__class__ is int` is significantly faster than `isinstance(json, int)`
         builder.append_ln("  if json.__class__ is int:")
         builder.append_ln("    try:")
         builder.append_ln("      return ", key_to_constant_local, "[json]")
         builder.append_ln("    except:")
-        # TODO: handle unrecognized fields!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        builder.append_ln("      return ...")
+        if removed_numbers:
+            builder.append_ln("      if json in ", removed_numbers_local, ":")
+            builder.append_ln("        return ", unknown_constant_local)
+        builder.append_ln("      return ", unrecognized_class_local, "(json)")
 
     def append_number_branches(numbers: list[int], indent: str) -> None:
         if len(numbers) == 1:
@@ -332,7 +359,9 @@ def _make_from_json_fn(
             value_class_local = Expr.local("cls?", field.value_class)
             value_expr = field.field_type.from_json_expr(Expr.join("json[1]"))
             builder.append_ln(f"{indent}ret = ", value_class_local, "()")
-            builder.append_ln(indent, obj_setattr_local, "(ret, ", value_expr, ")")
+            builder.append_ln(
+                indent, obj_setattr_local, '(ret, "value", ', value_expr, ")"
+            )
             builder.append_ln(f"{indent}return ret")
         else:
             indented = f"  {indent}"
@@ -344,18 +373,24 @@ def _make_from_json_fn(
             builder.append_ln(f"{indent}else:")
             append_number_branches(numbers[mid_index:], indented)
 
+    # `json.__class__ is list` is significantly faster than `isinstance(json, list)`
     builder.append_ln("  elif json.__class__ is list:")
+    builder.append_ln("    number = json[0]")
     if not value_fields:
-        # TODO: handle unrecognized fields!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        builder.append_ln("    return ...")
+        # The field was either removed or is an unrecognized field.
+        if removed_numbers:
+            builder.append_ln("    if number in ", removed_numbers_local, ":")
+            builder.append_ln("      return ", unknown_constant_local)
+        builder.append_ln("    return ", unrecognized_class_local, "(json)")
     else:
         if len(value_fields) == 1:
             builder.append_ln(f"    if number != {value_fields[0].spec.number}:")
         else:
             builder.append_ln("    if number not in ", value_keys_local, ":")
-        # TODO: handle unrecognized fields!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        builder.append_ln("      return ...")
-        builder.append_ln("    number = json[0]")
+        if removed_numbers:
+            builder.append_ln("      if number in ", removed_numbers_local, ":")
+            builder.append_ln("        return ", unknown_constant_local)
+        builder.append_ln("      return ", unrecognized_class_local, "(json)")
         append_number_branches(sorted(numbers), "    ")
 
     # READABLE FORMAT
@@ -367,7 +402,7 @@ def _make_from_json_fn(
         builder.append_ln("    try:")
         builder.append_ln("      return ", key_to_constant_local, "[json]")
         builder.append_ln("    except:")
-        # TODO: comment
+        # In readable mode, drop unrecognized values and use UNKNOWN instead.
         builder.append_ln("      return ", unknown_constant_local)
 
     def append_name_branches(names: list[str], indent: str) -> None:
@@ -377,30 +412,38 @@ def _make_from_json_fn(
             value_class_local = Expr.local("cls?", field.value_class)
             value_expr = field.field_type.from_json_expr("json['value']")
             builder.append_ln(f"{indent}ret = ", value_class_local, "()")
-            builder.append_ln(indent, obj_setattr_local, "(ret, ", value_expr, ")")
+            builder.append_ln(
+                indent, obj_setattr_local, '(ret, "value", ', value_expr, ")"
+            )
             builder.append_ln(f"{indent}return ret")
         else:
             indented = f"  {indent}"
             mid_index = int(len(names) / 2)
             mid_name = names[mid_index - 1]
             operator = "==" if mid_index == 1 else "<="
-            builder.append_ln(f"{indent}if name {operator} '{mid_name}':")
+            builder.append_ln(f"{indent}if kind {operator} '{mid_name}':")
             append_name_branches(names[0:mid_index], indented)
             builder.append_ln(f"{indent}else:")
             append_name_branches(names[mid_index:], indented)
 
     builder.append_ln("  elif isinstance(json, dict):")
     if not value_fields:
-        # TODO: comment
         builder.append_ln("    return ", unknown_constant_local)
     else:
-        builder.append_ln("    name = json['name']")
-        builder.append_ln("    if name not in ", value_keys_local, ":")
-        # TODO: comment
+        builder.append_ln("    kind = json['kind']")
+        builder.append_ln("    if kind not in ", value_keys_local, ":")
         builder.append_ln("      return ", unknown_constant_local)
         builder.append_ln("    else:")
         append_name_branches(sorted(names), "      ")
 
+    # In the unlikely event that json.loads() returns an instance of a subclass of int.
+    builder.append_ln("  elif isinstance(json, int):")
+    builder.append_ln("    json = int(json)")
+    builder.append_ln("  elif isinstance(json, list):")
+    builder.append_ln("    json = list(json)")
+    builder.append_ln("  else:")
+    builder.append_ln("    return TypeError()")
+
     return make_function(
         name="from_json",
         params=["json"],

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/function_maker.py

@@ -1,6 +1,6 @@
 import itertools
 from dataclasses import dataclass
-from typing import Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Union
+from typing import Any, Callable, Iterable, Optional, Sequence, Union
 
 
 def make_function(
@@ -120,15 +120,11 @@ class LineSpan:
 _EMPTY_LINE_SPAN = LineSpan(())
 
 
-# TODO: comment
 LineSpanLike = Union[str, LineSpan]
 
 
 # A type alias to use when the line span is a Python expression.
 Expr = LineSpan
-
-
-# TODO: comment
 ExprLike = LineSpanLike
 
 

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/optionals.py

@@ -4,7 +4,6 @@ from typing import TypeVar
 from weakref import WeakValueDictionary
 
 from soialib import spec
-from soialib.impl.encoding import NULL_WIRE
 from soialib.impl.function_maker import Expr, ExprLike
 from soialib.impl.type_adapter import TypeAdapter
 

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/primitives.py

@@ -33,9 +33,9 @@ class _BoolAdapter(AbstractPrimitiveAdapter):
         readable: bool,
     ) -> ExprLike:
         if readable:
-            return Expr.join("(1 if ", in_expr, " else 0)")
+            return Expr.join("(True if ", in_expr, " else False)")
         else:
-            return in_expr
+            return Expr.join("(1 if ", in_expr, " else 0)")
 
     def from_json_expr(self, json_expr: ExprLike) -> Expr:
         return Expr.join("(True if ", json_expr, " else False)")
@@ -52,6 +52,8 @@ class _AbstractIntAdapter(AbstractPrimitiveAdapter):
         return "0"
 
     def to_frozen_expr(self, arg_expr: ExprLike) -> Expr:
+        round_expr = Expr.local("round", round)
+        # Must accept float inputs and turn them into ints.
         return Expr.join("(", arg_expr, " | 0)")
 
     def is_not_default_expr(self, arg_expr: ExprLike, attr_expr: ExprLike) -> ExprLike:
@@ -61,7 +63,18 @@ class _AbstractIntAdapter(AbstractPrimitiveAdapter):
         return in_expr
 
     def from_json_expr(self, json_expr: ExprLike) -> Expr:
-        return Expr.join("(", json_expr, " | 0)")
+        # Must accept float inputs and turn them into ints.
+        return Expr.join(
+            "(",
+            json_expr,
+            " if ",
+            json_expr,
+            ".__class__ is (0).__class__ else ",
+            Expr.local("_round", round),
+            "(",
+            json_expr,
+            "))",
+        )
 
 
 @dataclass(frozen=True)
@@ -203,7 +216,7 @@ class _BytesAdapter(AbstractPrimitiveAdapter):
 
     def from_json_expr(self, json_expr: ExprLike) -> Expr:
         return Expr.join(
-            Expr.local("fromhex", _BytesAdapter._fromhex_fn), "(", json_expr, ")"
+            Expr.local("fromhex", _BytesAdapter._fromhex_fn), "(", json_expr, ' or "")'
         )
 
 

{soia_client-1.0.6 → soia_client-1.0.8}/soialib/impl/repr.py

@@ -31,7 +31,6 @@ def repr_impl(input: Any) -> ReprResult:
             return ReprResult(f"[\n{body}]", complex=True)
     elif isinstance(input, str):
         if "\n" in input:
-            # TODO: comment
             lines = input.split("\n")
             body = "".join(f"  {repr(line)},\n" for line in lines)
             return ReprResult(f"'\\n'.join([\n{body}])", complex=True)