soia-client 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

{soia_client-1.0.4.dist-info → soia_client-1.0.5.dist-info}/METADATA

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

{soia_client-1.0.4.dist-info → soia_client-1.0.5.dist-info}/RECORD

@@ -1,22 +1,24 @@
-soialib/__init__.py,sha256=5sEAu3ATaiMVbXE_8yb6Ikd5-ilj21tQ8zoQ2Uh2pBM,178
+soialib/__init__.py,sha256=h_ENkLJEdrh1mGhCoKgIadDasSulW3zK9_qhEsTviXY,429
 soialib/keyed_items.py,sha256=q7MCn82obf-0jh7FcAhuw4eh9-wtuHIpkEFcSfc8EaY,338
-soialib/module_initializer.py,sha256=d2Y-u1Jddva9-v25Yc4xlX7ifaMXoO4WurF1r6QxBaU,3289
+soialib/method.py,sha256=2qWG4jMqYhS3hA8y8YDu3iqzhXA_AKebpB38RWNmsYQ,452
+soialib/module_initializer.py,sha256=dDdYtlWlN7kEWlxuI0lguPsI-7zXAShswjw9j-_-AWY,4229
 soialib/never.py,sha256=bYU63XyNX4e2wOUXQHhHWGO-an4IFr9_ur1ut6GmGN0,47
-soialib/serializer.py,sha256=quFXOYjj7sjfjQIVZPa0NPvKtO4LmYrRtNeFlZy_Aio,2599
-soialib/spec.py,sha256=eUw9iISeQd-utq2Rl_FTnXKXpawg7piWkFL92FfQCik,3440
+soialib/serializer.py,sha256=2R1BYEvpG3eDYMFXSKljPTMweOiuu8OMq7Xf1Bv2Wsk,3008
+soialib/serializers.py,sha256=7zmCdtaUkuy1vIGP1OBn06x8FryYep15bujrFoeGw9A,2572
+soialib/spec.py,sha256=w-eMMUqOchOlCJaXppyAa2JpSBrMo9lrMvqz8VaEX4I,3699
 soialib/timestamp.py,sha256=6VNKAJs7EwxBm3tEEk1Cy1FhAD6lSNdlB3K2Sg6QHIA,4065
 soialib/impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-soialib/impl/arrays.py,sha256=YFDT5WG4Lpmbt0d5-9_dML8kIL9AS3LfJvlA0tr5J4A,4970
+soialib/impl/arrays.py,sha256=NOKIfD3tvYnWycVk00aaf4m5Nx4_G5sVxdh2cwu4-l0,4902
 soialib/impl/encoding.py,sha256=8k2j0nhGloFIBUEZLiiHANwhopusaQcDRePPS4sUhPc,1413
 soialib/impl/enums.py,sha256=o3KylHoh66jcb1TUHeOorjaxHPoqHkbk7PXR5hKldrI,14121
 soialib/impl/function_maker.py,sha256=PYqHqnZf8nELfEnRcoyyUbPAHyr99ROHhmHGj9ldB6U,5684
-soialib/impl/optionals.py,sha256=8ImqyGbQPsOQd0155Irytzzza-t4b2qH4Swk78HZD8Q,2114
+soialib/impl/optionals.py,sha256=QUcxx0i7oAQl7IcnxKyNW11xi7fbs2hmuSP1pfrTSTY,2120
 soialib/impl/primitives.py,sha256=X_ywRmVZI_Q5tatb1Qil6Xvdyh1J4ElfI-LOCn671Zk,5975
 soialib/impl/repr.py,sha256=z-_jGNKuY__DfwQKW40xzZFf_eG6wGMJvuY_2hJrETA,1441
 soialib/impl/structs.py,sha256=pXPn6SeyZH-FwQXbvUG_uoc5DZ8oZgDQ5v_jx8Uf5aY,23576
 soialib/impl/type_adapter.py,sha256=IP3jF3wPgwKhWd7LKMmbbv1qUTv1HBAyMdpVrIg0_S0,2063
-soia_client-1.0.4.dist-info/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.0.4.dist-info/METADATA,sha256=DN8YpGeiXalIL0SpGElb6ByIoWQZC6gbbUFoNU1X3oc,1645
-soia_client-1.0.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-soia_client-1.0.4.dist-info/top_level.txt,sha256=2vPmAo5G0SrCxYrNdJKJJVdpalYppgjO2mmz2PtsFUI,8
-soia_client-1.0.4.dist-info/RECORD,,
+soia_client-1.0.5.dist-info/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.0.5.dist-info/METADATA,sha256=JWD4wSPRLd1uz_nCM37-Y2DAKnf_5gO-QcHye3hYmMw,1645
+soia_client-1.0.5.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+soia_client-1.0.5.dist-info/top_level.txt,sha256=2vPmAo5G0SrCxYrNdJKJJVdpalYppgjO2mmz2PtsFUI,8
+soia_client-1.0.5.dist-info/RECORD,,

soialib/__init__.py

@@ -1,5 +1,19 @@
 from soialib.keyed_items import KeyedItems
+from soialib.method import Method
 from soialib.serializer import Serializer
+from soialib.serializers import (
+    array_serializer,
+    optional_serializer,
+    primitive_serializer,
+)
 from soialib.timestamp import Timestamp
 
-__all__ = ["KeyedItems", "Serializer", "Timestamp"]
+__all__ = [
+    "KeyedItems",
+    "Method",
+    "Serializer",
+    "Timestamp",
+    "array_serializer",
+    "optional_serializer",
+    "primitive_serializer",
+]

soialib/impl/arrays.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable
 from dataclasses import FrozenInstanceError
 from typing import Generic, Optional
-from weakref import WeakKeyDictionary
+from weakref import WeakValueDictionary
 
 from soialib import spec
 from soialib.impl.function_maker import Any, Expr, ExprLike, Line, make_function
@@ -19,8 +19,9 @@ def get_array_adapter(
     else:
         listuple_class = _new_listuple_class()
     array_adapter = _ArrayAdapter(item_adapter, listuple_class)
-    key_spec_to_array_adapter = _item_to_array_adapters.setdefault(item_adapter, {})
-    return key_spec_to_array_adapter.setdefault(key_attributes, array_adapter)
+    return _item_to_array_adapter.setdefault(
+        (item_adapter, key_attributes), array_adapter
+    )
 
 
 class _ArrayAdapter(TypeAdapter):
@@ -107,10 +108,10 @@ class _ArrayAdapter(TypeAdapter):
         self.item_adapter.finalize(resolve_type_fn)
 
 
-_KeyAttributesToArrayAdapter = dict[tuple[str, ...], _ArrayAdapter]
-_ItemToArrayAdapters = WeakKeyDictionary[TypeAdapter, _KeyAttributesToArrayAdapter]
+_ItemAndKeyAttributes = tuple[TypeAdapter, tuple[str, ...]]
+_ItemToArrayAdapter = WeakValueDictionary[_ItemAndKeyAttributes, _ArrayAdapter]
 
-_item_to_array_adapters: _ItemToArrayAdapters = WeakKeyDictionary()
+_item_to_array_adapter: _ItemToArrayAdapter = WeakValueDictionary()
 
 
 def _new_listuple_class() -> type:

soialib/impl/optionals.py

@@ -1,7 +1,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import TypeVar
-from weakref import WeakKeyDictionary
+from weakref import WeakValueDictionary
 
 from soialib import spec
 from soialib.impl.encoding import NULL_WIRE
@@ -69,6 +69,6 @@ class _OptionalAdapter(TypeAdapter):
         self.other_adapter.finalize(resolve_type_fn)
 
 
-_other_adapter_to_optional_adapter: WeakKeyDictionary[TypeAdapter, TypeAdapter] = (
-    WeakKeyDictionary()
+_other_adapter_to_optional_adapter: WeakValueDictionary[TypeAdapter, TypeAdapter] = (
+    WeakValueDictionary()
 )

soialib/method.py

@@ -0,0 +1,17 @@
+from dataclasses import dataclass
+from typing import Generic, TypeVar
+
+from soialib.serializer import Serializer
+
+Request = TypeVar("Request")
+Response = TypeVar("Response")
+
+
+@dataclass(frozen=True)
+class Method(Generic[Request, Response]):
+    """Identifies a procedure (the "P" in "RPC") on both client side and server side."""
+
+    name: str
+    number: int
+    request_serializer: Serializer[Request]
+    response_serializer: Serializer[Response]

soialib/module_initializer.py

@@ -1,6 +1,6 @@
 from typing import Any, Union
 
-from soialib import spec
+from soialib import method, spec
 from soialib.impl import arrays, enums, optionals, primitives, structs
 from soialib.impl.type_adapter import TypeAdapter
 from soialib.serializer import make_serializer
@@ -11,8 +11,10 @@ RecordAdapter = Union[structs.StructAdapter, enums.EnumAdapter]
 _record_id_to_adapter: dict[str, RecordAdapter] = {}
 
 
-def init_module_classes(
+def init_module(
     records: tuple[spec.Record, ...],
+    methods: tuple[spec.Method, ...],
+    constants: tuple[spec.Constant, ...],
     globals: dict[str, Any],
     # For testing
     record_id_to_adapter: dict[str, RecordAdapter] = _record_id_to_adapter,
@@ -77,3 +79,22 @@ def init_module_classes(
             gen_class._parent_class = None
         # TODO: comment
         gen_class.SERIALIZER = make_serializer(adapter)
+
+    # Now that al the classes have been initialized, create the methods.
+    for method_spec in methods:
+        var_name = method_spec._var_name or method_spec.name
+        request_serializer = make_serializer(resolve_type(method_spec.request_type))
+        response_serializer = make_serializer(resolve_type(method_spec.response_type))
+        globals[var_name] = method.Method(
+            name=method_spec.name,
+            number=method_spec.number,
+            request_serializer=request_serializer,
+            response_serializer=response_serializer,
+        )
+        del var_name, request_serializer, response_serializer
+
+    # Create the constants.
+    for constant in constants:
+        serializer = make_serializer(resolve_type(constant.type))
+        globals[constant.name] = serializer.from_json_code(constant.json_code)
+        del serializer

soialib/serializer.py

@@ -2,6 +2,7 @@ import json as jsonlib
 from collections.abc import Callable
 from dataclasses import FrozenInstanceError
 from typing import Any, Generic, TypeVar, cast, final
+from weakref import WeakValueDictionary
 
 from soialib.impl.function_maker import Expr, LineSpan, make_function
 from soialib.impl.type_adapter import TypeAdapter
@@ -13,17 +14,21 @@ T = TypeVar("T")
 @final
 class Serializer(Generic[T]):
     __slots__ = (
+        "__weakref__",
+        "_adapter",
         "_to_dense_json_fn",
         "_to_readable_json_fn",
         "_from_json_fn",
     )
 
+    _adapter: TypeAdapter
     _to_dense_json_fn: Callable[[T], Any]
     _to_readable_json_fn: Callable[[T], Any]
     _from_json_fn: Callable[[Any], T]
 
     def __init__(self, adapter: Never):
         # Use Never (^) as a trick to make the constructor internal.
+        object.__setattr__(self, "_adapter", adapter)
         object.__setattr__(
             self, "_to_dense_json_fn", _make_to_json_fn(adapter, readable=False)
         )
@@ -56,8 +61,16 @@ class Serializer(Generic[T]):
         raise FrozenInstanceError(self.__class__.__qualname__)
 
 
+# A cache to make sure we only create one Serializer for each TypeAdapter.
+_type_adapter_to_serializer: WeakValueDictionary[TypeAdapter, Serializer] = (
+    WeakValueDictionary()
+)
+
+
 def make_serializer(adapter: TypeAdapter) -> Serializer:
-    return Serializer(cast(Never, adapter))
+    return _type_adapter_to_serializer.setdefault(
+        adapter, Serializer(cast(Never, adapter))
+    )
 
 
 def _make_to_json_fn(adapter: TypeAdapter, readable: bool) -> Callable[[Any], Any]:

soialib/serializers.py

@@ -0,0 +1,74 @@
+from typing import Final, Literal, Optional, TypeVar, overload
+
+from soialib.impl import primitives
+from soialib.impl.arrays import get_array_adapter
+from soialib.impl.optionals import get_optional_adapter
+from soialib.serializer import Serializer, make_serializer
+from soialib.timestamp import Timestamp
+
+Item = TypeVar("Item")
+Other = TypeVar("Other")
+
+
+def array_serializer(item_serializer: Serializer[Item]) -> Serializer[tuple[Item, ...]]:
+    return make_serializer(get_array_adapter(item_serializer._adapter, ()))
+
+
+def optional_serializer(
+    other_serializer: Serializer[Other],
+) -> Serializer[Other | None]:
+    return make_serializer(get_optional_adapter(other_serializer._adapter))
+
+
+@overload
+def primitive_serializer(primitive: Literal["bool"]) -> Serializer[bool]: ...
+@overload
+def primitive_serializer(primitive: Literal["int32"]) -> Serializer[int]: ...
+@overload
+def primitive_serializer(primitive: Literal["int64"]) -> Serializer[int]: ...
+@overload
+def primitive_serializer(primitive: Literal["uint64"]) -> Serializer[int]: ...
+@overload
+def primitive_serializer(primitive: Literal["float32"]) -> Serializer[float]: ...
+@overload
+def primitive_serializer(primitive: Literal["float64"]) -> Serializer[float]: ...
+@overload
+def primitive_serializer(primitive: Literal["timestamp"]) -> Serializer[Timestamp]: ...
+@overload
+def primitive_serializer(primitive: Literal["string"]) -> Serializer[str]: ...
+@overload
+def primitive_serializer(primitive: Literal["bytes"]) -> Serializer[bytes]: ...
+def primitive_serializer(
+    primitive: (
+        Literal["bool"]
+        | Literal["int32"]
+        | Literal["int64"]
+        | Literal["uint64"]
+        | Literal["float32"]
+        | Literal["float64"]
+        | Literal["timestamp"]
+        | Literal["string"]
+        | Literal["bytes"]
+    ),
+) -> (
+    Serializer[bool]
+    | Serializer[int]
+    | Serializer[float]
+    | Serializer[Timestamp]
+    | Serializer[str]
+    | Serializer[bytes]
+):
+    return _PRIMITIVE_TO_SERIALIZER[primitive]
+
+
+_PRIMITIVE_TO_SERIALIZER: Final = {
+    "bool": make_serializer(primitives.BOOL_ADAPTER),
+    "int32": make_serializer(primitives.INT32_ADAPTER),
+    "int64": make_serializer(primitives.INT64_ADAPTER),
+    "uint64": make_serializer(primitives.UINT64_ADAPTER),
+    "float32": make_serializer(primitives.FLOAT32_ADAPTER),
+    "float64": make_serializer(primitives.FLOAT64_ADAPTER),
+    "timestamp": make_serializer(primitives.TIMESTAMP_ADAPTER),
+    "string": make_serializer(primitives.STRING_ADAPTER),
+    "bytes": make_serializer(primitives.BYTES_ADAPTER),
+}

soialib/spec.py

@@ -141,3 +141,19 @@ class RecordId:
             qualname=parent_qualname,
             name_parts=parent_name_parts,
         )
+
+
+@dataclass(frozen=True)
+class Method:
+    name: str
+    number: int
+    request_type: Type
+    response_type: Type
+    _var_name: str = ""  # If different from 'name'
+
+
+@dataclass(frozen=True)
+class Constant:
+    name: str
+    type: Type
+    json_code: str