omlish 0.0.0.dev274__py3-none-any.whl → 0.0.0.dev276__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev274'
-__revision__ = '198dbdd7a7fd13d7d9a6f0f3642a26adc79535ff'
+__version__ = '0.0.0.dev276'
+__revision__ = 'b59ea0791ca796acd261e3bd7d25125492a027e4'
 
 
 #

omlish/marshal/objects/dataclasses.py

@@ -188,12 +188,25 @@ class AbstractDataclassFactory(lang.Abstract):
 ##
 
 
+def _type_or_generic_base(rty: rfl.Type) -> type | None:
+    if isinstance(rty, rfl.Generic):
+        return rty.cls
+    elif isinstance(rty, type):
+        return rty
+    else:
+        return None
+
+
 class DataclassMarshalerFactory(AbstractDataclassFactory, SimpleMarshalerFactory):
     def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
+        return (
+            (ty := _type_or_generic_base(rty)) is not None and
+            dc.is_dataclass(ty) and
+            not lang.is_abstract_class(ty)
+        )
 
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
-        ty = check.isinstance(rty, type)
+        ty = check.isinstance(_type_or_generic_base(rty), type)
         check.state(dc.is_dataclass(ty))
         check.state(not lang.is_abstract_class(ty))
 
@@ -217,10 +230,14 @@ class DataclassMarshalerFactory(AbstractDataclassFactory, SimpleMarshalerFactory
 
 class DataclassUnmarshalerFactory(AbstractDataclassFactory, SimpleUnmarshalerFactory):
     def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
-        return isinstance(rty, type) and dc.is_dataclass(rty) and not lang.is_abstract_class(rty)
+        return (
+            (ty := _type_or_generic_base(rty)) is not None and
+            dc.is_dataclass(ty) and
+            not lang.is_abstract_class(ty)
+        )
 
     def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
-        ty = check.isinstance(rty, type)
+        ty = check.isinstance(_type_or_generic_base(rty), type)
         check.state(dc.is_dataclass(ty))
         check.state(not lang.is_abstract_class(ty))
 

omlish/reflect/__init__.py

@@ -40,6 +40,7 @@ from .types import (  # noqa
     get_orig_bases,
     get_orig_class,
     get_params,
+    get_type_var_bound,
     is_type,
     is_union_type,
     type_,

omlish/reflect/types.py

@@ -115,6 +115,10 @@ def get_newtype_supertype(obj: ta.Any) -> ta.Any:
     return obj.__supertype__
 
 
+def get_type_var_bound(obj: ta.Any) -> ta.Any:
+    return obj.__bound__
+
+
 ##
 
 

omlish/typedvalues/collection.py

@@ -29,8 +29,10 @@ class TypedValues(
     ta.Generic[TypedValueT],
 ):
     def __init__(self, *tvs: TypedValueT, override: bool = False) -> None:
-        if hasattr(self, '_lst'):
+        if hasattr(self, '_tup'):
             # When __new__ returns the empty singleton __init__ will still be called.
+            if self is not self._EMPTY:
+                raise RuntimeError
             return
 
         super().__init__()
@@ -69,10 +71,11 @@ class TypedValues(
                 lst.append(tv)
                 dct.setdefault(type(tv), []).append(tv)
 
-        self._lst = lst
-        self._dct = dct
-
-        self._any_dct: dict[type, ta.Sequence[ta.Any]] = {}
+        self._tup: tuple[TypedValueT, ...] = tuple(lst)
+        self._dct: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = {
+            k: tuple(v) if isinstance(v, list) else v
+            for k, v in dct.items()
+        }
 
     #
 
@@ -92,30 +95,69 @@ class TypedValues(
 
     #
 
-    def with_(self, *tvs, override: bool = False) -> 'TypedValues':
-        return TypedValues(*self._lst, *tvs, override=override)
-
     def without(self, *tys: type) -> ta.Iterator[TypedValueT]:
-        for o in self._lst:
+        for o in self._tup:
             if isinstance(o, tys):
                 continue
             yield o
 
     #
 
+    def update(self, *tvs, override: bool = False) -> 'TypedValues':
+        return TypedValues(*self._tup, *tvs, override=override)
+
+    def discard(self, *tys: type) -> 'TypedValues':
+        return TypedValues(*self.without(*tys))
+
+    #
+
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({", ".join(map(repr, self._lst))})'
+        return f'{self.__class__.__name__}({", ".join(map(repr, self._tup))})'
+
+    #
+
+    _set: frozenset[TypedValueT]
+
+    def to_set(self) -> frozenset[TypedValueT]:
+        try:
+            return self._set
+        except AttributeError:
+            pass
+        s = frozenset(self._tup)
+        self._set = s
+        return s
+
+    #
+
+    _hash: int
+
+    def __hash__(self) -> int:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+        h = hash(self._tup)
+        self._hash = h
+        return h
+
+    def __eq__(self, other):
+        if not isinstance(other, type(self)):
+            return NotImplemented
+        return (
+            other is self or
+            other._tup == self._tup
+        )
 
     #
 
     def __iter__(self) -> ta.Iterator[TypedValueT]:
-        return iter(self._lst)
+        return iter(self._tup)
 
     def __len__(self) -> int:
-        return len(self._lst)
+        return len(self._tup)
 
     def __bool__(self) -> bool:
-        return bool(self._lst)
+        return bool(self._tup)
 
     #
 
@@ -124,7 +166,7 @@ class TypedValues(
 
     def _typed_value_getitem(self, key):
         if isinstance(key, int):
-            return self._lst[key]
+            return self._tup[key]
         elif isinstance(key, type):
             return self._dct[check.issubclass(key, TypedValue)]
         else:
@@ -138,17 +180,24 @@ class TypedValues(
             if issubclass(key, UniqueTypedValue):
                 return default
             elif default is not None:
-                return list(default)
+                return tuple(default)
             else:
-                return []
+                return ()
+
+    _any_dct: dict[type, tuple[TypedValueT, ...]]
 
     def _typed_value_get_any(self, cls):
         try:
-            return self._any_dct[cls]
+            any_dct = self._any_dct
+        except AttributeError:
+            any_dct = {}
+            self._any_dct = any_dct
+        try:
+            return any_dct[cls]
         except KeyError:
             pass
-        ret = [tv for tv in self if isinstance(tv, cls)]
-        self._any_dct[cls] = ret
+        ret = tuple(tv for tv in self if isinstance(tv, cls))
+        any_dct[cls] = ret
         return ret
 
 

omlish/typedvalues/marshal.py

@@ -1,3 +1,5 @@
+import typing as ta
+
 from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
@@ -93,6 +95,8 @@ def _build_typed_values_impls(rty: rfl.Type) -> msh.Impls:
 
         if isinstance(cur, rfl.Union):
             todo.extend(cur.args)
+        elif isinstance(cur, ta.TypeVar):
+            todo.append(rfl.get_type_var_bound(cur))
         else:
             opt_cls_set.add(check.issubclass(check.isinstance(cur, type), TypedValue))
 

{omlish-0.0.0.dev274.dist-info → omlish-0.0.0.dev276.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev274
+Version: 0.0.0.dev276
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev274.dist-info → omlish-0.0.0.dev276.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=uaTsfptyouZtf01Rjtt8vRjFEZA-hjAx0C1JaK4Uxns,3380
+omlish/__about__.py,sha256=FoTicGOCebKQ5tQVQjrcXhtN_4ZJBQMrDN3RO12ykvQ,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -514,7 +514,7 @@ omlish/marshal/composite/newtypes.py,sha256=5-te247TiPYf84oFhf59tqIOOByXj8i9KaHT
 omlish/marshal/composite/optionals.py,sha256=MnecrmrJYjQvYJipIHNCDq78oH09dOjnw5pvaMKqoeU,1537
 omlish/marshal/composite/wrapped.py,sha256=jOsn3h1vLIqcoSTB-0KObnsdbV8jSVWJYbf7Kg9AUwg,750
 omlish/marshal/objects/__init__.py,sha256=F4wej8L_tedC8ETYxAnmKfdPR9TjsqIus9Z3nZofYuc,182
-omlish/marshal/objects/dataclasses.py,sha256=zs0yE0gi3tKHLiZGPf8FEMhPOc505vnHMjpp92MOX5k,8658
+omlish/marshal/objects/dataclasses.py,sha256=NcjXrZI8y7THULwUH75LQFVHAyP_-EBBzUi9cbhyPZ0,9046
 omlish/marshal/objects/helpers.py,sha256=85GZp4h3Yo0GYGmnZpKgNxkWnSk8h2R21nfDLU2DtM0,1110
 omlish/marshal/objects/marshal.py,sha256=JarKGecMgaFYSUHUj-ZUYVP9HK6u2rjpBb3DWX9Uhh0,2648
 omlish/marshal/objects/metadata.py,sha256=2_rESnslP5fwtEW1xy9ECJg64uA4cQBuYcGkRfPElts,3342
@@ -567,11 +567,11 @@ omlish/os/pidfiles/cli.py,sha256=2SSsP4O3VdpsDIMAkWgWSjh_YNIPzCD9l5LNN2qrIjo,207
 omlish/os/pidfiles/manager.py,sha256=QphQxIENVVwvBWynLCNU31NwOfLkV43VoTVeYFn2Hac,2351
 omlish/os/pidfiles/pidfile.py,sha256=9tI5IMVwfPfnni0XMn4x5ptNQgm36n8tLeUNPf50UqU,4394
 omlish/os/pidfiles/pinning.py,sha256=v9RlJ4BnJZcaZZXiiRqbmzLluaSOkeeEb_WrbKEClBQ,6643
-omlish/reflect/__init__.py,sha256=Er2yBHibVO16hFNA1szQF2_f43Y3HRCBWtS-fjsOIYc,798
+omlish/reflect/__init__.py,sha256=64eHbD6zL6Fhp7FfXb8n9ZHywlODjBN3rm1LMvZ081A,822
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=g3q7NmNWsmc67mcchmCE3WFPCMDSBq-FXn4ah-DWL_U,3622
-omlish/reflect/types.py,sha256=lYxK_hlC4kVDMKeDYJp0mymSth21quwuFAMAEFBznyE,9151
+omlish/reflect/types.py,sha256=Cn9FYGoiCNt0FS0YLiTTAR12WKcesWMapCrVYcb8IDo,9225
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=SGB1KrlNrxlNpazEHYy95NTzteLi8ndoEgMhU7luBl8,420
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
@@ -778,14 +778,14 @@ omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
 omlish/typedvalues/__init__.py,sha256=YalNleXS2vQX_3dOIMwfb4n_uBkENTT4QXHnsHatGGM,496
 omlish/typedvalues/accessor.py,sha256=0k21N-CkjGaY6zCwugsRfOC_CDkqk7wNz4oxO1_6EEA,2919
-omlish/typedvalues/collection.py,sha256=lv0xO_ZDApg0v5FZCdeVDBiUf60YEaXRBDbRrjBwZSY,4129
+omlish/typedvalues/collection.py,sha256=jsXSggmMMvGATcJgQkUXt5Guwq8aquw73_OIC-e6U0I,5300
 omlish/typedvalues/generic.py,sha256=byWG_gMXhNelckUwdmOoJE9FKkL71Q4BSi4ZLyy0XZ0,788
 omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,1554
-omlish/typedvalues/marshal.py,sha256=BuFQMoaLSDbEm32nj_hkBSClPvC0euNFU7_EhsrfBck,4487
+omlish/typedvalues/marshal.py,sha256=H1gQuFHHgFR5qTs0lM7VXK41BivSbOXC9I2XUpo5SXU,4603
 omlish/typedvalues/values.py,sha256=Acyf6xSdNHxrkRXLXrFqJouk35YOveso1VqTbyPwQW4,1223
-omlish-0.0.0.dev274.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev274.dist-info/METADATA,sha256=IDyj3CVbK6H5psd69W58F70u__Va0Ix6doHB68Ja_q4,4198
-omlish-0.0.0.dev274.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev274.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev274.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev274.dist-info/RECORD,,
+omlish-0.0.0.dev276.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev276.dist-info/METADATA,sha256=_xEeojOHXbc_azzKB0NydBuLd1aMhKO1l65YCPUaqNE,4198
+omlish-0.0.0.dev276.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev276.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev276.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev276.dist-info/RECORD,,