soia-client 1.1.4__py3-none-any.whl → 1.1.5__py3-none-any.whl

soia/_impl/arrays.py

@@ -3,12 +3,11 @@ from dataclasses import FrozenInstanceError
 from typing import Generic, Optional
 from weakref import WeakValueDictionary
 
+from soia import _spec, reflection
 from soia._impl.function_maker import Any, Expr, ExprLike, Line, make_function
 from soia._impl.keyed_items import Item, Key, KeyedItems
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 
 def get_array_adapter(
     item_adapter: TypeAdapter,
@@ -123,6 +122,9 @@ class _ArrayAdapter(TypeAdapter):
     ) -> None:
         self.item_adapter.register_records(registry)
 
+    def frozen_class_of_struct(self) -> type | None:
+        return None
+
 
 _ItemAndKeyAttributes = tuple[TypeAdapter, tuple[str, ...]]
 _ItemToArrayAdapter = WeakValueDictionary[_ItemAndKeyAttributes, _ArrayAdapter]

soia/_impl/enums.py

@@ -73,6 +73,12 @@ class EnumAdapter(TypeAdapter):
         for value_field in value_fields:
             wrap_fn = _make_wrap_fn(value_field)
             setattr(base_class, f"wrap_{value_field.spec.name}", wrap_fn)
+            # Check if the field type is a struct type.
+            field_type = resolve_type_fn(value_field.spec.type)
+            frozen_class = field_type.frozen_class_of_struct()
+            if frozen_class:
+                create_fn = _make_create_fn(wrap_fn, frozen_class)
+                setattr(base_class, f"create_{value_field.spec.name}", create_fn)
 
         base_class._fj = _make_from_json_fn(
             self.all_constant_fields,
@@ -143,8 +149,10 @@ class EnumAdapter(TypeAdapter):
                     number=field.number,
                     type=None,
                 )
-                for field in self.all_constant_fields if field.number != 0
-            ) + tuple(
+                for field in self.all_constant_fields
+                if field.number != 0
+            )
+            + tuple(
                 reflection.Field(
                     name=field.spec.name,
                     number=field.spec.number,
@@ -157,6 +165,9 @@ class EnumAdapter(TypeAdapter):
         for field in self.value_fields:
             field.field_type.register_records(registry)
 
+    def frozen_class_of_struct(self) -> type | None:
+        return None
+
 
 def _make_base_class(spec: _spec.Enum) -> type:
     record_hash = hash(spec.id)
@@ -174,6 +185,9 @@ def _make_base_class(spec: _spec.Enum) -> type:
         def union(self) -> Any:
             return self
 
+        def __bool__(self) -> bool:
+            return self.kind != "?"
+
         def __setattr__(self, name: str, value: Any):
             raise FrozenInstanceError(self.__class__.__qualname__)
 
@@ -344,6 +358,13 @@ def _make_wrap_fn(field: _ValueField) -> Callable[[Any], Any]:
     )
 
 
+def _make_create_fn(wrap_fn: Callable[[Any], Any], frozen_class: type) -> Callable:
+    def create(**kwargs):
+        return wrap_fn(frozen_class(**kwargs))
+
+    return create
+
+
 def _make_from_json_fn(
     constant_fields: Sequence[_spec.ConstantField],
     value_fields: Sequence[_ValueField],

soia/_impl/optionals.py

@@ -3,11 +3,10 @@ from dataclasses import dataclass
 from typing import TypeVar
 from weakref import WeakValueDictionary
 
+from soia import _spec, reflection
 from soia._impl.function_maker import Expr, ExprLike
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 Other = TypeVar("Other")
 
 
@@ -80,6 +79,9 @@ class _OptionalAdapter(TypeAdapter):
     ) -> None:
         self.other_adapter.register_records(registry)
 
+    def frozen_class_of_struct(self) -> type | None:
+        return None
+
 
 _other_adapter_to_optional_adapter: WeakValueDictionary[TypeAdapter, TypeAdapter] = (
     WeakValueDictionary()

soia/_impl/primitives.py

@@ -3,12 +3,11 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Final, final
 
+from soia import _spec, reflection
 from soia._impl.function_maker import Expr, ExprLike
 from soia._impl.timestamp import Timestamp
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 
 class AbstractPrimitiveAdapter(TypeAdapter):
     @final
@@ -25,6 +24,10 @@ class AbstractPrimitiveAdapter(TypeAdapter):
     ) -> None:
         pass
 
+    @final
+    def frozen_class_of_struct(self) -> type | None:
+        return None
+
 
 class _BoolAdapter(AbstractPrimitiveAdapter):
     def default_expr(self) -> ExprLike:

soia/_impl/repr.py

@@ -10,7 +10,7 @@ class ReprResult:
 
     @property
     def indented(self) -> str:
-        if complex:
+        if self.complex:
             return self.repr.replace("\n", "\n  ")
         else:
             return self.repr

soia/_impl/serializer.py

@@ -5,12 +5,11 @@ from functools import cached_property
 from typing import Any, Generic, TypeVar, cast, final
 from weakref import WeakValueDictionary
 
+from soia import reflection
 from soia._impl.function_maker import Expr, LineSpan, make_function
 from soia._impl.never import Never
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import reflection
-
 T = TypeVar("T")
 
 

soia/_impl/service_client.py

@@ -160,5 +160,4 @@ class _AiohttpClientSession(Protocol):
         *,
         data: str,
         headers: Mapping[str, str],
-    ) -> Any:
-        ...
+    ) -> Any: ...

soia/_impl/structs.py

@@ -3,6 +3,7 @@ from collections.abc import Callable, Sequence
 from dataclasses import FrozenInstanceError, dataclass
 from typing import Any, Final, Union, cast
 
+from soia import _spec, reflection
 from soia._impl.function_maker import (
     BodyBuilder,
     Expr,
@@ -18,8 +19,6 @@ from soia._impl.keep import KEEP
 from soia._impl.repr import repr_impl
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec, reflection
-
 
 class StructAdapter(TypeAdapter):
     __slots__ = (
@@ -236,6 +235,9 @@ class StructAdapter(TypeAdapter):
         for field in self.fields:
             field.type.register_records(registry)
 
+    def frozen_class_of_struct(self) -> type | None:
+        return self.gen_class
+
 
 class _Frozen:
     def __setattr__(self, name: str, value: Any):

soia/_impl/type_adapter.py

@@ -1,9 +1,8 @@
 from collections.abc import Callable
 from typing import Protocol
 
-from soia._impl.function_maker import ExprLike
-
 from soia import _spec, reflection
+from soia._impl.function_maker import ExprLike
 
 
 class TypeAdapter(Protocol):

soia/_module_initializer.py

@@ -1,11 +1,10 @@
 from typing import Any, Union
 
+from soia import _spec
 from soia._impl import arrays, enums, method, optionals, primitives, structs
 from soia._impl.serializer import make_serializer
 from soia._impl.type_adapter import TypeAdapter
 
-from soia import _spec
-
 RecordAdapter = Union[structs.StructAdapter, enums.EnumAdapter]
 
 

{soia_client-1.1.4.dist-info → soia_client-1.1.5.dist-info}/METADATA

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

soia_client-1.1.5.dist-info/RECORD

@@ -0,0 +1,27 @@
+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/_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+soia/_impl/arrays.py,sha256=Dz0_huUdtCtT6TP2R5IY6vNbZ8RJPx3l1Sa3pdbyVAA,5550
+soia/_impl/enums.py,sha256=Z5oGNCVsPIlGP1D0BZTkYWLehDt5HKJ840lsMQSW0xQ,18011
+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=hnr3itvScPEbMq--Z8yC3Qs2OFDy8l5Ljd5BSnsCIn4,2487
+soia/_impl/primitives.py,sha256=rQUit2EVXr36RK5cW7x9TaZTJ9w1oHcXmVr0mTlyBO0,9109
+soia/_impl/repr.py,sha256=Z4sZKFrujdTD49aqB7q3bjXAb1f31I7uuChDBy5XvFg,1418
+soia/_impl/serializer.py,sha256=RBYz-9Kc-sKR0YEhX48w8oA5uK4yJ1DbhqUwOzYrT5E,3528
+soia/_impl/serializers.py,sha256=IL9jHHMo11pgrL1-crarOEElvTyV5YM6FTcgumjW6IU,2564
+soia/_impl/service.py,sha256=ltOCPJupK3mEDiq9wldkDb0rfpVhyqWFxywGJ42Vklg,15573
+soia/_impl/service_client.py,sha256=FWfbFswbhMBw1snR9JLEpSJagY2ntZbFaVxTUGEDA5s,5303
+soia/_impl/structs.py,sha256=ed2B-viBclbc4DbXJ-0mNaS1NyM0vURuGnU-H3LFUik,28313
+soia/_impl/timestamp.py,sha256=upnEkvW-7AaMJ9_nNqntvhJ4pFWWCAXNjEOPtszdwgE,5645
+soia/_impl/type_adapter.py,sha256=5ilurqFQ0fcw7ciYdkLbzH65Qz0SJwHMbqFqywkRUUE,2100
+soia_client-1.1.5.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
+soia_client-1.1.5.dist-info/METADATA,sha256=oTvY4awlTRAC5vSFmLQyVVA8-yz_kpPTTe9K5dV3Utg,2121
+soia_client-1.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soia_client-1.1.5.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
+soia_client-1.1.5.dist-info/RECORD,,

soia_client-1.1.4.dist-info/RECORD

@@ -1,27 +0,0 @@
-soia/__init__.py,sha256=WPhdlu7zKBSWd4DVFWXQKQoptD0gU7xGFm4tbQHrVc8,787
-soia/_module_initializer.py,sha256=1TWnc0qUO7_iljQR2ywVERrrkY5jIkT3zucc-AYZyrQ,4221
-soia/_spec.py,sha256=Y5EHHQa6qNeJc29aaqGrFPnPFXxlL7TED9_AXUGBjf0,3663
-soia/reflection.py,sha256=SEFHNlzmWZEOQwoVUTIxzjjnbkiKSwo2rbpSU-qXhC4,9375
-soia/_impl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-soia/_impl/arrays.py,sha256=C3j3RZdSvqmogbGAi3EprLkUYMFfO-IJhoCOte5blAw,5477
-soia/_impl/enums.py,sha256=bpRtIWBioTGpy-oVA5Fo25RZH1TFBFzrmCXkuhZuC0k,17297
-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=KTgmbfYLJLrju5v10jgnnnW98QG6NYw2We3gdgi9i2E,2414
-soia/_impl/primitives.py,sha256=r-55rO12TwwWCQJgzEEgVpXMVGg0dRhGvFWX_rGeqsQ,9025
-soia/_impl/repr.py,sha256=7WX0bEAVENTjlyZIcbT8TcJylS7IRIyafGCmqaIMxFM,1413
-soia/_impl/serializer.py,sha256=28IwkjtUnLpbnPQfVNfJXkApCK4JhXHwLkC5MVhF8xo,3529
-soia/_impl/serializers.py,sha256=IL9jHHMo11pgrL1-crarOEElvTyV5YM6FTcgumjW6IU,2564
-soia/_impl/service.py,sha256=ltOCPJupK3mEDiq9wldkDb0rfpVhyqWFxywGJ42Vklg,15573
-soia/_impl/service_client.py,sha256=0WgiN6Stg548FAdZQMuezZoooe4MYw2frEQ5KUE7xag,5311
-soia/_impl/structs.py,sha256=1XhjZmqtD7IMURdSVR0DwMdrIhWPZft1eCfwVW84c0E,28230
-soia/_impl/timestamp.py,sha256=upnEkvW-7AaMJ9_nNqntvhJ4pFWWCAXNjEOPtszdwgE,5645
-soia/_impl/type_adapter.py,sha256=RyIyh4Fnt9rMy0HRzC-a2v2JAdZsV9FBzoGEUVygVRE,2101
-soia_client-1.1.4.dist-info/licenses/LICENSE,sha256=SaAftKkX6hfSOiPdENQPS70tifH3PDHgazq8eK2Pwfw,1064
-soia_client-1.1.4.dist-info/METADATA,sha256=PzbbwzwRvEfsFGRW5tmwPlP5N9QroX8tXNVeeEFFUMc,2121
-soia_client-1.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soia_client-1.1.4.dist-info/top_level.txt,sha256=lsYG9JrvauFe1oIV5zvnwsS9hsx3ztwfK_937op9mxc,5
-soia_client-1.1.4.dist-info/RECORD,,