omlish 0.0.0.dev330__py3-none-any.whl → 0.0.0.dev332__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev330'
-__revision__ = '735d13c7ae2ba542d490b72a443ebcf36f1d5119'
+__version__ = '0.0.0.dev332'
+__revision__ = '42a95ae3232ef3c42a1fe09b179092ec67297444'
 
 
 #

omlish/lang/__init__.py

@@ -216,6 +216,7 @@ from .imports import (  # noqa
 )
 
 from .iterables import (  # noqa
+    IteratorWithReturn,
     asrange,
     common_prefix_len,
     exhaust,

omlish/lang/iterables.py

@@ -121,3 +121,37 @@ def prodrange(*dims: Rangeable) -> ta.Iterable[ta.Sequence[int]]:
     if not dims:
         return []
     return itertools.product(*map(asrange, dims))
+
+
+##
+
+
+class IteratorWithReturn(ta.Generic[T, R]):
+    """Overlap with stuff in generators.py, but intentionally restricted to iteration (no send/throw)."""
+
+    def __init__(self, it: ta.Iterator[T]) -> None:
+        super().__init__()
+
+        self._it = it
+        self._has_value = False
+
+    _value: R
+
+    @property
+    def has_value(self) -> bool:
+        return self._has_value
+
+    @property
+    def value(self) -> R:
+        return self._value
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        try:
+            return next(self._it)
+        except StopIteration as e:
+            self._has_value = True
+            self._value = e.value
+            raise

omlish/typedvalues/collection.py

@@ -35,74 +35,62 @@ class TypedValues(
             override: bool = False,
             check_type: type | tuple[type, ...] | None = None,
     ) -> None:
-        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__()
 
-        tmp: list = []
-        udct: dict = {}
-        for tv in tvs:
-            if check_type is not None:
-                check.isinstance(tv, check_type)
-            if isinstance(tv, UniqueTypedValue):
-                utvc = tv._unique_typed_value_cls  # noqa
-                if not override:
-                    try:
-                        exu = udct[utvc]
-                    except KeyError:
-                        pass
-                    else:
-                        raise DuplicateUniqueTypedValueError(utvc, tv, check.single(exu))
-                ulst = udct.setdefault(utvc, [])
-                ulst.append(tv)
-                tmp.append((utvc, tv, ulst, len(ulst)))
-            elif isinstance(tv, TypedValue):
-                tmp.append(tv)
-            else:
-                raise TypeError(tv)
-
-        lst: list = []
-        dct: dict = {}
-        for obj in tmp:
-            if isinstance(obj, tuple):
-                utvc, tv, ulst, idx = obj
-                if idx == len(ulst):
+        if tvs:
+            tmp: list = []
+            udct: dict = {}
+            for tv in tvs:
+                if check_type is not None:
+                    check.isinstance(tv, check_type)
+                if isinstance(tv, UniqueTypedValue):
+                    utvc = tv._unique_typed_value_cls  # noqa
+                    if not override:
+                        try:
+                            exu = udct[utvc]
+                        except KeyError:
+                            pass
+                        else:
+                            raise DuplicateUniqueTypedValueError(utvc, tv, check.single(exu))
+                    ulst = udct.setdefault(utvc, [])
+                    ulst.append(tv)
+                    tmp.append((utvc, tv, ulst, len(ulst)))
+                elif isinstance(tv, TypedValue):
+                    tmp.append(tv)
+                else:
+                    raise TypeError(tv)
+
+            lst: list = []
+            dct: dict = {}
+            for obj in tmp:
+                if isinstance(obj, tuple):
+                    utvc, tv, ulst, idx = obj
+                    if idx == len(ulst):
+                        lst.append(tv)
+                        dct[utvc] = tv
+                else:
+                    tv = obj
                     lst.append(tv)
-                    dct[utvc] = tv
-            else:
-                tv = obj
-                lst.append(tv)
-                dct.setdefault(type(tv), []).append(tv)
-
-        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()
-        }
-        self._dct2: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = {
-            **self._dct,
-            **{type(v): v for v in self._dct.values() if isinstance(v, UniqueTypedValue)},  # type: ignore[misc]
-        }
-
-    #
-
-    _EMPTY: ta.ClassVar['TypedValues']
+                    dct.setdefault(type(tv), []).append(tv)
+
+            tup = tuple(lst)
+            dct = {
+                k: tuple(v) if isinstance(v, list) else v
+                for k, v in dct.items()
+            }
+            dct2 = {
+                **dct,
+                **{type(v): v for v in dct.values() if isinstance(v, UniqueTypedValue)},
+            }
 
-    @classmethod
-    def empty(cls) -> 'TypedValues':
-        return cls._EMPTY
+        else:
+            tup = ()
+            dct = {}
+            dct2 = {}
 
-    def __new__(cls, *tvs, **kwargs):  # noqa
-        if not tvs:
-            try:
-                return cls._EMPTY
-            except AttributeError:
-                pass
-        return super().__new__(cls)
+        self._tup: tuple[TypedValueT, ...] = tup
+        self._dct: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = dct
+        self._dct2: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = dct2
 
     #
 
@@ -216,6 +204,3 @@ class TypedValues(
         ret = tuple(tv for tv in self if isinstance(tv, cls))
         any_dct[cls] = ret
         return ret
-
-
-TypedValues._EMPTY = TypedValues()  # noqa

omlish/typedvalues/marshal.py

@@ -106,6 +106,10 @@ class TypedValuesMarshalerFactory(msh.MarshalerFactoryMatchClass):
         )
         return msh.IterableMarshaler(tv_m)
 
+    @mfs.simple(lambda _, ctx, rty: rty is TypedValues)
+    def _build_concrete(self, ctx: msh.MarshalContext, rty: rfl.Type) -> msh.Marshaler:
+        raise NotImplementedError
+
 
 class TypedValuesUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
     @mfs.simple(lambda _, ctx, rty: isinstance(rty, rfl.Generic) and rty.cls is TypedValues)
@@ -117,6 +121,10 @@ class TypedValuesUnmarshalerFactory(msh.UnmarshalerFactoryMatchClass):
         )
         return msh.IterableUnmarshaler(lambda it: TypedValues(*it), tv_u)  # noqa
 
+    @mfs.simple(lambda _, ctx, rty: rty is TypedValues)
+    def _build_concrete(self, ctx: msh.UnmarshalContext, rty: rfl.Type) -> msh.Unmarshaler:
+        raise NotImplementedError
+
 
 ##
 

{omlish-0.0.0.dev330.dist-info → omlish-0.0.0.dev332.dist-info}/METADATA

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

{omlish-0.0.0.dev330.dist-info → omlish-0.0.0.dev332.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=LOOmES3-MH0InTp6s_UkS6QtPhcOFz7C1XEnVq7wTmM,3478
+omlish/__about__.py,sha256=r6XTgLXcL6l8jSyx01oleAawjO4edY2vAJ_QO-jMZvY,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -404,7 +404,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=tdtWhwkPQq3sg7Brakrcbf8e1cOBg6e0TtwnSMnvEpg,2582
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=XKboOHeTokmHdfYEoSL0XZZxPGTvHiYJN7zveG-laTU,6227
+omlish/lang/__init__.py,sha256=YuPEZ3sIP6q5gGbISbQQ_CsOU5Zlu_IXHqxjO7muI-4,6251
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -417,7 +417,7 @@ omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
 omlish/lang/functions.py,sha256=qNqzWF6vI6PGTzKhgkhnNXP8e1gSerb8GsHG3_wVBP8,6386
 omlish/lang/generators.py,sha256=a4D5HU_mySs2T2z3xCmE_s3t4QJkj0YRrK4-hhpGd0A,5197
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
-omlish/lang/iterables.py,sha256=StoGp9yaP3njdLKHoWYcEevO3eE8SHEPYl5_avZob24,2149
+omlish/lang/iterables.py,sha256=krehpKGdOI5ZxqChS7pse5Kzj1B9M4qk4ruFnUdNtiE,2842
 omlish/lang/objects.py,sha256=ZsibJwNp1EXorbaObm9TlCNtuuM65snCmVb7H4_llqI,6116
 omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
 omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
@@ -850,16 +850,16 @@ 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=nzpnoRW_wScMPit5Xz37ky3nKBdzzkgtnQA4SfVHN8E,684
 omlish/typedvalues/accessor.py,sha256=_NEGBmQ84-h_rDfYeoq7DA20fhj3dogQuvzxXKhjx54,3121
-omlish/typedvalues/collection.py,sha256=a6Je_kmz2FlAV2dI92S7c_paXge0QExMynV-fD9oPrs,5823
+omlish/typedvalues/collection.py,sha256=TjNuEEyTXbGfbsk7nvBB_Jhgz94R5JSs0u6ocNAlj3Y,5511
 omlish/typedvalues/consumer.py,sha256=peDQAgriSyBx_Hc8QHAhEgYy0oSS52qQ_7Tqdssl2AE,4375
 omlish/typedvalues/generic.py,sha256=ft-x4X3k1oFirtYnDfsvrI3ZQikWM8lGLrvrOEbcGq0,742
 omlish/typedvalues/holder.py,sha256=vu-umn-h1nvUqmtV5T9ZfQ_OoOYsERu8PhI2N48Ryns,1133
-omlish/typedvalues/marshal.py,sha256=IaZn1r4le5sq8_HcEJf_WEzS-NmeOaNQggmZxfEoIio,4332
+omlish/typedvalues/marshal.py,sha256=pGA4qzAmpqJTeUya4sTSNEkuXoyUdg5l_XTotR8v9SU,4694
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev330.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev330.dist-info/METADATA,sha256=Feb56v6VrdVgD2PiRe6OpzAxwDWhUF1BhmcheWSajVI,4416
-omlish-0.0.0.dev330.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev330.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev330.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev330.dist-info/RECORD,,
+omlish-0.0.0.dev332.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev332.dist-info/METADATA,sha256=OxcNh3fpYssk2Yi1ivKcjcmtZbBWFloHT6Zr8LoQtw8,4416
+omlish-0.0.0.dev332.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev332.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev332.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev332.dist-info/RECORD,,