tmsgpack 0.3.24__tar.gz → 0.3.26__tar.gz

{tmsgpack-0.3.24/tmsgpack.egg-info → tmsgpack-0.3.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tmsgpack
-Version: 0.3.24
+Version: 0.3.26
 Summary: Typed MessagePack serializer (inspired by but different from msgpack)
 Author-email: Yaakov Belch <yaakov.belch@gmail.com>
 License: ISC

{tmsgpack-0.3.24 → tmsgpack-0.3.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tmsgpack"
-version = "0.3.24"
+version = "0.3.26"
 description = "Typed MessagePack serializer (inspired by but different from msgpack)"
 requires-python = ">=3.14"
 license = {text = "ISC"}

tmsgpack-0.3.26/tests/test_codec.py

@@ -0,0 +1,135 @@
+"""Integration tests for TmsgpackCodec with DI and the dispatch system."""
+
+import textwrap
+import pytest
+from pathlib import Path
+
+from tmsgpack.codec import NoDependencyInjector, TmsgpackCodec
+from semifun.dispatch.Inject import Inject, injected_type
+from semifun.dispatch.SemifunApp import SemifunApp
+from semifun.dispatch.load_lookup_tables import LoadedFn
+
+
+# --- Inline test types (no file scanning needed) ---
+
+import enum
+from dataclasses import dataclass
+
+#::testing_tmsgpack_codec:FailureSeverity
+class FailureSeverity(enum.IntEnum):
+    OK = 0
+    PROBLEM = 1
+    NOT_AUTHORIZED = 2
+    NOT_AUTHENTICATED = 3
+    UNEXPECTED = 4
+
+@dataclass(frozen=True)
+class Dbh:
+    pass
+
+#::testing_tmsgpack_codec:Foo
+@dataclass(frozen=True)
+class Foo:
+    x: str
+    y: int
+
+#::testing_tmsgpack_codec:Bar
+@dataclass(frozen=True)
+class Bar:
+    dbh: Inject[Dbh]
+    x: str
+
+
+# --- DI adapter for tests ---
+
+@dataclass(frozen=True)
+class _TestDiAdapter:
+    """Test DI adapter satisfying DependencyInjectorProtocol."""
+    lookup_table: dict   # {type_name: class}
+    seed_data: dict
+
+    @staticmethod
+    def injected_type(annotation):
+        return injected_type(annotation)
+
+    def lookup_type(self, type_name):
+        if type_name in self.lookup_table:
+            return self.lookup_table[type_name]
+        raise LookupError(f"No codec for {type_name}")
+
+    def with_seed_data(self, seed_data):
+        return _TestDiAdapter(lookup_table=self.lookup_table, seed_data={**self.seed_data, **seed_data})
+
+    def sync_call_with_args(self, *, fn, args, kwargs):
+        app = SemifunApp(entry_points_group={})
+        with app.open_sync_di_ctx(parent_ctx=None, seed_data=self.seed_data, ftype='test') as ctx:
+            return ctx.fn_call(fn=fn, args=args, kwargs=kwargs)
+
+
+LOOKUP_TABLE = {
+    'FailureSeverity': FailureSeverity,
+    'Foo': Foo,
+    'Bar': Bar,
+}
+
+
+@pytest.fixture
+def codec():
+    di = _TestDiAdapter(lookup_table=LOOKUP_TABLE, seed_data={Dbh: Dbh()})
+    return TmsgpackCodec(sort_keys=False, di=di)
+
+
+@pytest.fixture
+def codec_no_di():
+    return TmsgpackCodec(sort_keys=False, di=NoDependencyInjector())
+
+
+# --- Round-trip: plain dataclass ---
+
+def test_round_trip_dataclass(codec):
+    foo = Foo(x='hello', y=123)
+    assert codec.decode(codec.encode(foo)) == foo
+
+
+# --- Round-trip: enum ---
+
+def test_round_trip_enum(codec):
+    for severity in FailureSeverity:
+        assert codec.decode(codec.encode(severity)) == severity
+
+
+# --- Round-trip: dataclass with Inject[T] fields ---
+
+def test_round_trip_dataclass_with_inject(codec):
+    bar = Bar(dbh=Dbh(), x='world')
+    data = codec.encode(bar)
+    decoded = codec.decode(data)
+    assert decoded.x == 'world'
+    assert isinstance(decoded.dbh, Dbh)
+
+
+# --- NoDependencyInjector: plain types work without DI ---
+
+def test_no_di_raises_on_lookup(codec_no_di):
+    foo = Foo(x='abc', y=42)
+    with pytest.raises(TypeError, match='Type lookup'):
+        codec_no_di.encode(foo)
+
+
+# --- with_seed_data ---
+
+def test_with_seed_data_round_trip(codec):
+    other_dbh = Dbh()
+    codec2 = codec.with_seed_data({Dbh: other_dbh})
+    bar = Bar(dbh=Dbh(), x='test')
+    decoded = codec2.decode(codec2.encode(bar))
+    assert decoded.x == 'test'
+    assert decoded.dbh is other_dbh
+
+
+# --- with_seed_data produces independent caches ---
+
+def test_with_seed_data_has_independent_caches(codec):
+    codec2 = codec.with_seed_data({Dbh: Dbh()})
+    assert codec2.encoder_cache is not codec.encoder_cache
+    assert codec2.decoder_cache is not codec.decoder_cache

tmsgpack-0.3.26/tests/test_codec_custom.py

@@ -0,0 +1,212 @@
+"""Tests for TmsgpackCustom: custom encode/decode for non-dataclass types."""
+
+import struct
+import pytest
+from dataclasses import dataclass
+
+from tmsgpack.codec import NoDependencyInjector, TmsgpackCodec
+from tmsgpack.codec_custom import TmsgpackCustom
+from semifun.dispatch.Inject import Inject, injected_type
+from semifun.dispatch.SemifunApp import SemifunApp
+from semifun.dispatch.load_lookup_tables import LoadedFn
+
+
+# --- Inline test types ---
+
+class Pair:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+    def __eq__(self, other):
+        return type(other) is Pair and self.x == other.x and self.y == other.y
+
+class Point:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+    def __eq__(self, other):
+        return type(other) is Point and self.x == other.x and self.y == other.y
+
+class FloatPair:
+    def __init__(self, x, y):
+        self.x = x
+        self.y = y
+    def __eq__(self, other):
+        return (type(other) is FloatPair
+                and self.x == other.x and self.y == other.y)
+
+
+# --- Custom codecs ---
+
+class CodecPairDict(TmsgpackCustom):
+    def encode_dict(obj):
+        return {'x': obj.x, 'y': obj.y}
+    def decode_dict(*, x, y):
+        return Pair(x=x, y=y)
+
+class CodecPointList(TmsgpackCustom):
+    def encode_list(obj):
+        return [obj.x, obj.y]
+    def decode_list(x, y):
+        return Point(x, y)
+
+class CodecFloatPairBytes(TmsgpackCustom):
+    def encode_bytes(obj):
+        return struct.pack('<ff', obj.x, obj.y)
+    def decode_bytes(data):
+        x, y = struct.unpack('<ff', data)
+        return FloatPair(x, y)
+
+
+# --- DI adapter for tests ---
+
+@dataclass(frozen=True)
+class _TestDiAdapter:
+    lookup_table: dict
+    seed_data: dict
+
+    @staticmethod
+    def injected_type(annotation):
+        return injected_type(annotation)
+
+    def lookup_type(self, type_name):
+        if type_name in self.lookup_table:
+            return self.lookup_table[type_name]
+        raise LookupError(f"No codec for {type_name}")
+
+    def with_seed_data(self, seed_data):
+        return _TestDiAdapter(lookup_table=self.lookup_table, seed_data={**self.seed_data, **seed_data})
+
+    def sync_call_with_args(self, *, fn, args, kwargs):
+        app = SemifunApp(entry_points_group={})
+        with app.open_sync_di_ctx(parent_ctx=None, seed_data=self.seed_data, ftype='test') as ctx:
+            return ctx.fn_call(fn=fn, args=args, kwargs=kwargs)
+
+
+LOOKUP_TABLE = {
+    'Pair': CodecPairDict,
+    'Point': CodecPointList,
+    'FloatPair': CodecFloatPairBytes,
+}
+
+
+@pytest.fixture
+def codec():
+    di = _TestDiAdapter(lookup_table=LOOKUP_TABLE, seed_data={})
+    return TmsgpackCodec(sort_keys=False, di=di)
+
+
+# --- Dict mode round-trip ---
+
+def test_dict_mode_round_trip(codec):
+    pair = Pair(x='hello', y=42)
+    data = codec.encode(pair)
+    restored = codec.decode(data)
+    assert restored == pair
+
+
+# --- List mode round-trip ---
+
+def test_list_mode_round_trip(codec):
+    point = Point(x=10, y=20)
+    data = codec.encode(point)
+    restored = codec.decode(data)
+    assert restored == point
+
+
+# --- Bytes mode round-trip ---
+
+def test_bytes_mode_round_trip(codec):
+    fp = FloatPair(x=1.5, y=2.5)
+    data = codec.encode(fp)
+    restored = codec.decode(data)
+    assert restored == fp
+
+
+# --- Content hashing works with custom types ---
+
+def test_content_hash_dict_mode(codec):
+    di = _TestDiAdapter(lookup_table=LOOKUP_TABLE, seed_data={})
+    codec_sorted = TmsgpackCodec(sort_keys=True, di=di)
+    pair = Pair(x='a', y=1)
+    h = codec_sorted.hash_to_str(pair)
+    assert isinstance(h, str)
+    assert len(h) == 22
+    # Same value, same hash
+    assert codec_sorted.hash_to_str(Pair(x='a', y=1)) == h
+
+
+# --- Nested values in custom types ---
+
+def test_dict_mode_nested_values(codec):
+    pair = Pair(x=[1, 2, 3], y={'a': True})
+    data = codec.encode(pair)
+    restored = codec.decode(data)
+    assert restored == pair
+
+
+# --- Validation: mismatched modes ---
+
+def test_mismatched_modes_raises():
+    with pytest.raises(TypeError, match="mode mismatch"):
+        class Bad(TmsgpackCustom):
+            def encode_dict(obj): return {}
+            def decode_list(x): return None
+
+
+def test_no_encode_raises():
+    with pytest.raises(TypeError, match="encode_dict, encode_list, encode_bytes"):
+        class Bad(TmsgpackCustom):
+            def decode_dict(*, x): return None
+
+
+def test_no_decode_raises():
+    with pytest.raises(TypeError, match="decode_dict, decode_list, decode_bytes"):
+        class Bad(TmsgpackCustom):
+            def encode_dict(obj): return {}
+
+
+# --- DI on encode and decode ---
+
+class Cache:
+    def __init__(self):
+        self.store = {}
+    def get(self, key):
+        return self.store[key]
+    def put(self, key, value):
+        self.store[key] = value
+
+class Widget:
+    def __init__(self, name, data):
+        self.name = name
+        self.data = data
+    def __eq__(self, other):
+        return (type(other) is Widget
+                and self.name == other.name
+                and self.data == other.data)
+
+class CodecWidget(TmsgpackCustom):
+    def encode_dict(obj, cache: Inject[Cache]):
+        cache.put(obj.name, obj.data)
+        return {'name': obj.name}
+    def decode_dict(*, name, cache: Inject[Cache]):
+        data = cache.get(name)
+        return Widget(name=name, data=data)
+
+
+def test_di_on_encode_and_decode():
+    cache = Cache()
+    di = _TestDiAdapter(
+        lookup_table={'Widget': CodecWidget},
+        seed_data={Cache: cache},
+    )
+    codec = TmsgpackCodec(sort_keys=False, di=di)
+
+    widget = Widget(name='gizmo', data=[1, 2, 3])
+    data = codec.encode(widget)
+
+    # The cache was populated during encode
+    assert cache.store == {'gizmo': [1, 2, 3]}
+
+    restored = codec.decode(data)
+    assert restored == widget

{tmsgpack-0.3.24 → tmsgpack-0.3.26}/tmsgpack/codec.py

@@ -1,7 +1,6 @@
 from base64 import urlsafe_b64encode
 from dataclasses import dataclass, field, fields, is_dataclass, replace
 from typing import Any, Protocol
-from semifun.caching.cached_property import cached_property
 
 import enum
 from .api import EncodeDecode
@@ -11,6 +10,7 @@ from .codec_custom import TmsgpackCustom, make_codec_handler_custom
 class DependencyInjectorProtocol(Protocol):
     @staticmethod
     def injected_type(annotation: Any) -> type | None: ...
+    def lookup_type(self, type_name: str) -> Any: ...
     def with_seed_data(self, seed_data: dict) -> "DependencyInjectorProtocol": ...
     def sync_call_with_args(self, *, fn: Any, args: tuple, kwargs: dict[str, Any]) -> Any: ...
 
@@ -20,6 +20,8 @@ class NoDependencyInjector:
     @staticmethod
     def injected_type(annotation):
         return None
+    def lookup_type(self, type_name):
+        raise TypeError("Type lookup is not supported without a DependencyInjector")
     def with_seed_data(self, seed_data):
         raise TypeError("Dependency injection is not supported without a DependencyInjector")
     def sync_call_with_args(self, *, fn, args, kwargs):
@@ -34,7 +36,6 @@ class TmsgpackCodec(EncodeDecode):
     # `replace()` re-runs default_factory, giving each derived codec fresh caches.
     encoder_cache: dict = field(default_factory=dict, init=False, repr=False)
     decoder_cache: dict = field(default_factory=dict, init=False, repr=False)
-    plugin_feature_type: str
 
     def with_seed_data(self, seed_data):
         return replace(self, di=self.di.with_seed_data(seed_data))
@@ -73,16 +74,11 @@ class TmsgpackCodec(EncodeDecode):
         codec_handler = self.decoder_cache[type_name]
         return codec_handler.decode_dctx(dctx=dctx)
 
-    @cached_property
-    def feature_map(self):
-        from semifun.plugins.registry import get_cached_feature_map
-        return get_cached_feature_map(feature_type=self.plugin_feature_type)
-
     def type_to_type_name(self, _type):
         return _type.__name__
 
     def type_name_to_codec_spec(self, type_name):
-        return self.feature_map(feature=type_name)
+        return self.di.lookup_type(type_name)
 
     def codec_spec_to_codec_handler(self, codec_spec, type_name):
         if isinstance(codec_spec, enum.EnumType):

{tmsgpack-0.3.24 → tmsgpack-0.3.26}/tmsgpack/core.c

@@ -3515,7 +3515,7 @@ static __pyx_mstatetype * const __pyx_mstate_global = &__pyx_mstate_global_stati
 #endif
 /* #### Code section: constant_name_defines ### */
 #define __pyx_kp_u_tree_fragment __pyx_string_tab[0]
-#define __pyx_kp_u_0_3_24 __pyx_string_tab[1]
+#define __pyx_kp_u_0_3_26 __pyx_string_tab[1]
 #define __pyx_kp_u_B __pyx_string_tab[2]
 #define __pyx_kp_u_H __pyx_string_tab[3]
 #define __pyx_kp_u_I __pyx_string_tab[4]
@@ -27280,11 +27280,11 @@ __Pyx_RefNannySetupContext("PyInit_core", 0);
   /* "tmsgpack/core.pyx":4
  * # DON'T EDIT THIS FILE.  EDIT THE SOURCES, INSTEAD: tmsgpack/src-parts/[inserted by cython to avoid comment start]*
  * 
- * __version__ = "0.3.24"             # <<<<<<<<<<<<<<
+ * __version__ = "0.3.26"             # <<<<<<<<<<<<<<
  * 
  * from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
 */
-  if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_version, __pyx_mstate_global->__pyx_kp_u_0_3_24) < (0)) __PYX_ERR(0, 4, __pyx_L1_error)
+  if (PyDict_SetItem(__pyx_mstate_global->__pyx_d, __pyx_mstate_global->__pyx_n_u_version, __pyx_mstate_global->__pyx_kp_u_0_3_26) < (0)) __PYX_ERR(0, 4, __pyx_L1_error)
 
   /* "tmsgpack/core.pyx":13
  * ctypedef double float64_t
@@ -28889,7 +28889,7 @@ static int __Pyx_InitConstants(__pyx_mstatetype *__pyx_mstate) {
       #define CYTHON_COMPRESS_STRINGS 90
     #endif
     #if (CYTHON_COMPRESS_STRINGS) == 3 && __PYX_LIMITED_VERSION_HEX >= 0x030e0000 /* compression: zstd (1723 bytes) */
-static const char cstring[] = "(\265/\375`.\021\2155\000zH\374\016E\360\222\250\r\314\300\354\004[\0237;6]\326\235B\243\301t\246H\232\270y*\232\265\315-\211D\226\337\306F\222b\247\375J\005\004`\200\023\240)\212\002\257%\235\254\022\376D\013\330\253\0024O\020\340\232\255\033\014\315\000\307\000\347\000\236\210e\312\343\223\246p\216\252\237\232\277\255\231\246\311\310b\243\346\225n\256U\230\310\242\242\222\202\222!z\251\312\373\331F\327\354\354Xx\034s\262\204\243\350\245Z<)U\232UK_\276\255U\236\304w\034\253\307<\226]\264\0375\367\032\263\375\342\346\022=\330\273\357c\245\317\321L\212\233\215\3301\226\334$e\034\361O\267\3417jUF\320\n\010\245EK\213X\257\377\244\367q\3748\177y\235D9\327\"\246\261\332\230\377F\304\2271\037]\276\324\342\347\256\322\030S\312\266z|\273\"\262x\346$*V\351\234\265\244\310\311\222s\234K\010/DC1!-D\n\215B.\241\023!\021!P\212G\203\047\203\205\257~*\311\273E\367\373\025\002\377\216U\316\311\354\221\344\243\2343M\332\325\334}\377\\\306~O\031\233\246\307L\277\262\363\333\245\334O\262:\275_=\263\227\313\232\225\357\225\312\023~/\325\274M\233e\266V\231e\233\273x\225\257\310~R\022\252\257E\226]{o\213\212\227M\276\360\356{\361jW\334\367Y={\216?w\\\227_\365#n\n\313\332\002J\311\240\224\317W\272\362\322r\233v\377\035g\331\364\\\337\266,\302I8\226\"T_\347\361k\047\006\323\224]\t\237\356\343\237T{L\271x\355\306qr\306\314M\362#\013\366\377HY\366\264\322\311I\212\242\367Q\252\255Y\213Y\3463k~\263,>\227e\264U\303t\226\252\273;G\222\230j\001 \036/\221\007r@\025,|\001Q\033\264ahtpt\324h\225X#\026\t\353#\342\022\361xy\034\300\225\3753\236V\240\021l\222\335\242c\254P\235\220\333\003\266\2479\372\200\307k\244I4\326\340\243\303\342\020\232\000?\240\205\215m\020\253\020\001\000<vhr|^0/\256*SB\203\253\303J\361xu6\007\215#\007g\363\022\205\237p\005\2240\342\032\331\274\\\214\\&\031\017-\020V\206\350\3626\004Q\030\003\024\201\035vg\207X\201lfX\250P\206\236\221\276\260\372\330\27449\260\343\254u9{\360\207\177\346+\037\343\317M\331\265\370\035o\234cPg\273Z\342\376)\207O\376\364U\256\271\373\311\336-""\313\266L\322\246iJ\222Oy\237\233\327\265k\261\307\322Y?,\275\322\317\366\332\231aJ\361u\024\366\330\210\007z\303\2130%D\020\232\260p\003\350\373A+\304\3065j\261\260>\224aI\204\215\353\003\2645;\005f2g\\^3\035\223\027\246\343\206F\307\327\222\255\031,\026\027\035A\206\226\200\240\300\002\360e\227\364\004\r\263* \332#\373\206\tM\"#eLZ\232\326\207\020\006X\342ho\206B\247e\207`\240\006\204\302\376\360J6\201\024q\024\242\014l\0053\030x\2625=\322%\030\244\361\t\003\204_\210\205\047 \3146\021m\007\237\335@\024\346\316f\260Q\tF,\021k\204\245a} (\206Fa\373E\213t\226aJn\017a\202P\003\303\003%\230\332.\266H\344\023\372Nid\274\226\010\047T\361(hLc\032\021} \344%\002G\300\r\373Kt\313\314\351\223\340\004\020\003\t\210\300\r\350m\316V\321R\243X\205x\2744,/D\001K\354\016\372W\240U\201x\250\241!rhDfDR\220\024\2440\034\341\014a\026:u\345\001B\221d\010q\2341D\031C \221#\222\nR\217Bs\264\026,\3104\356\356@\303&\010\030\267m\335\246I\326N\263\213\224\364\312 \243\345\301U:p\372y\023\033\216\241*9\262Q\200\034}\252\367;z8\254\203O\034#\217L\265B\314\034G+$\330\322}\235\327\001U\334L\254\244I\360\316\333\210\321iX\227\375\006\002\202\372h\016\000\204\234\246l@\332\374\014R\276r\304a\020\321r\302\004\366\023\"\207\300)\246\341`2\211|\354\373\335+t\311\010\205\307\352\310c\377p\235\201B\031\312\204\020\030\370\030L\357\025f\375\026\032\343{\264\321\200\367\237\227\333\t\344\324K\335h\347\366\322L\343\256K&\325b+n\367\211\245\211e\245;\335\0060H\203\326\341\215EK\232^\034,\347\013M\020\3664@\017;\310\365\023_`\234\3121TJQ\00759\212)dF\017\303bi\240\001\207\247$.l\240\317\021\304`AY\032\324\225\026j\260\345\336[\374\304\251U}\322\365~\250\n\200\222\245(E\224R\363\224\024\014U\306\005\253\030F\315E\270\325\324\227\032\005\360p-\334\033\212\177|\047\271X\304?\234(\323Jf\276\244\027>\2726\204\275\244\214rJa\250\\4\225\020}\360\313\326<F\207\314$\340f\250\335D\323\326\230$H<\262\341\356)\324\344-\243\324\250\313\227=\313~\0344\252\r4T\317\253\246\260\0000\307n\366\206\314\332\263>p\241\036pH""\002\346Ih\237\376o\026e\242%\030\345j\013\252\367L\371B\320\206A\304\267\226\323\330.\267%\213\273_\323\201\357\270\nG\213\370\235\036,i\304\202\331cD\r\223\271\251\036\017\326j\326\010N,*v\372\367\271\257F\345\366\260&|b\";\323o\214\336bs\322\214\277 *en\222\314\253w\263\263)\372(\224\031\305\016\230\006\2049\2361\367\332\r\245%X\370;\027O%D8p\215>A\2370\223\264\201\016@\352\274\272.2\226\316\257\037\000Su%\260\007#\306\354Q\245\250mY\002\320-RZ\210\235\261\226\352\216\"[\t\010\331\035\220\177\310\317\n\270\304}\\\251\330!Gk\212\017&U\324\322\00645\035\366\261jM\200\257\320\216UF\202\2479\2510\235\275\232\020\264\351\003hR/\276`\217T\013\tK\243\247Qy_^\336[\271\265\276<\342X\250\266\257\013\200\r\270\251YR2\251\356\344\"\237\330\317\204\352jg!W\243\341\275\017\344G\351I\225a?\335N\257\217z\247\261J\013\350\031_\"\203\3173 \047\324\023h\241\314\263\005\345\242\223]\350:\003\355\005]+#\344\247P\221T\001";
+static const char cstring[] = "(\265/\375`.\021\2155\000zH\374\016E\000\221\250\r\374?\337\273\377=\337\253\357=\225\240_\372U\307\327Tr\023\212\260\277\271%\221\310\362\\\335HRl\010\016/\000J;\2504\303\214\376\261\022\372!xpf\234\223\025f\034Ch\036S\001\250\305\321F\315\000\307\000\347\000\237\210\245\352\343\223\252p\2162?5\177[3M\223\221\305F\315+\335\\\2530\221%%\005\345$CtS\225\367\263\215\256\331\331\255\3708\346$\tO\321K\265hb\2524\253\226\276|[\2534\211\3578V\217y,\273h?j\3565f\373\305\315%~\260w\337\307J\237\243\271\0247\033\261c,\271Y\3128\342\237^\303o\324\252\214\241\225\320\t\213\026\026\261^\377I\357\343\370q\376\362z\211r\256ELc\2651\377\211\210/c>\272|\251\305\317]\2451\306\224m\365\370VEd\361\314\311T\254\3229kK\221\223&\3478\027\020\236\210\212bD\232\250$\"\211\\D&D!D*(\037\r\237\014\026\276:\312$\357\026\335\357W\010\377\216e\234\223\331+\311O9w\232\264\253\271\373\376\271\214\375\2422>M\217\231~e\347\267S\271\243duz\277zf/\2275+\337+\225(\374n\252y\2336\313l\2552\3136o\3612\256\"\373IG\310|,\262\354\332{[R\274l\322\205w\337\213W\253\342\276\317\352\331s\374\271\343\272\3742/\342\252\260\254-!\224\034B\001}\245+/-\267i\367\337q\226\315\317\365m\313!|\204c\031B\346\353>~\355\304p\232\2623a\324}\374\223j\217)\027\257\3358N\316\230\371I~d\301\376_)\313\236V:9IS\364\376I\2655k1\313|f\315o\226\305\347\262\214\266j\230NSuw\347J\022S-\037\035\257\221\007v\300\024,|\001S;\264_lh:44Z&\026\2115\302\002\205\270B:^\336\006pe\177\215\247\025h\004{d\267h\030\253\224\047\344\366\200\355\351\216>\320\361\"\351\021\2155\360\360\2606\204%@\020hac\373\303\nD\000\200\216\034\033\034\240\027\314\213\253\316\220\320\340\362\260P:^\236\275A\337\300\321\341\274F!(\\\001%\210\270D8\257\026$\327i\246C\353\203\225!\272\274\ra\024\302\000G \207\355\331 V\037\234\032V*\224\341\207\244/\254<8\257\r\016\3548k]\316\037\374\341\237\371\312\307\370\363Sv-~\307\033\3478\324\331\256\232\270\177\312a\224?}\031\327\334\035e\357\226e[.i\3634e\311\247\274\317\315\353\332\265\370c\351\254\037\226^\351g{\355\3140\245""\370z\n{\230\210\007Z\305E\210\022\"\010OX\250\002\372~\320\002\301q\221Z,\254\017eH\022\201\343\362\010\355\315F\201\225\314\032\227W\215\247\344\205\321\330\330\320|-\331\222\301bq\321\021bh\t\010\n,\000_\266IO\3200\253\002\243-\262m\224\320#3r\246\244\265iy\010_\200\246\216\366j(xZ6\010\006n>(l\017\217d\023@\021Ia\312\300VP\203\201&[\323$M\202\301\031\2400@\370\205Xh\002\302\354\222\321v\000\332\rFa\366l\006;\225\200\304\032\261DX\033\326\007\206`\350\024\266_\364Hg\031\252\344\356\020&\0107/<P\202\252\335b\217B@\241o\325f\306k\205t\302\024\217\202\3064\266\t\321\007@^#P\004T\331O\242[jP\237\004\047\200\030H`\004r@owv\212\226\372\304\n\244\343\265ay\341\tHbs\320\277\n\255\002\201x\250\241!rhDfDR\220\024\2440\034\341\014a\026:u\345\001B\221d\010q\2341D\031C \221#\222\nR\217Bs\264\026,\3104\356\356@\303&\010\030\267m\335\246I\326N\263\213\224\364\312 \243\345\301U:p\372y\023\033\216\241*9\262Q\200\034}\252\367;z8\254\203O\034#\217L\265B\314\034G+$\330\322}\235\327\001U\334L\254\244I\360\316\333\210\321iX\227\375\006\002\202\372h\016\000\204\234\246l@\332\374\014R\276r\304a\020\321r\302\004\366\023\"\207\300)\246\341`2\211|\354\373\335+t\311\010\205\307\352\310c\377p\235\201B\031\312\204\020\030\370\030L\357\025f\375\026\032\343{\264\321\200\367\237\227\333\t\344\324K\335h\347\366\322L\343\256K&\325b+n\367\211\245\211e\245;\335\0060H\203\326\341\215EK\232^\034,\347\013M\020\3664@\017;\310\365\023_`\234\3121TJQ\00759\212)dF\017\303bi\240\001\207\247$.l\240\317\021\304`AY\032\324\225\026j\260\345\336[\374\304\251U}\322\365~\250\n\200\222\245(E\224R\363\224\024\014U\306\005\253\030F\315E\270\325\324\227\032\005\360p-\334\033\212\177|\047\271X\304?\234(\323Jf\276\244\027>\2726\204\275\244\214rJa\250\\4\225\020}\360\313\326<F\207\314$\340f\250\335D\323\326\230$H<\262\341\356)\324\344-\243\324\250\313\227=\313~\0344\252\r4T\317\253\246\260\0000\307n\366\206\314\332\263>p\241\036pH\002\346Ih\237\376o\026e\242%\030\345j\013\252\367L\371B\320\206A\304\267\226\323\330.\267%""\213\273_\323\201\357\270\nG\213\370\235\036,i\304\202\331cD\r\223\271\251\036\017\326j\326\010N,*v\372\367\271\257F\345\366\260&|b\";\323o\214\336bs\322\214\277 *en\222\314\253w\263\263)\372(\224\031\305\016\230\006\2049\2361\367\332\r\245%X\370;\027O%D8p\215>A\2370\223\264\201\016@\352\274\272.2\226\316\257\037\000Su%\260\007#\306\354Q\245\250mY\002\320-RZ\210\235\261\226\352\216\"[\t\010\331\035\220\177\310\317\n\270\304}\\\251\330!Gk\212\017&U\324\322\00645\035\366\261jM\200\257\320\216UF\202\2479\2510\235\275\232\020\264\351\003hR/\276`\217T\013\tK\243\247Qy_^\336[\271\265\276<\342X\250\266\257\013\200\r\270\251YR2\251\356\344\"\237\330\317\204\352jg!W\243\341\275\017\344G\351I\225a?\335N\257\217z\247\261J\013\350\031_\"\203\3173 \047\324\023h\241\314\263\005\345\242\223]\350:\003\355\005]+#\344\247P\221T\001";
     PyObject *data = __Pyx_DecompressString(cstring, 1723, 3);
     #define __Pyx_DecompressString_LZSS_UNUSED
     if (unlikely(!data)) __PYX_ERR(0, 1, __pyx_L1_error)
@@ -28897,9 +28897,9 @@ static const char cstring[] = "(\265/\375`.\021\2155\000zH\374\016E\360\222\250\
     #if !CYTHON_ASSUME_SAFE_MACROS
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
-    #elif (CYTHON_COMPRESS_STRINGS) == 1 /* compression: zlib (1738 bytes) */
-static const char cstring[] = "x\332\245W\315s\323F\024\257\247i\223\222\264\301$\224\351\007t\003e(\323\211K\202\003i\352\2261\020h:-%\020\240\037\007\315ZZ;j\224\225\255\335ub\246\007\216>\352\270G\035u\364\321\307\0349\346\350c\376\204\376\t}\273\262\024\331\226Z:\315\214\254\335\337{zo\367\367\336\276}\371\202{\204\240\272\207\033\373\204\362\3537J7K\253\345\312\335\312\367\225\255\312v\245V\261*\273\025\273\322\272\263\3458\244\201\035Ts]\207`\212\332\330\021d\003=r9\"\324\025\215]d\323\246\340\310\302\034\003H\020\337\305\034\335\353\360]\227\"\233!\2138v\215x\230\023\247\203\030\367l\223\023O)Q\364x\363\361ry\275\2140\265\220G\376 &g\210\211\232\351`\306\010Cn\035\325\204\355p\233\"\336i\022VB[u\324q\005\242\204X\210\273\250\tz\351\017\370.\241\210\021\256\006\350\032\246\324\345\230\333.5\340s\2336\256!\313\366\300\211\335&\352\353\007\330a\244\364s\323t-\202\\\330\001\370\3630m\020tcyumm\003=\243\026\251\333\024|\271Zi\003a\3132\300(\261L~\210\004S\2538\260MR\322\363\003\314\020\0105^\262l\206k\016!c\212dB\221P\245\3270m\026\215,\352\002eu,\034\216\014\303#\2260\211a K\3505S\227.\003\205m\033\002b\030\246Mmn\250\025\241Z\207\023\266\2018\336#\206\036#\023C\340,Tw=\344\330\214k\211\005\344\247\005ZSK\224J\266\004B6ak\2375\232\330\334\373\312t=Rjv\016\357bF\356\023\305\321]Q\257\023o|^Jvb\352\2740\214\014\r\010\034x\344\377\240\343Y\321\336\262\004u\307\305|=KbS\276\222\203\257\346\340\345\034<\323>\020\224\005\213<\277\"\317\261\310\363,b\327\233t\224\343\364<\233\3431\215L\216Gt0;\345xDp\340\345\013N\311\037\227\304$d\340\2539x9\007\317\264?$\177\034\026y~E\236c\221\347Y\223\237\216H4\276\307\017\223\301$\365i\321\004\347\247\302\323\343:\206\251\203:\006\251\2037\006\301\346\307\020.\232\316\310\016\2421\310\223\301\344b\323\242\211\305\236\n\241\310Gk\035\205\324RG\021FZ\202P\223\214\241\334\033\005\364E\362\310\245d\007\212\373S\\\037I\373\361\371\344\25234&\026?\241\223\024\212,\211\312\231\034|5\007/\347\340\231\366E\236\003\221\347A\344\271\020\261\217t\254\307\347\331\234\375[E""\230\320I\316w\226$\336R\326\371\316\301\3139x\246}\221\347@\344y\020y.4g;?EW\327\246\347\271\236a<\356\034\302s\037R\330xD\016\371\023R7\214a\337\000\267\256\241\223[\277]S\275\352\202\352w#&\r\376\366\261M\365\233p\254\033\021=q-\341Db\3175\240\277\362l\242\005\024\357k\230\222\003\365jz\244\211=\215\3005j\230\273\304\334cb?\232y\204A\027\020\215\207\356\324P\365B\321H\320\246m\356\201\237\361K#C\234fcL<\236`\031\342\311\257\333\\u+j\341-\201\235x[q\2772\221y\t@\016\325\004\262.\241\202\245\310\234\310F\303P}\210z\267\211\307l\r\351\240\330\314\200\356\003\3326h\3204%\361\305\205Y\207\232\266[J\244L\301\256g\021\317t\2242\204\213{\330$5H\003\265+\323\252\211\272z\014]BuY\2624\035F\335s\367#\253i@Ub\002\372\3521\222JF4E\361\330\202l\202_\233\223}\346\330\234;\360nP\225yM\267\231T\322\270~\246\253\346\260V&v\343\246\047)]\303J5,L\303:4,;Q;\022\327\232\270\264\304\225$.\034\2148u`z\330f2\327\323\217\261G:\014\330\367\242\020\200\035\001\ry\207\235^R\311\325\224\\H\3615tz\371\304\275\241\342\237\010\275c\321\204\377\r\010t\273Ix\365\306\364\017\213\333\212\244\312\014\213\312\260\206\014K\306\260BD\027~\\\026\342*\020\037\372\370\214\277*\014\246\316t\277\364\267\325\240\024\342\260\335\203\341\311\324l\367\216\\\222_\007\325\340EXU\300g\262u\214n\364f\373\337\034\355\035o?\031L-\034/\\\t\326\303\225\260:\230\232~\365\247\177[.\rfV{K\3077\037\034\321\343\235g\003\260\261\362\252\360\327\314[\357\314u\277\223Ey=X\t\036\206\267{K\032<\363\211\322/\372\213\376\366`\346\254?\355\267\344\273\322\t\227\224\261v\367\205\277)\027%H\316\371\240u\301o\235\300\017\227\353\301\355H\2435\230\231?\236_\351-\366\266{\215\376\357\257\247_\203\306\010R\030\363\362\\\226e;\330\t\213o\356m-\230\016Zo\352\255:\230\231\355\226\273\334\377Z>\010\226\303V\2570\230\231\353\376\340c_}\r\370\232\234\226\255`*\250\276\211\352{A1\370<\300\261j\007V\273\257\251\216\025O`\027\372\263M\377<\314\271\274\025,\004\325\301\334Y\177\036\274\024R\203\242_\364\257F\226[\377\301\336z\260\026N\303\332\346""\373\255\243B\362q\244} \211\nD\270\242\240y\275\221\252|\"\017\002\034\264\322\320s\260Q\010?\014\023\360\033\211\265\326A\210#H\370U\177G\026\243I\333\177\241?*\007\235^\241\267\320\253B*\202\340C\360\330\226z\370\261\212f\332\220\0105\235\237\310\225L\374SY\315\304/\312g\301\265\260\030\246\254u\302\267\025!\221\364\267\200\251\355\245\3309\357o\373\226\274\026\024\223\365\234h\262.\310\017\300l;\324\313C\020\336\037a\351:\307\336\223\347\301lk\002?#\257\252\300L\340\263\220o\205\2408\201\317\311MH\206%\205_U\371{r\232+*\224-H\346\003\331\010\236\207\337\366\013\375\213G\370\010V\273\350?\214\030y)\027\200RX\353\373\335g\376\347~C\356\004\037\351\235\275\177\356\177M\257\370\277\274\371\364\262\2775\234n\364~\355\343~\347u!\013~\371\2728\270\2704\n\234\304l\253PlA\014 oNR\0215U\020\025t\021L\025\225\322\217\262 \213QX\313p\312\317\250ct<u\031\302}\036\252\033\357m\364\267\217\247\356\364\201\275K\220\305\267T=\270$\367\302s\341j\3704\242|\266{\313\277\244B\224b:;\374\367T\376\016\346 +\341\370\025\223\301\337\020\225\0349";
-    PyObject *data = __Pyx_DecompressString(cstring, 1738, 1);
+    #elif (CYTHON_COMPRESS_STRINGS) == 1 /* compression: zlib (1739 bytes) */
+static const char cstring[] = "x\332\245W\315s\323F\024\257\247i\223\222\264\301$\224\351\007t\003e(\323\211K\202\003i\352\2261\020h:-%\020\240\037\007\315ZZ;j\224\225\255\335ub\246\007\216>\352\270G\035u\364\321\307\0349\346\350c\376\204\376\t}\273\262\024\331\226Z:\315\214\254\335\337{zo\367\367\336\276}\371\202{\204\240\272\207\033\373\204\362\3537J7K\253\267*w+\337W\266*\333\225Z\305\252\354V\354J\353\316\226\343\220\006vP\315u\035\202)jcG\220\r\364\310\345\210PW4v\221M\233\202#\013s\014 A|\027st\257\303w]\212l\206,\342\3305\342aN\234\016b\334\263MN<\245D\321\343\315\307\313\345\3652\302\324B\036\371\203\230\234!&j\246\203\031#\014\271uT\023\266\303m\212x\247IX\tm\325Q\307\025\210\022b!\356\242&\350\245?\340\273\204\"F\270\032\240k\230R\227cn\273\324\200\317m\332\270\206,\333\003\047v\233\250\257\037`\207\221\322\317M\323\265\010ra\007\340\317\303\264A\320\215\345\325\265\265\r\364\214Z\244nS\360\345j\245\r\204-\313\000\243\3042\371!\022L\255\342\3006II\317\0170C \324x\311\262\031\2569\204\214)\222\tEB\225^\303\264Y4\262\250\013\224\325\261p82\014\217X\302$\206\201,\241\327L]\272\014\024\266m\010\210a\2306\265\271\241V\204j\035N\330\006\342x\217\030z\214L\014\201\263P\335\365\220c3\256%\026\220\237\026hM-Q*\331\022\010\331\204\255}\326hbs\357+\323\365H\251\3319\274\213\031\271O\024GwE\275N\274\361y)\331\211\251\363\302024 p\340\221\377\203\216gE{\313\022\324\035\027\363\365,\211M\371J\016\276\232\203\227s\360L\373@P\026,\362\374\212<\307\"\317\263\210]o\322Q\216\323\363l\216\307429\036\321\301\354\224\343\021\301\201\227/8%\177\\\022\223\220\201\257\346\340\345\034<\323\376\220\374qX\344\371\025y\216E\236gM~:\"\321\370\036?L\006\223\324\247E\023\234\237\nO\217\353\030\246\016\352\030\244\016\336\030\004\233\037C\270h:#;\210\306 O\006\223\213M\213&\026{*\204\"\037\255u\024RK\035E\030i\tBM2\206ro\024\320\027\311#\227\222\035(\356Oq}$\355\307\347\223\253\316\320\230X\374\204NR(\262$*gr\360\325\034\274\234\203g\332\027y\016D\236\007\221\347B\304>\322\261\036\237gs\366o\025aB\0479\337Y\222xKY\347;""\007/\347\340\231\366E\236\003\221\347A\344\271\320\234\355\374\024]]\233\236\347z\206\361\270s\010\317}Ha\343\0219\344OH\3350\206}\003\334\272\206Nn\375vM\365\252\013\252\337\215\2304\370\333\3076\325o\302\261nD\364\304\265\204\023\211=\327\200\376\312\263\211\026P\274\257aJ\016\324\253\351\221&\3664\002\327\250a\356\022s\217\211\375h\346\021\006]@4\036\272SC\325\013E#A\233\266\271\007~\306/\215\014q\232\2151\361x\202e\210\047\277ns\325\255\250\205\267\004v\342m\305\375\312D\346%\0009T\023\310\272\204\n\226\"s\"\033\rC\365!\352\335&\036\2635\244\203b3\003\272\017h\333\240A\323\224\304\027\027f\035j\332n)\2212\005\273\236E<\323Q\312\020.\356a\223\324 \r\324\256L\253&\352\3521t\t\325e\311\322t\030u\317\335\217\254\246\001U\211\t\350\253\307H*\031\321\024\305c\013\262\t~mN\366\231cs\356\300\273AU\3465\335fRI\343\372\231\256\232\303Z\231\330\215\233\236\244t\r+\325\2600\r\353\320\260\354D\355H\\k\342\322\022W\222\270p0\342\324\201\351a\233\311\\O?\306\036\3510`\337\213B\000v\0044\344\035vzI%WSr!\305\327\320\351\345\023\367\206\212\177\"\364\216E\023\3767 \320\355&\341\325\033\323?,n+\222*3,*\303\0322,\031\303\n\021]\370qY\210\253@|\350\3433\376\2520\230:\323\375\322\337V\203R\210\303v\017\206\047S\263\335;rI~\035T\203\027aU\001\237\311\3261\272\321\233\355\177s\264w\274\375d0\265p\274p%X\017W\302\352`j\372\325\237\376m\2714\230Y\355-\035\337|pD\217w\236\r\300\306\312\253\302_3o\2753\327\375N\026\345\365`%x\030\336\356-i\360\314\047J\277\350/\372\333\203\231\263\376\264\337\222\357J\047\\R\306\332\335\027\376\246\\\224 9\347\203\326\005\277u\002?\\\256\007\267#\215\326`f\376x~\245\267\330\333\3565\372\277\277\236~\r\032#Ha\314\313sY\226\355`\047,\276\271\267\265`:h\275\251\267\352`f\266[\356r\377k\371 X\016[\275\302`f\256\373\203\217}\3655\340krZ\266\202\251\240\372&\252\357\005\305\340\363\000\307\252\035X\355\276\246:V<\201]\350\3176\375\3630\347\362V\260\020T\007sg\375y\360RH\r\212~\321\277\032Yn\375\007{\353\301Z8\rk\233\357\267\216\n\311\307\221\366\201$*\020\341""\212\202\346\365F\252\362\211<\010p\320JC\317\301F!\3740L\300o$\326Z\007!\216 \341W\375\035Y\214&m\377\205\376\250\034tz\205\336B\257\n\251\010\202\017\301c[\352\341\307*\232iC\"\324t~\"W2\361Oe5\023\277(\237\005\327\302b\230\262\326\t\337V\204D\322\337\002\246\266\227b\347\274\277\355[\362ZPL\326s\242\311\272 ?\000\263\355P/\017Ax\177\204\245\353\034{O\236\007\263\255\t\374\214\274\252\0023\201\317B\276\025\202\342\004>\0477!\031\226\024~U\345\357\311i\256\250P\266 \231\017d#x\036~\333/\364/\036\341#X\355\242\3770b\344\245\\\000Ja\255\357w\237\371\237\373\r\271\023|\244w\366\376\271\3775\275\342\377\362\346\323\313\376\326p\272\321\373\265\217\373\235\327\205,\370\345\353\342\340\342\322(p\022\263\255B\261\0051\200\2749IE\324TAT\320E0UTJ?\312\202,Fa-\303)?\243\216\321\361\324e\010\367y\250n\274\267\321\337>\236\272\323\007\366.A\026\337R\365\340\222\334\013\317\205\253\341\323\210\362\331\356-\377\222\nQ\212\351\354\360\337S\371;\230\203\254\204\343WL\006\177\0034\311\034;";
+    PyObject *data = __Pyx_DecompressString(cstring, 1739, 1);
     #define __Pyx_DecompressString_LZSS_UNUSED
     if (unlikely(!data)) __PYX_ERR(0, 1, __pyx_L1_error)
     const char* const bytes = __Pyx_PyBytes_AsString(data);
@@ -28907,7 +28907,7 @@ static const char cstring[] = "x\332\245W\315s\323F\024\257\247i\223\222\264\301
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
     #elif (CYTHON_COMPRESS_STRINGS) > 0 && (CYTHON_COMPRESS_STRINGS) <= 90 /* compression: lzss (2299 bytes) */
-static const char cstring[] = "\377(tree fr\377agment)0\377.3.24<B<\377H<I<Q<b<\377d<h<i<q?\377Illegal \377boolean \377value: N\377ot enoug\377h input \357data\022\000e t\377hat Cyth\377on is de\377liberate\377ly stric\367ter!\001n PE\377P-484 an\377d reject\377s subcla\377sses of \377builtin \377types. I\377f you ne\177ed to p%\000\376%\tthen se\375t\200\000e \047ann\377otation_\376<\000ing\047 di\355rb\000iv\242\000o F\377alse.Opc\237ode o\277\000m\000r\377ange 0-2\37755: Unde\327fini\000o \002: \357add_R\000edc\337tx us\202\001wi\367ce.\013\002was \374o\000\023\002.disab\307lee\032\014\013\002\034\nen\336$\001gcis\004\003dn\375o\260 fault \377__reduce\337__ du\257\002no\333n-\300 vi\216@__\277cinit_\216\001 \377bytes: t\357ake_\007\002 ca\376\266@d for l\027ist\025\002d\372 \r\t1\002\340/\002\037\001\004\023\260@;\016msg\377pack/cor\377e.pyxBas\367eDe\305!Buff\253er\000\r.\301\006c\223b_i_\017\020\266@s\255@e_\013\026\343rd\326\003N\016\026\000flo\367at8\006\021int1\312\001\0242\031\02441\024K\022st\245r}\021u`\025\025\0012\032\0254\0143\025\326\002En\326+\004\t\3163\023\014\314\31729\nas\332\047R\nwr\002\000\026_\363\047#\r\365%\005\020\370\"\035\020\210\370\"5\020\361\016.\220\000\366$\232\ru `\025\364&\036\021e\022\304A8\321\204\t\343\204\003\007Ctx\000\006\315\204\017\017\t\307\204\016.\007\300\245\206\007\005\014\245\206\001\030\014\301\206\001+\014st}r=\014tuple\232i\200\254c\252\000\000\006\372\205\017\017\t\364\205\016.\007p\303ut\325\207\003\005\013\320\207\001\027\013se\277quence\007\014t\371r>\013\304\213\002NoneT?ypeSaf\265\207\n\000\r\000\260\207\017\017\020\261\207\0165\016\240\207\006\006\021\245\207\001\001\024U2\031\02441\0248f\021uI\025\004\215\207\002\032\02543\025_\002\206\207\t\300!\364\206\033\340\017\020\2372\351\206\r\327\211\003O\016wr_\250\254%\314\206\021\031\02441\0248L\021upI\025\253&\264\206\0223\0258TM\265\214\003\377Error__P\373yx\001\000Dict_\377NextRef_}_\261\217\004e____\255\215\001v\003\002oc\013\001fun\003\002\347get\245\214\003!\000mai=n\047\001meta\265""\220\002\010\002\357odul=\002mro\377_entries\356M\001namT\002new~\\\001preparf\002\375p\210\000checks\357um__\n\001res\007ult\006\003h\004!\001\210\221\001\033\003?unpicke\000\360\215\r\300\014\020\257\213\t/\014\354\205\r\014\020,\017vt<\334\220\001\240!qual\317\005\250\220\005\354\337\216\016\302\220\006ex\324!set\345_\203%s\302(\363\216\016__t\367est\207Avers\374\310\222\001\216Dis_cor\277outine\334\222\001e\376\261\214\005asyncio\365.\025\006s\230\221\001orde\347rcl)\001\254@tra\277ceback\370\222\001c/dbuf\000\001_\271\221\002\333\224\002}d\310\220\002_from\311\221\003$\005\t\313\221\001e1\000\000\001_\222\211\001\216\225\002\325e\227\216\002_\005\004d\313`en\377ditemsli\267ttl\005\000gn\261\221\001p\003op\301\211\006\317\211\001\220\222\001\327\211\001\256\211\005\007\002ctrO\006\355\220\005\333\220\006rd\361\205\002\352\001\0032\010\0034\017\0038rd\177_strrd_\371\217\002\352\001\0042\t\0044\021\0048se\177lfsetde\342\223\002\357sort\000\001_ke\277ysstar\326\204\003s\377tructsysp\312\223\007\273\223\006\252\223\006\353\223\002str\363\223\002\262\370\213\002t\225\223\004\374!eu\355\002u\377pdateuse\321_\333\222\005\277\227\002\304\227\002s\317\217\005wr\250\277\217\004\316\207\004\326\207\0032\335\207\0034\344\207\0038\246\353\216\003wr\331\003\001\0042\t\0044\376\021\0048\200\001\330\004\n\210\367+\220Q\005\001.\250a\250\373v\260\010\000\340\004\013\210?\377\230!\2309\240A\240W\377\250A\200\001\340\004\037\230\377q\320 0\260\013\270;\377\300k\320QR\330\004\023\377\320\023#\2408\2501\250\377A\330\004\007\200|\2207\377\230!\330\0102\260!\320\3773F\300n\320TU\330\376A\0001\200\001\360\010\000\005\377\014\210>\230\021\230)\240\1771\240G\2507\260!\020\002\373\n\033,\001\021\220\024\220Q\377\330\010\020\220\007\220q\230\337\006\230l\250!I\001v\210\277W\220E\230\024\230\027\000\022\375\220S\000\027\220q\340\010\027\277\220t\2308\2407\034\003q\377\330\010\017\320\0171\260\024\377\260Q\260g\270[\310\007\351\310\037\000\005\n\001W\014V\2304\277\230v\240T\250\021D\0475""\317\240\007\240q\331\001J!A\330\377\010\013\2104\210t\2209\377\230F\240-\250q\260\001\377\330\010\014\210J\220a\220\374\250\001\025\0005\230\007\230q\240\357\004\240A\200\010 \t\240\021\257\240$\240a#\005y\231 m\344\346\"L\005\340\261 ]\002E\220\025\376a\000t\2306\240\023\240A_\330\014\020\220\017c\000\001\000\006\177\330\014\021\220\021\220%\177\003}q%(8\2405\250\007\304\000o\017\270q\300\310\000\017\2108\002n\314\003w\230e\205A\2501\307\001\375\017\357\002A\230R\230w\240\327a\240q\007\tVA\000\001\250\273\026\250\014\006;\230a!\002w\375\250\326\002\017\210u\220A\220\367T\230\021B\003v\220W\230\377A\230V\2404\240y\260\177\001\260\023\260A\260Q\250!-\026\301 v\230\006\002\032\340am\001vA\005u\250\312\"\033\2301\216`\334\372 \t\014\034\230A\003\022\035\230_U\240\047\250\021\353`\010F\005\347y\250\003\310\204\001\231A\035\230Z\277\240s\250!\2501\271F\340\377\010\025\220Q\220d\230\047\351\240\274`\211\004\340\334@E\220\027[\230\016\363\000v\250\245\002 \334@9L\270\000\337b\t\230\025\353\000\356\"\216\013\n\n\230%\236A\202a#\n\013\277\2305\240\001\240\021\007\016\014\253\230E\212`!\262a%\274\204\001\340\374\315g\355aq\220\007\220w\230\377g\240V\250=\270\001\270\377\035\300a\300q\340\010\024\273\220G\214#z\230\023\320 Q\377\340\010\r\210U\220$\220\337g\230T\240\031\325\002\r\0228\000\014\000\033,\r#\220X?\t\000\014\356\017\014\"\220Iq\004:\260Y\177\270a\270y\310\001\330}\000~\007\rz\310\021\330\035!\233\002L\"\003\016\000\340\010\367D\311\205\001I\201@\357a\200A\340\253Fw\240c\324\301A\017\001\035\327\000\021\356\205\001L\230\367\001\230\021\207c4\220q\230\335\n\303\205\001\320\004\"\354@\025\250\377a\250t\260:\270Q\320\377\004?\270q\330\010\036\230\367e\2406\214\207\001\036\230k\250\337\022\2502\250S\265C\013\210G6\220\036\301\205\001\337(\351SC\274\204\001\177\330\014\032\230!\2306\227`\000\001\005";
+static const char cstring[] = "\377(tree fr\377agment)0\377.3.26<B<\377H<I<Q<b<\377d<h<i<q?\377Illegal \377boolean \377value: N\377ot enoug\377h input \357data\022\000e t\377hat Cyth\377on is de\377liberate\377ly stric\367ter!\001n PE\377P-484 an\377d reject\377s subcla\377sses of \377builtin \377types. I\377f you ne\177ed to p%\000\376%\tthen se\375t\200\000e \047ann\377otation_\376<\000ing\047 di\355rb\000iv\242\000o F\377alse.Opc\237ode o\277\000m\000r\377ange 0-2\37755: Unde\327fini\000o \002: \357add_R\000edc\337tx us\202\001wi\367ce.\013\002was \374o\000\023\002.disab\307lee\032\014\013\002\034\nen\336$\001gcis\004\003dn\375o\260 fault \377__reduce\337__ du\257\002no\333n-\300 vi\216@__\277cinit_\216\001 \377bytes: t\357ake_\007\002 ca\376\266@d for l\027ist\025\002d\372 \r\t1\002\340/\002\037\001\004\023\260@;\016msg\377pack/cor\377e.pyxBas\367eDe\305!Buff\253er\000\r.\301\006c\223b_i_\017\020\266@s\255@e_\013\026\343rd\326\003N\016\026\000flo\367at8\006\021int1\312\001\0242\031\02441\024K\022st\245r}\021u`\025\025\0012\032\0254\0143\025\326\002En\326+\004\t\3163\023\014\314\31729\nas\332\047R\nwr\002\000\026_\363\047#\r\365%\005\020\370\"\035\020\210\370\"5\020\361\016.\220\000\366$\232\ru `\025\364&\036\021e\022\304A8\321\204\t\343\204\003\007Ctx\000\006\315\204\017\017\t\307\204\016.\007\300\245\206\007\005\014\245\206\001\030\014\301\206\001+\014st}r=\014tuple\232i\200\254c\252\000\000\006\372\205\017\017\t\364\205\016.\007p\303ut\325\207\003\005\013\320\207\001\027\013se\277quence\007\014t\371r>\013\304\213\002NoneT?ypeSaf\265\207\n\000\r\000\260\207\017\017\020\261\207\0165\016\240\207\006\006\021\245\207\001\001\024U2\031\02441\0248f\021uI\025\004\215\207\002\032\02543\025_\002\206\207\t\300!\364\206\033\340\017\020\2372\351\206\r\327\211\003O\016wr_\250\254%\314\206\021\031\02441\0248L\021upI\025\253&\264\206\0223\0258TM\265\214\003\377Error__P\373yx\001\000Dict_\377NextRef_}_\261\217\004e____\255\215\001v\003\002oc\013\001fun\003\002\347get\245\214\003!\000mai=n\047\001meta\265""\220\002\010\002\357odul=\002mro\377_entries\356M\001namT\002new~\\\001preparf\002\375p\210\000checks\357um__\n\001res\007ult\006\003h\004!\001\210\221\001\033\003?unpicke\000\360\215\r\300\014\020\257\213\t/\014\354\205\r\014\020,\017vt<\334\220\001\240!qual\317\005\250\220\005\354\337\216\016\302\220\006ex\324!set\345_\203%s\302(\363\216\016__t\367est\207Avers\374\310\222\001\216Dis_cor\277outine\334\222\001e\376\261\214\005asyncio\365.\025\006s\230\221\001orde\347rcl)\001\254@tra\277ceback\370\222\001c/dbuf\000\001_\271\221\002\333\224\002}d\310\220\002_from\311\221\003$\005\t\313\221\001e1\000\000\001_\222\211\001\216\225\002\325e\227\216\002_\005\004d\313`en\377ditemsli\267ttl\005\000gn\261\221\001p\003op\301\211\006\317\211\001\220\222\001\327\211\001\256\211\005\007\002ctrO\006\355\220\005\333\220\006rd\361\205\002\352\001\0032\010\0034\017\0038rd\177_strrd_\371\217\002\352\001\0042\t\0044\021\0048se\177lfsetde\342\223\002\357sort\000\001_ke\277ysstar\326\204\003s\377tructsysp\312\223\007\273\223\006\252\223\006\353\223\002str\363\223\002\262\370\213\002t\225\223\004\374!eu\355\002u\377pdateuse\321_\333\222\005\277\227\002\304\227\002s\317\217\005wr\250\277\217\004\316\207\004\326\207\0032\335\207\0034\344\207\0038\246\353\216\003wr\331\003\001\0042\t\0044\376\021\0048\200\001\330\004\n\210\367+\220Q\005\001.\250a\250\373v\260\010\000\340\004\013\210?\377\230!\2309\240A\240W\377\250A\200\001\340\004\037\230\377q\320 0\260\013\270;\377\300k\320QR\330\004\023\377\320\023#\2408\2501\250\377A\330\004\007\200|\2207\377\230!\330\0102\260!\320\3773F\300n\320TU\330\376A\0001\200\001\360\010\000\005\377\014\210>\230\021\230)\240\1771\240G\2507\260!\020\002\373\n\033,\001\021\220\024\220Q\377\330\010\020\220\007\220q\230\337\006\230l\250!I\001v\210\277W\220E\230\024\230\027\000\022\375\220S\000\027\220q\340\010\027\277\220t\2308\2407\034\003q\377\330\010\017\320\0171\260\024\377\260Q\260g\270[\310\007\351\310\037\000\005\n\001W\014V\2304\277\230v\240T\250\021D\0475""\317\240\007\240q\331\001J!A\330\377\010\013\2104\210t\2209\377\230F\240-\250q\260\001\377\330\010\014\210J\220a\220\374\250\001\025\0005\230\007\230q\240\357\004\240A\200\010 \t\240\021\257\240$\240a#\005y\231 m\344\346\"L\005\340\261 ]\002E\220\025\376a\000t\2306\240\023\240A_\330\014\020\220\017c\000\001\000\006\177\330\014\021\220\021\220%\177\003}q%(8\2405\250\007\304\000o\017\270q\300\310\000\017\2108\002n\314\003w\230e\205A\2501\307\001\375\017\357\002A\230R\230w\240\327a\240q\007\tVA\000\001\250\273\026\250\014\006;\230a!\002w\375\250\326\002\017\210u\220A\220\367T\230\021B\003v\220W\230\377A\230V\2404\240y\260\177\001\260\023\260A\260Q\250!-\026\301 v\230\006\002\032\340am\001vA\005u\250\312\"\033\2301\216`\334\372 \t\014\034\230A\003\022\035\230_U\240\047\250\021\353`\010F\005\347y\250\003\310\204\001\231A\035\230Z\277\240s\250!\2501\271F\340\377\010\025\220Q\220d\230\047\351\240\274`\211\004\340\334@E\220\027[\230\016\363\000v\250\245\002 \334@9L\270\000\337b\t\230\025\353\000\356\"\216\013\n\n\230%\236A\202a#\n\013\277\2305\240\001\240\021\007\016\014\253\230E\212`!\262a%\274\204\001\340\374\315g\355aq\220\007\220w\230\377g\240V\250=\270\001\270\377\035\300a\300q\340\010\024\273\220G\214#z\230\023\320 Q\377\340\010\r\210U\220$\220\337g\230T\240\031\325\002\r\0228\000\014\000\033,\r#\220X?\t\000\014\356\017\014\"\220Iq\004:\260Y\177\270a\270y\310\001\330}\000~\007\rz\310\021\330\035!\233\002L\"\003\016\000\340\010\367D\311\205\001I\201@\357a\200A\340\253Fw\240c\324\301A\017\001\035\327\000\021\356\205\001L\230\367\001\230\021\207c4\220q\230\335\n\303\205\001\320\004\"\354@\025\250\377a\250t\260:\270Q\320\377\004?\270q\330\010\036\230\367e\2406\214\207\001\036\230k\250\337\022\2502\250S\265C\013\210G6\220\036\301\205\001\337(\351SC\274\204\001\177\330\014\032\230!\2306\227`\000\001\005";
     PyObject *data = __Pyx_DecompressString_LZSS(cstring, 2299, 4654);
     #define __Pyx_DecompressString_UNUSED
     if (unlikely(!data)) __PYX_ERR(0, 1, __pyx_L1_error)
@@ -28916,7 +28916,7 @@ static const char cstring[] = "\377(tree fr\377agment)0\377.3.24<B<\377H<I<Q<b<\
     if (likely(bytes)); else { Py_DECREF(data); __PYX_ERR(0, 1, __pyx_L1_error) }
     #endif
     #else /* compression: none (4654 bytes) */
-static const char bytes[] = "(tree fragment)0.3.24<B<H<I<Q<b<d<h<i<q?Illegal boolean value: Not enough input dataNote that Cython is deliberately stricter than PEP-484 and rejects subclasses of builtin types. If you need to pass subclasses then set the \047annotation_typing\047 directive to False.Opcode out of range 0-255: Undefined opcode: add_notedctx used twice.dctx was not used.disableectx used twice.ectx was not used.enablegcisenabledno default __reduce__ due to non-trivial __cinit__not bytes: take_bytes called for listtake_dict called for bytestake_list called for bytestake_str called for listtmsgpack/core.pyxBaseDecodeBufferBaseDecodeBuffer.__reduce_cython__BaseDecodeBuffer.__setstate_cython__BaseDecodeBuffer.rd_bytesBaseDecodeBuffer.rd_float8BaseDecodeBuffer.rd_int1BaseDecodeBuffer.rd_int2BaseDecodeBuffer.rd_int4BaseDecodeBuffer.rd_int8BaseDecodeBuffer.rd_strBaseDecodeBuffer.rd_uint1BaseDecodeBuffer.rd_uint2BaseDecodeBuffer.rd_uint4BaseDecodeBuffer.rd_uint8BaseEncodeBufferBaseEncodeBuffer.__reduce_cython__BaseEncodeBuffer.__setstate_cython__BaseEncodeBuffer.as_bytesBaseEncodeBuffer.wr_bytesBaseEncodeBuffer.wr_float8BaseEncodeBuffer.wr_int1BaseEncodeBuffer.wr_int2BaseEncodeBuffer.wr_int4BaseEncodeBuffer.wr_int8BaseEncodeBuffer.wr_strBaseEncodeBuffer.wr_uint1BaseEncodeBuffer.wr_uint2BaseEncodeBuffer.wr_uint4BaseEncodeBuffer.wr_uint8DecodeBufferDecodeCtxDecodeCtx.__reduce_cython__DecodeCtx.__setstate_cython__DecodeCtx.take_bytesDecodeCtx.take_dictDecodeCtx.take_listDecodeCtx.take_strDecodeCtx.take_tupleEncodeBufferEncodeCtxEncodeCtx.__reduce_cython__EncodeCtx.__setstate_cython__EncodeCtx.put_bytesEncodeCtx.put_dictEncodeCtx.put_sequenceEncodeCtx.put_strEncodeCtx.put_valueNoneTypeSafeDecodeBufferSafeDecodeBuffer.__reduce_cython__SafeDecodeBuffer.__setstate_cython__SafeDecodeBuffer.rd_float8SafeDecodeBuffer.rd_int1SafeDecodeBuffer.rd_int2SafeDecodeBuffer.rd_int4SafeDecodeBuffer.rd_int8SafeDecodeBuffer.rd_uint1SafeDecodeBuffer.rd_uint2SafeDecodeBuffer.rd_uint4SafeDecodeBuffer.rd_uint8SafeEnco""deBufferSafeEncodeBuffer.__reduce_cython__SafeEncodeBuffer.__setstate_cython__SafeEncodeBuffer.wr_float8SafeEncodeBuffer.wr_int1SafeEncodeBuffer.wr_int2SafeEncodeBuffer.wr_int4SafeEncodeBuffer.wr_int8SafeEncodeBuffer.wr_uint1SafeEncodeBuffer.wr_uint2SafeEncodeBuffer.wr_uint4SafeEncodeBuffer.wr_uint8TMsgpackError__Pyx_PyDict_NextRef__annotate____dict____doc____func____getstate____main____metaclass____module____mro_entries____name____new____prepare____pyx_checksum__pyx_result__pyx_state__pyx_type__pyx_unpickle_BaseDecodeBuffer__pyx_unpickle_BaseEncodeBuffer__pyx_unpickle_SafeDecodeBuffer__pyx_unpickle_SafeEncodeBuffer__pyx_vtable____qualname____reduce____reduce_cython____reduce_ex____set_name____setstate____setstate_cython____test____version___dict_is_coroutine_typeas_bytesasyncio.coroutinesbyteordercline_in_tracebackcodecdbufdbuf_take_valuedecode_from_bytesdecode_from_listebufebuf_put_valueencode_valueendextenditemslittlemsgnpackpopput_bytesput_dictput_sequenceput_strput_valuerd_bytesrd_float8rd_int1rd_int2rd_int4rd_int8rd_strrd_uint1rd_uint2rd_uint4rd_uint8selfsetdefaultsortsort_keysstartstatestructsystake_bytestake_dicttake_listtake_strtake_tupletmsgpack.coreunpackupdateuse_setstatevaluevalueswr_byteswr_float8wr_int1wr_int2wr_int4wr_int8wr_strwr_uint1wr_uint2wr_uint4wr_uint8\200\001\330\004\n\210+\220Q\200\001\330\004.\250a\250v\260Q\200\001\340\004\013\210?\230!\2309\240A\240W\250A\200\001\340\004\037\230q\320 0\260\013\270;\300k\320QR\330\004\023\320\023#\2408\2501\250A\330\004\007\200|\2207\230!\330\0102\260!\3203F\300n\320TU\330\004\013\2101\200\001\360\010\000\005\014\210>\230\021\230)\2401\240G\2507\260!\200\001\360\010\000\n\033\230!\330\010\021\220\024\220Q\330\010\020\220\007\220q\230\006\230l\250!\330\004\007\200v\210W\220E\230\024\230Q\330\010\022\220!\330\010\027\220q\340\010\027\220t\2308\2407\250!\330\004\007\200q\330\010\017\320\0171\260\024\260Q\260g\270[\310\007\310q\340\010\017\320\0171\260\024\260Q\260g\270[\310\001\200\001\360\010\000\n\033\230!""\330\010\021\220\024\220V\2304\230v\240T\250\021\330\010\020\220\007\220q\230\006\230l\250!\330\004\007\200v\210W\220E\230\024\230Q\330\010\022\220!\330\010\027\220q\340\010\027\220t\2305\240\007\240q\330\004\007\200q\330\010\017\320\0171\260\024\260Q\260g\270[\310\007\310q\340\010\017\320\0171\260\024\260Q\260g\270[\310\001\200A\330\010\013\2104\210t\2209\230F\240-\250q\260\001\330\010\014\210J\220a\220q\330\010\017\210t\2205\230\007\230q\240\004\240A\200A\330\010\013\2104\210t\2209\230F\240-\250q\260\001\330\010\014\210J\220a\220q\330\010\017\210t\2205\230\t\240\021\240$\240a\200A\330\010\013\2104\210y\230\006\230m\2501\250A\330\010\014\210J\220a\220q\340\010\020\220\001\330\010\014\210E\220\025\220a\220t\2306\240\023\240A\330\014\020\220\017\230q\240\001\330\014\020\220\017\230q\240\001\330\014\021\220\021\220%\220q\330\010\017\210q\200A\330\010\013\2104\210y\230\006\230m\2501\250A\330\010\014\210J\220a\220q\340\010\020\220\001\330\010\014\210E\220\025\220a\220t\2308\2405\250\007\250q\260\017\270q\300\001\330\010\017\210q\200A\330\010\014\210J\220a\220w\230e\2407\250!\2501\200A\330\010\017\210t\2209\230A\230R\230w\240a\240q\200A\330\010\017\210t\2209\230A\230V\2405\250\001\250\026\250q\200A\330\010\017\210t\220;\230a\230w\240a\240w\250a\200A\330\010\017\210u\220A\220T\230\021\200A\330\010\017\210v\220W\230A\230V\2404\240y\260\001\260\023\260A\260Q\200A\330\010\026\220a\220v\230Q\200A\330\010\032\230!\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\033\2301\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\034\230A\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\035\230U\240\047\250\021\250!\330\010\017\210t\220;\230a\230y\250\003\2501\250A\200A\330\010\035\230Z\240s\250!\2501\330\010\014\210J\220a\220q\340\010\025\220Q\220d\230\047\240\021\330\010\026\220a\220v\230Q\340\010\014\210E\220\027\230\016\240a\240v\250Q\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\t\230\025\230a\230q\200A\330\010 \240\004\240L\260\001\260""\021\330\010\020\220\n\230%\230q\240\001\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\013\2305\240\001\240\021\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\014\230E\240\021\240!\200A\330\010%\240T\250\021\340\010\014\210J\220a\220q\330\010\013\2104\210q\220\007\220w\230g\240V\250=\270\001\270\035\300a\300q\340\010\024\220G\2301\330\010\017\210z\230\023\230A\230Q\340\010\r\210U\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220\"\220I\230T\240\031\250!\250:\260Y\270a\270y\310\001\330\r\022\220\"\220I\230T\240\031\250!\250:\260Y\270a\270z\310\021\330\035!\240\031\250!\250:\260Y\270a\270z\310\021\340\010\026\220a\220v\230Q\330\010\014\210I\220Q\220a\200A\340\010\017\210t\220;\230a\230w\240c\250\021\250!\200A\340\010\035\230T\240\021\330\010\014\210L\230\001\230\021\330\010\017\210t\2204\220q\230\n\240$\240a\320\004\"\240\047\250\025\250a\250t\260:\270Q\320\004?\270q\330\010\036\230e\2406\250\021\330\010\036\230k\250\022\2502\250S\260\001\260\021\330\010\013\2106\220\036\230q\240\001\340\010\014\210J\220a\220q\330\010\025\220Q\220d\230\047\240\021\330\010\026\220a\220v\230Q\340\010\014\210C\210u\220A\330\014\032\230!\2306\240\021\330\014\032\230!\2306\240\021";
+static const char bytes[] = "(tree fragment)0.3.26<B<H<I<Q<b<d<h<i<q?Illegal boolean value: Not enough input dataNote that Cython is deliberately stricter than PEP-484 and rejects subclasses of builtin types. If you need to pass subclasses then set the \047annotation_typing\047 directive to False.Opcode out of range 0-255: Undefined opcode: add_notedctx used twice.dctx was not used.disableectx used twice.ectx was not used.enablegcisenabledno default __reduce__ due to non-trivial __cinit__not bytes: take_bytes called for listtake_dict called for bytestake_list called for bytestake_str called for listtmsgpack/core.pyxBaseDecodeBufferBaseDecodeBuffer.__reduce_cython__BaseDecodeBuffer.__setstate_cython__BaseDecodeBuffer.rd_bytesBaseDecodeBuffer.rd_float8BaseDecodeBuffer.rd_int1BaseDecodeBuffer.rd_int2BaseDecodeBuffer.rd_int4BaseDecodeBuffer.rd_int8BaseDecodeBuffer.rd_strBaseDecodeBuffer.rd_uint1BaseDecodeBuffer.rd_uint2BaseDecodeBuffer.rd_uint4BaseDecodeBuffer.rd_uint8BaseEncodeBufferBaseEncodeBuffer.__reduce_cython__BaseEncodeBuffer.__setstate_cython__BaseEncodeBuffer.as_bytesBaseEncodeBuffer.wr_bytesBaseEncodeBuffer.wr_float8BaseEncodeBuffer.wr_int1BaseEncodeBuffer.wr_int2BaseEncodeBuffer.wr_int4BaseEncodeBuffer.wr_int8BaseEncodeBuffer.wr_strBaseEncodeBuffer.wr_uint1BaseEncodeBuffer.wr_uint2BaseEncodeBuffer.wr_uint4BaseEncodeBuffer.wr_uint8DecodeBufferDecodeCtxDecodeCtx.__reduce_cython__DecodeCtx.__setstate_cython__DecodeCtx.take_bytesDecodeCtx.take_dictDecodeCtx.take_listDecodeCtx.take_strDecodeCtx.take_tupleEncodeBufferEncodeCtxEncodeCtx.__reduce_cython__EncodeCtx.__setstate_cython__EncodeCtx.put_bytesEncodeCtx.put_dictEncodeCtx.put_sequenceEncodeCtx.put_strEncodeCtx.put_valueNoneTypeSafeDecodeBufferSafeDecodeBuffer.__reduce_cython__SafeDecodeBuffer.__setstate_cython__SafeDecodeBuffer.rd_float8SafeDecodeBuffer.rd_int1SafeDecodeBuffer.rd_int2SafeDecodeBuffer.rd_int4SafeDecodeBuffer.rd_int8SafeDecodeBuffer.rd_uint1SafeDecodeBuffer.rd_uint2SafeDecodeBuffer.rd_uint4SafeDecodeBuffer.rd_uint8SafeEnco""deBufferSafeEncodeBuffer.__reduce_cython__SafeEncodeBuffer.__setstate_cython__SafeEncodeBuffer.wr_float8SafeEncodeBuffer.wr_int1SafeEncodeBuffer.wr_int2SafeEncodeBuffer.wr_int4SafeEncodeBuffer.wr_int8SafeEncodeBuffer.wr_uint1SafeEncodeBuffer.wr_uint2SafeEncodeBuffer.wr_uint4SafeEncodeBuffer.wr_uint8TMsgpackError__Pyx_PyDict_NextRef__annotate____dict____doc____func____getstate____main____metaclass____module____mro_entries____name____new____prepare____pyx_checksum__pyx_result__pyx_state__pyx_type__pyx_unpickle_BaseDecodeBuffer__pyx_unpickle_BaseEncodeBuffer__pyx_unpickle_SafeDecodeBuffer__pyx_unpickle_SafeEncodeBuffer__pyx_vtable____qualname____reduce____reduce_cython____reduce_ex____set_name____setstate____setstate_cython____test____version___dict_is_coroutine_typeas_bytesasyncio.coroutinesbyteordercline_in_tracebackcodecdbufdbuf_take_valuedecode_from_bytesdecode_from_listebufebuf_put_valueencode_valueendextenditemslittlemsgnpackpopput_bytesput_dictput_sequenceput_strput_valuerd_bytesrd_float8rd_int1rd_int2rd_int4rd_int8rd_strrd_uint1rd_uint2rd_uint4rd_uint8selfsetdefaultsortsort_keysstartstatestructsystake_bytestake_dicttake_listtake_strtake_tupletmsgpack.coreunpackupdateuse_setstatevaluevalueswr_byteswr_float8wr_int1wr_int2wr_int4wr_int8wr_strwr_uint1wr_uint2wr_uint4wr_uint8\200\001\330\004\n\210+\220Q\200\001\330\004.\250a\250v\260Q\200\001\340\004\013\210?\230!\2309\240A\240W\250A\200\001\340\004\037\230q\320 0\260\013\270;\300k\320QR\330\004\023\320\023#\2408\2501\250A\330\004\007\200|\2207\230!\330\0102\260!\3203F\300n\320TU\330\004\013\2101\200\001\360\010\000\005\014\210>\230\021\230)\2401\240G\2507\260!\200\001\360\010\000\n\033\230!\330\010\021\220\024\220Q\330\010\020\220\007\220q\230\006\230l\250!\330\004\007\200v\210W\220E\230\024\230Q\330\010\022\220!\330\010\027\220q\340\010\027\220t\2308\2407\250!\330\004\007\200q\330\010\017\320\0171\260\024\260Q\260g\270[\310\007\310q\340\010\017\320\0171\260\024\260Q\260g\270[\310\001\200\001\360\010\000\n\033\230!""\330\010\021\220\024\220V\2304\230v\240T\250\021\330\010\020\220\007\220q\230\006\230l\250!\330\004\007\200v\210W\220E\230\024\230Q\330\010\022\220!\330\010\027\220q\340\010\027\220t\2305\240\007\240q\330\004\007\200q\330\010\017\320\0171\260\024\260Q\260g\270[\310\007\310q\340\010\017\320\0171\260\024\260Q\260g\270[\310\001\200A\330\010\013\2104\210t\2209\230F\240-\250q\260\001\330\010\014\210J\220a\220q\330\010\017\210t\2205\230\007\230q\240\004\240A\200A\330\010\013\2104\210t\2209\230F\240-\250q\260\001\330\010\014\210J\220a\220q\330\010\017\210t\2205\230\t\240\021\240$\240a\200A\330\010\013\2104\210y\230\006\230m\2501\250A\330\010\014\210J\220a\220q\340\010\020\220\001\330\010\014\210E\220\025\220a\220t\2306\240\023\240A\330\014\020\220\017\230q\240\001\330\014\020\220\017\230q\240\001\330\014\021\220\021\220%\220q\330\010\017\210q\200A\330\010\013\2104\210y\230\006\230m\2501\250A\330\010\014\210J\220a\220q\340\010\020\220\001\330\010\014\210E\220\025\220a\220t\2308\2405\250\007\250q\260\017\270q\300\001\330\010\017\210q\200A\330\010\014\210J\220a\220w\230e\2407\250!\2501\200A\330\010\017\210t\2209\230A\230R\230w\240a\240q\200A\330\010\017\210t\2209\230A\230V\2405\250\001\250\026\250q\200A\330\010\017\210t\220;\230a\230w\240a\240w\250a\200A\330\010\017\210u\220A\220T\230\021\200A\330\010\017\210v\220W\230A\230V\2404\240y\260\001\260\023\260A\260Q\200A\330\010\026\220a\220v\230Q\200A\330\010\032\230!\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\033\2301\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\034\230A\330\010\017\210t\220;\230a\230w\240a\240u\250A\200A\330\010\035\230U\240\047\250\021\250!\330\010\017\210t\220;\230a\230y\250\003\2501\250A\200A\330\010\035\230Z\240s\250!\2501\330\010\014\210J\220a\220q\340\010\025\220Q\220d\230\047\240\021\330\010\026\220a\220v\230Q\340\010\014\210E\220\027\230\016\240a\240v\250Q\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\t\230\025\230a\230q\200A\330\010 \240\004\240L\260\001\260""\021\330\010\020\220\n\230%\230q\240\001\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\013\2305\240\001\240\021\200A\330\010 \240\004\240L\260\001\260\021\330\010\020\220\014\230E\240\021\240!\200A\330\010%\240T\250\021\340\010\014\210J\220a\220q\330\010\013\2104\210q\220\007\220w\230g\240V\250=\270\001\270\035\300a\300q\340\010\024\220G\2301\330\010\017\210z\230\023\230A\230Q\340\010\r\210U\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220$\220g\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220#\220X\230T\240\031\250!\2501\330\r\022\220\"\220I\230T\240\031\250!\250:\260Y\270a\270y\310\001\330\r\022\220\"\220I\230T\240\031\250!\250:\260Y\270a\270z\310\021\330\035!\240\031\250!\250:\260Y\270a\270z\310\021\340\010\026\220a\220v\230Q\330\010\014\210I\220Q\220a\200A\340\010\017\210t\220;\230a\230w\240c\250\021\250!\200A\340\010\035\230T\240\021\330\010\014\210L\230\001\230\021\330\010\017\210t\2204\220q\230\n\240$\240a\320\004\"\240\047\250\025\250a\250t\260:\270Q\320\004?\270q\330\010\036\230e\2406\250\021\330\010\036\230k\250\022\2502\250S\260\001\260\021\330\010\013\2106\220\036\230q\240\001\340\010\014\210J\220a\220q\330\010\025\220Q\220d\230\047\240\021\330\010\026\220a\220v\230Q\340\010\014\210C\210u\220A\330\014\032\230!\2306\240\021\330\014\032\230!\2306\240\021";
     PyObject *data = NULL;
     #define __Pyx_DecompressString_UNUSED
     #define __Pyx_DecompressString_LZSS_UNUSED

{tmsgpack-0.3.24 → tmsgpack-0.3.26}/tmsgpack/core.pyx

@@ -1,7 +1,7 @@
 # THIS FILE IS AUTOMATICALLY CREATED BY build_pyx.py
 # DON'T EDIT THIS FILE.  EDIT THE SOURCES, INSTEAD: tmsgpack/src-parts/*
 
-__version__ = "0.3.24"
+__version__ = "0.3.26"
 
 from libc.stdint cimport int8_t, int16_t, int32_t, int64_t
 from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t

{tmsgpack-0.3.24 → tmsgpack-0.3.26/tmsgpack.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tmsgpack
-Version: 0.3.24
+Version: 0.3.26
 Summary: Typed MessagePack serializer (inspired by but different from msgpack)
 Author-email: Yaakov Belch <yaakov.belch@gmail.com>
 License: ISC

tmsgpack-0.3.24/tests/test_codec.py

@@ -1,197 +0,0 @@
-"""Integration tests for TmsgpackCodec with DI and the feature registry."""
-
-import textwrap
-import pytest
-from pathlib import Path
-
-pytest.importorskip("semifun.di")
-pytest.importorskip("semifun.plugins")
-
-from tmsgpack.codec import NoDependencyInjector, TmsgpackCodec
-from semifun.di.injector import DependencyInjector
-from semifun.plugins.testing import create_registry_from_paths
-from semifun.plugins.registry import (
-    _feature_map_from_registry,
-)
-
-
-# --- Write a test package with annotated types ---
-
-def _write_test_types_package(tmp_path: Path) -> Path:
-    pkg = tmp_path / "test_codec_types"
-    pkg.mkdir()
-    (pkg / "__init__.py").write_text("")
-    (pkg / "types.py").write_text(textwrap.dedent("""\
-        import enum
-        from dataclasses import dataclass
-        from semifun.di.model import Inject
-
-        _HTTP_STATUS = (200, 404, 403, 401, 500)
-
-        #::testing_tmsgpack_codec:FailureSeverity
-        class FailureSeverity(enum.IntEnum):
-            OK = 0
-            PROBLEM = 1
-            NOT_AUTHORIZED = 2
-            NOT_AUTHENTICATED = 3
-            UNEXPECTED = 4
-
-            @property
-            def http_status_code(self) -> int:
-                return _HTTP_STATUS[self]
-
-            def __str__(self):
-                return self.name
-
-        #::testing_tmsgpack_codec:Foo
-        @dataclass(frozen=True)
-        class Foo:
-            x: str
-            y: int
-
-        @dataclass(frozen=True)
-        class Dbh:
-            pass
-
-        #::testing_tmsgpack_codec:Bar
-        @dataclass(frozen=True)
-        class Bar:
-            dbh: Inject[Dbh]
-            x: str
-    """))
-    return pkg
-
-
-@pytest.fixture
-def test_types(tmp_path):
-    pkg = _write_test_types_package(tmp_path)
-    registry = create_registry_from_paths(
-        packages=[("test_codec_types", pkg)],
-    )
-    feature_map = _feature_map_from_registry(registry, "testing_tmsgpack_codec")
-
-    import test_codec_types.types as t
-    return t, feature_map
-
-
-def _make_injectors_map():
-    _MISSING = object()
-    # documented-default: mirrors FeatureMap.__call__ — omitting `default`
-    # means "raise", which `None` cannot express.
-    def lookup(name, default=_MISSING):   # documented-default
-        if default is not _MISSING:
-            return default
-        raise LookupError(name)
-    return lookup
-
-
-@pytest.fixture
-def codec(test_types):
-    t, feature_map = test_types
-    di = DependencyInjector(injectors_map=_make_injectors_map(), seed_data={t.Dbh: t.Dbh()})
-    # testing-seam: pass feature_map callable instead of a string
-    return TmsgpackCodec(sort_keys=False, di=di, plugin_feature_type=feature_map), t
-
-
-@pytest.fixture
-def codec_no_di(test_types):
-    t, feature_map = test_types
-    # testing-seam: pass feature_map callable instead of a string
-    return TmsgpackCodec(sort_keys=False, di=NoDependencyInjector(),
-                          plugin_feature_type=feature_map), t
-
-
-# --- Round-trip: plain dataclass ---
-
-def test_round_trip_dataclass(codec):
-    codec, t = codec
-    foo = t.Foo(x='hello', y=123)
-    assert codec.decode(codec.encode(foo)) == foo
-
-
-# --- Round-trip: enum ---
-
-def test_round_trip_enum(codec):
-    codec, t = codec
-    for severity in t.FailureSeverity:
-        assert codec.decode(codec.encode(severity)) == severity
-
-
-# --- Round-trip: dataclass with Inject[T] fields ---
-
-def test_round_trip_dataclass_with_inject(codec):
-    codec, t = codec
-    bar = t.Bar(dbh=t.Dbh(), x='world')
-    data = codec.encode(bar)
-    decoded = codec.decode(data)
-    assert decoded.x == 'world'
-    assert isinstance(decoded.dbh, t.Dbh)
-
-
-# --- NoDependencyInjector: plain types work without DI ---
-
-def test_no_di_dataclass(codec_no_di):
-    codec, t = codec_no_di
-    foo = t.Foo(x='abc', y=42)
-    assert codec.decode(codec.encode(foo)) == foo
-
-
-def test_no_di_enum(codec_no_di):
-    codec, t = codec_no_di
-    baz = t.FailureSeverity.PROBLEM
-    assert codec.decode(codec.encode(baz)) == baz
-
-
-# --- with_seed_data ---
-
-def test_with_seed_data_round_trip(codec):
-    codec, t = codec
-    other_dbh = t.Dbh()
-    codec2 = codec.with_seed_data({t.Dbh: other_dbh})
-    bar = t.Bar(dbh=t.Dbh(), x='test')
-    decoded = codec2.decode(codec2.encode(bar))
-    assert decoded.x == 'test'
-    assert decoded.dbh is other_dbh
-
-
-# --- with_seed_data produces independent caches ---
-
-def test_with_seed_data_has_independent_caches(codec):
-    codec, t = codec
-    codec2 = codec.with_seed_data({t.Dbh: t.Dbh()})
-    assert codec2.encoder_cache is not codec.encoder_cache
-    assert codec2.decoder_cache is not codec.decoder_cache
-
-
-# --- Inject[T] without a DependencyInjector ---
-
-def test_inject_field_without_an_injector_fails_on_encode():
-    """`NoDependencyInjector` does not recognise Inject[T], so the field is serialized.
-
-    Documented in [[tmsgpack:di-on-decode]]: exclusion depends on the
-    injector, so without one the codec tries to encode the injected value and
-    fails there — not on decode.
-    """
-    from dataclasses import dataclass
-
-    from tmsgpack.codec import NoDependencyInjector, TmsgpackCodec
-    from semifun.di.model import Inject
-
-    class DbHandle:
-        pass
-
-    @dataclass(frozen=True)
-    class NeedsInjection:
-        dbh: Inject[DbHandle]
-        x: str
-
-    def feature_map(feature, default=None):
-        return {'NeedsInjection': NeedsInjection}.get(feature, default)
-
-    codec = TmsgpackCodec(
-        sort_keys=True,
-        di=NoDependencyInjector(),
-        plugin_feature_type=feature_map,
-    )
-    with pytest.raises(ValueError, match='Cannot encode this type'):
-        codec.encode(NeedsInjection(dbh=DbHandle(), x='hi'))

tmsgpack-0.3.24/tests/test_codec_custom.py

@@ -1,240 +0,0 @@
-"""Tests for TmsgpackCustom: custom encode/decode for non-dataclass types."""
-
-import struct
-import textwrap
-import pytest
-from pathlib import Path
-
-pytest.importorskip("semifun.di")
-pytest.importorskip("semifun.plugins")
-
-from tmsgpack.codec import NoDependencyInjector, TmsgpackCodec
-from semifun.di.injector import DependencyInjector
-from semifun.plugins.testing import create_registry_from_paths
-from semifun.plugins.registry import _feature_map_from_registry
-
-
-# --- Write test packages with custom codec types ---
-
-def _write_custom_types_package(tmp_path: Path) -> Path:
-    pkg = tmp_path / "test_custom_types"
-    pkg.mkdir()
-    (pkg / "__init__.py").write_text("")
-    (pkg / "types.py").write_text(textwrap.dedent("""\
-        import struct
-        from tmsgpack.codec_custom import TmsgpackCustom
-
-        # --- Target types (not dataclasses) ---
-
-        class Pair:
-            def __init__(self, x, y):
-                self.x = x
-                self.y = y
-            def __eq__(self, other):
-                return type(other) is Pair and self.x == other.x and self.y == other.y
-
-        class Point:
-            def __init__(self, x, y):
-                self.x = x
-                self.y = y
-            def __eq__(self, other):
-                return type(other) is Point and self.x == other.x and self.y == other.y
-
-        # --- Dict mode ---
-
-        #::testing_custom_codec:Pair=CodecPairDict
-        class CodecPairDict(TmsgpackCustom):
-            def encode_dict(obj):
-                return {'x': obj.x, 'y': obj.y}
-            def decode_dict(*, x, y):
-                return Pair(x=x, y=y)
-
-        # --- List mode ---
-
-        #::testing_custom_codec:Point=CodecPointList
-        class CodecPointList(TmsgpackCustom):
-            def encode_list(obj):
-                return [obj.x, obj.y]
-            def decode_list(x, y):
-                return Point(x, y)
-    """))
-    (pkg / "types_bytes.py").write_text(textwrap.dedent("""\
-        import struct
-        from tmsgpack.codec_custom import TmsgpackCustom
-
-        class FloatPair:
-            def __init__(self, x, y):
-                self.x = x
-                self.y = y
-            def __eq__(self, other):
-                return (type(other) is FloatPair
-                        and self.x == other.x and self.y == other.y)
-
-        #::testing_custom_codec:FloatPair=CodecFloatPairBytes
-        class CodecFloatPairBytes(TmsgpackCustom):
-            def encode_bytes(obj):
-                return struct.pack('<ff', obj.x, obj.y)
-            def decode_bytes(data):
-                x, y = struct.unpack('<ff', data)
-                return FloatPair(x, y)
-    """))
-    return pkg
-
-
-@pytest.fixture
-def test_types(tmp_path):
-    pkg = _write_custom_types_package(tmp_path)
-    registry = create_registry_from_paths(
-        packages=[("test_custom_types", pkg)],
-    )
-    feature_map = _feature_map_from_registry(registry, "testing_custom_codec")
-    import test_custom_types.types as t
-    import test_custom_types.types_bytes as tb
-    return t, tb, feature_map
-
-
-@pytest.fixture
-def codec(test_types):
-    t, tb, feature_map = test_types
-    return TmsgpackCodec(sort_keys=False, di=NoDependencyInjector(),
-                          plugin_feature_type=feature_map), t, tb
-
-
-# --- Dict mode round-trip ---
-
-def test_dict_mode_round_trip(codec):
-    codec, t, tb = codec
-    pair = t.Pair(x='hello', y=42)
-    data = codec.encode(pair)
-    restored = codec.decode(data)
-    assert restored == pair
-
-
-# --- List mode round-trip ---
-
-def test_list_mode_round_trip(codec):
-    codec, t, tb = codec
-    point = t.Point(x=10, y=20)
-    data = codec.encode(point)
-    restored = codec.decode(data)
-    assert restored == point
-
-
-# --- Bytes mode round-trip ---
-
-def test_bytes_mode_round_trip(codec):
-    codec, t, tb = codec
-    fp = tb.FloatPair(x=1.5, y=2.5)
-    data = codec.encode(fp)
-    restored = codec.decode(data)
-    assert restored == fp
-
-
-# --- Content hashing works with custom types ---
-
-def test_content_hash_dict_mode(codec):
-    codec, t, tb = codec
-    codec_sorted = TmsgpackCodec(sort_keys=True, di=NoDependencyInjector(),
-                                  plugin_feature_type=codec.plugin_feature_type)
-    pair = t.Pair(x='a', y=1)
-    h = codec_sorted.hash_to_str(pair)
-    assert isinstance(h, str)
-    assert len(h) == 22
-    # Same value, same hash
-    assert codec_sorted.hash_to_str(t.Pair(x='a', y=1)) == h
-
-
-# --- Nested values in custom types ---
-
-def test_dict_mode_nested_values(codec):
-    codec, t, tb = codec
-    pair = t.Pair(x=[1, 2, 3], y={'a': True})
-    data = codec.encode(pair)
-    restored = codec.decode(data)
-    assert restored == pair
-
-
-# --- Validation: mismatched modes ---
-
-def test_mismatched_modes_raises():
-    from tmsgpack.codec_custom import TmsgpackCustom
-    with pytest.raises(TypeError, match="mode mismatch"):
-        class Bad(TmsgpackCustom):
-            def encode_dict(obj): return {}
-            def decode_list(x): return None
-
-
-def test_no_encode_raises():
-    from tmsgpack.codec_custom import TmsgpackCustom
-    with pytest.raises(TypeError, match="encode_dict, encode_list, encode_bytes"):
-        class Bad(TmsgpackCustom):
-            def decode_dict(*, x): return None
-
-
-def test_no_decode_raises():
-    from tmsgpack.codec_custom import TmsgpackCustom
-    with pytest.raises(TypeError, match="decode_dict, decode_list, decode_bytes"):
-        class Bad(TmsgpackCustom):
-            def encode_dict(obj): return {}
-
-
-# --- DI on decode ---
-
-def _write_di_types_package(tmp_path: Path) -> Path:
-    pkg = tmp_path / "test_custom_di_types"
-    pkg.mkdir()
-    (pkg / "__init__.py").write_text("")
-    (pkg / "types.py").write_text(textwrap.dedent("""\
-        from tmsgpack.codec_custom import TmsgpackCustom
-        from semifun.di.model import Inject
-
-        class Cache:
-            def __init__(self):
-                self.store = {}
-            def get(self, key):
-                return self.store[key]
-            def put(self, key, value):
-                self.store[key] = value
-
-        class Widget:
-            def __init__(self, name, data):
-                self.name = name
-                self.data = data
-            def __eq__(self, other):
-                return (type(other) is Widget
-                        and self.name == other.name
-                        and self.data == other.data)
-
-        #::testing_custom_di_codec:Widget=CodecWidget
-        class CodecWidget(TmsgpackCustom):
-            def encode_dict(obj, cache: Inject[Cache]):
-                cache.put(obj.name, obj.data)
-                return {'name': obj.name}
-            def decode_dict(*, name, cache: Inject[Cache]):
-                data = cache.get(name)
-                return Widget(name=name, data=data)
-    """))
-    return pkg
-
-
-def test_di_on_encode_and_decode(tmp_path):
-    pkg = _write_di_types_package(tmp_path)
-    registry = create_registry_from_paths(
-        packages=[("test_custom_di_types", pkg)],
-    )
-    feature_map = _feature_map_from_registry(registry, "testing_custom_di_codec")
-    import test_custom_di_types.types as t
-
-    cache = t.Cache()
-    injectors_map = lambda name, default=None: default
-    di = DependencyInjector(injectors_map=injectors_map, seed_data={t.Cache: cache})
-    codec = TmsgpackCodec(sort_keys=False, di=di, plugin_feature_type=feature_map)
-
-    widget = t.Widget(name='gizmo', data=[1, 2, 3])
-    data = codec.encode(widget)
-
-    # The cache was populated during encode
-    assert cache.store == {'gizmo': [1, 2, 3]}
-
-    restored = codec.decode(data)
-    assert restored == widget