omlish 0.0.0.dev293__py3-none-any.whl → 0.0.0.dev294__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev293'
-__revision__ = 'ef66d2ef2f66a131fc0f8498c584d603f252a39e'
+__version__ = '0.0.0.dev294'
+__revision__ = 'a8c5ea178d6688aa3681c24ef971c6e24d1eb392'
 
 
 #

omlish/secrets/secrets.py

@@ -67,10 +67,10 @@ class SecretRef:
 SecretRefOrStr: ta.TypeAlias = SecretRef | str
 
 
-def secret_repr(o: SecretRefOrStr | None) -> str | None:
+def secret_repr(o: Secret | SecretRef | str | None) -> str | None:
     if isinstance(o, str):
         return '...'
-    elif isinstance(o, SecretRef):
+    elif isinstance(o, (Secret, SecretRef)):
         return repr(o)
     elif o is None:
         return None

omlish/typedvalues/__init__.py

@@ -8,6 +8,12 @@ from .collection import (  # noqa
     TypedValues,
 )
 
+from .consumer import (  # noqa
+    UnconsumedTypedValuesError,
+
+    TypedValuesConsumer,
+)
+
 from .generic import (  # noqa
     TypedValueGeneric,
 )

omlish/typedvalues/accessor.py

@@ -6,6 +6,7 @@ TODO:
 import abc
 import typing as ta
 
+from .. import check
 from .. import lang
 from .values import TypedValue  # noqa
 from .values import UniqueTypedValue  # noqa
@@ -22,6 +23,10 @@ UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound='UniqueTypedValue')
 ##
 
 
+class _NOT_SET(lang.Marker):  # noqa
+    pass
+
+
 class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
     def __iter__(self):
         raise TypeError(
@@ -97,17 +102,20 @@ class TypedValuesAccessor(lang.Abstract, ta.Generic[TypedValueT]):
         ...
 
     @ta.final
-    def get(self, key, /, default=None):
+    def get(self, key, /, default=_NOT_SET):
         if not isinstance(key, type):
-            if default is not None:
+            if default is not _NOT_SET:
                 raise RuntimeError('Must not provide both an instance key and a default')
             default = key
             key = type(default)
-        return self._typed_value_get(key, default)
-
-    @abc.abstractmethod
-    def _typed_value_get(self, key, /, default=None):
-        raise NotImplementedError
+        elif default is _NOT_SET:
+            default = None
+
+        check.issubclass(key, TypedValue)
+        try:
+            return self._typed_value_getitem(key)
+        except KeyError:
+            return default
 
     #
 

omlish/typedvalues/collection.py

@@ -4,6 +4,7 @@ from .. import check
 from .. import dataclasses as dc
 from .. import lang
 from .accessor import TypedValuesAccessor
+from .consumer import TypedValuesConsumer
 from .values import TypedValue
 from .values import UniqueTypedValue
 
@@ -28,7 +29,12 @@ class TypedValues(
     lang.Final,
     ta.Generic[TypedValueT],
 ):
-    def __init__(self, *tvs: TypedValueT, override: bool = False) -> None:
+    def __init__(
+            self,
+            *tvs: TypedValueT,
+            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:
@@ -40,6 +46,8 @@ class TypedValues(
         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:
@@ -175,6 +183,11 @@ class TypedValues(
 
     #
 
+    def consume(self) -> TypedValuesConsumer[TypedValueT]:
+        return TypedValuesConsumer(self._dct.items())
+
+    #
+
     def _typed_value_contains(self, cls):
         return cls in self._dct2
 
@@ -186,18 +199,6 @@ class TypedValues(
         else:
             raise TypeError(key)
 
-    def _typed_value_get(self, key, /, default=None):
-        check.issubclass(key, TypedValue)
-        try:
-            return self._dct2[key]
-        except KeyError:
-            if issubclass(key, UniqueTypedValue):
-                return default
-            elif default is not None:
-                return tuple(default)
-            else:
-                return ()
-
     _any_dct: dict[type, tuple[TypedValueT, ...]]
 
     def _typed_value_get_any(self, cls):
@@ -206,10 +207,12 @@ class TypedValues(
         except AttributeError:
             any_dct = {}
             self._any_dct = any_dct
+
         try:
             return any_dct[cls]
         except KeyError:
             pass
+
         ret = tuple(tv for tv in self if isinstance(tv, cls))
         any_dct[cls] = ret
         return ret

omlish/typedvalues/consumer.py

@@ -0,0 +1,175 @@
+# ruff: noqa: UP007
+import dataclasses as dc
+import typing as ta
+
+from .. import check
+from .. import lang
+from .values import ScalarTypedValue
+from .values import TypedValue
+from .values import UniqueTypedValue
+
+
+if ta.TYPE_CHECKING:
+    from . import collection as tvc
+else:
+    tvc = lang.proxy_import('.collection', __package__)
+
+
+TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
+TypedValueU = ta.TypeVar('TypedValueU', bound=TypedValue)
+
+UniqueTypedValueU = ta.TypeVar('UniqueTypedValueU', bound=UniqueTypedValue)
+
+
+##
+
+
+@dc.dataclass()
+class UnconsumedTypedValuesError(Exception):
+    values: ta.Sequence[TypedValue]
+
+
+class _NOT_SET(lang.Marker):  # noqa
+    pass
+
+
+class TypedValuesConsumer(ta.Generic[TypedValueT]):
+    def __init__(
+            self,
+            src: ta.Union[
+                'tvc.TypedValues',
+                ta.Iterable[tuple[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]],
+                ta.Mapping[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]],
+            ],
+    ) -> None:
+        super().__init__()
+
+        kvs: ta.Iterable[tuple[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]]
+        if isinstance(src, tvc.TypedValues):
+            kvs = src.items()
+        elif isinstance(src, ta.Mapping):
+            kvs = src.items()
+        else:
+            kvs = src
+
+        dct: dict = {}
+        for k, v in kvs:
+            check.not_in(k, dct)
+            dct[k] = v
+
+        self._dct: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = dct
+
+    #
+
+    def check_empty(self) -> None:
+        if bool(self._dct):
+            raise UnconsumedTypedValuesError(list(self))
+
+    def __enter__(self) -> 'TypedValuesConsumer[TypedValueT]':
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.check_empty()
+
+    #
+
+    def __iter__(self) -> ta.Iterator[TypedValueT]:
+        for v in self._dct.values():
+            if isinstance(v, tuple):
+                yield from v
+            else:
+                yield v
+
+    def __len__(self) -> int:
+        return len(self._dct)
+
+    def __bool__(self) -> bool:
+        return bool(self._dct)
+
+    #
+
+    def keys(self) -> ta.KeysView[type[TypedValueT]]:
+        return self._dct.keys()
+
+    def values(self) -> ta.ValuesView[TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.values()
+
+    def items(self) -> ta.ItemsView[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]]:
+        return self._dct.items()
+
+    #
+
+    @ta.overload
+    def pop(
+            self,
+            tv: UniqueTypedValueU,
+    ) -> UniqueTypedValueU:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[UniqueTypedValueU],
+            /,
+            default: UniqueTypedValueU,
+    ) -> UniqueTypedValueU:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[UniqueTypedValueU],
+            /,
+            default: UniqueTypedValueU | None,
+    ) -> UniqueTypedValueU | None:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[TypedValueU],
+    ) -> ta.Sequence[TypedValueU]:
+        ...
+
+    @ta.overload
+    def pop(
+            self,
+            cls: type[TypedValueU],
+            /,
+            default: ta.Iterable[TypedValueU],
+    ) -> ta.Sequence[TypedValueU]:
+        ...
+
+    def pop(self, key, /, default=_NOT_SET):
+        if not isinstance(key, type):
+            if default is not _NOT_SET:
+                raise RuntimeError('Must not provide both an instance key and a default')
+            default = key
+            key = type(default)
+
+        if (
+                issubclass(key, UniqueTypedValue) and
+                (utvc := key._unique_typed_value_cls) is not key  # noqa
+        ):
+            key = utvc
+
+        try:
+            return self._dct.pop(key)
+        except KeyError:
+            if default is not _NOT_SET:
+                return default
+            else:
+                raise
+
+    #
+
+    def pop_scalar_kwargs(self, **kwargs: type[TypedValueT]) -> dict[str, TypedValueT]:
+        dct: dict[str, TypedValueT] = {}
+        for k, vc in kwargs.items():
+            check.issubclass(vc, ScalarTypedValue)
+            try:
+                v = self.pop(vc)
+            except KeyError:
+                continue
+            dct[k] = v.v  # type: ignore[attr-defined]
+        return dct

omlish/typedvalues/holder.py

@@ -1,16 +1,14 @@
 import abc
 import typing as ta
 
-from .. import check
 from .. import lang
 from .accessor import TypedValuesAccessor
 from .collection import TypedValues
 from .generic import TypedValueGeneric
 from .values import TypedValue
-from .values import UniqueTypedValue
 
 
-TypedValueT = ta.TypeVar('TypedValueT', bound='TypedValue')
+TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
 
 
 ##
@@ -43,17 +41,6 @@ class TypedValueHolder(
         else:
             raise TypeError(key)
 
-    def _typed_value_get(self, key, /, default=None):
-        if (tvs := self._typed_values) is not None:
-            return tvs.get(key, default)
-        check.issubclass(key, TypedValue)
-        if issubclass(key, UniqueTypedValue):
-            return default
-        elif default is not None:
-            return list(default)
-        else:
-            return []
-
     def _typed_value_get_any(self, cls):
         if (tvs := self._typed_values) is not None:
             return tvs.get_any(cls)

{omlish-0.0.0.dev293.dist-info → omlish-0.0.0.dev294.dist-info}/METADATA

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

{omlish-0.0.0.dev293.dist-info → omlish-0.0.0.dev294.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=y6FOK7bieQR8UYCmv5o1Qd1PcE1UydQsZmqYPy5X0dQ,3444
+omlish/__about__.py,sha256=h0CCG_UNc66bAsV21kg7z2dMtYQmx6M9HituQ3gMevU,3444
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -625,7 +625,7 @@ omlish/secrets/marshal.py,sha256=u90n1OfRfdpH1T2F0xK_pAPH1ENYL6acFt6XdVd3KvI,198
 omlish/secrets/openssl.py,sha256=UT_dXJ4zA1s9e-UHoW_NLGHQO7iouUNPnJNkkpuw3JI,6213
 omlish/secrets/pwgen.py,sha256=5k7QMSysUfv9F65TDMdDlrhTIKy6QbMG3KT2HNVmnVg,1712
 omlish/secrets/pwhash.py,sha256=Jctv3QzcMvVPXJsWA3w3LDUlzmyUDGEWG9sLiJz1xaw,4107
-omlish/secrets/secrets.py,sha256=h5OdFDgnhXVlPlkOkoE64MOeVzExmtVVYIxJyuQbRec,8009
+omlish/secrets/secrets.py,sha256=-U3VeyIswWcYh1zSuvjE2I7QTXyoH7UMzqNJTclnDCs,8029
 omlish/secrets/ssl.py,sha256=_72xTNP6a1Xw0Pweuow9WK5yveqJ7hmjhala9iMnrAk,152
 omlish/secrets/subprocesses.py,sha256=ZdShw4jrGDdyQW8mRMgl106-9qpCEq2J6w_x7ruz1wk,1217
 omlish/secrets/tempssl.py,sha256=X_cAQbeaz-YcH8SzQ0luYTktIGJv4KMpfTD3t9l9Gqk,1879
@@ -824,17 +824,18 @@ omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
 omlish/text/templating.py,sha256=azhKpvkDR2uby8k3AJ8Y6GpdKVQUb7Xt_cGbDz6dkTM,2454
 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=p5qfXsxpVeOfyHLUJrlOE2FIDPg3OmGoL_sWDXS8eTU,591
-omlish/typedvalues/accessor.py,sha256=LOyvNHLpDPyyoITdufsnbk_5QccGsZgDG5-yTjxvD2M,2932
-omlish/typedvalues/collection.py,sha256=Nc-5mbnZhlwmM7jTCo7oQQzbGxuhOvIW99FYbAFW6GA,5835
+omlish/typedvalues/__init__.py,sha256=nzpnoRW_wScMPit5Xz37ky3nKBdzzkgtnQA4SfVHN8E,684
+omlish/typedvalues/accessor.py,sha256=5q-JbIUjhzmW6Ui55YepHc1FDAlV13Whkz_TVNvtQ9Q,3064
+omlish/typedvalues/collection.py,sha256=a6Je_kmz2FlAV2dI92S7c_paXge0QExMynV-fD9oPrs,5823
+omlish/typedvalues/consumer.py,sha256=peDQAgriSyBx_Hc8QHAhEgYy0oSS52qQ_7Tqdssl2AE,4375
 omlish/typedvalues/generic.py,sha256=byWG_gMXhNelckUwdmOoJE9FKkL71Q4BSi4ZLyy0XZ0,788
-omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,1554
+omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,1128
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=CEL8xeeneJBe8CrV3NXyZcC6sZ0FR6Cgz2YtaCBug6A,1359
-omlish-0.0.0.dev293.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev293.dist-info/METADATA,sha256=N7qy2wkob-bA6_hhlB9z7YHoKuuAPsIhawoFZcZLEL4,4316
-omlish-0.0.0.dev293.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omlish-0.0.0.dev293.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev293.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev293.dist-info/RECORD,,
+omlish-0.0.0.dev294.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev294.dist-info/METADATA,sha256=LOvDXgRmMOuG2yUn4QvyNJBuAmrFqRtSTlmKv_rv1Vk,4316
+omlish-0.0.0.dev294.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omlish-0.0.0.dev294.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev294.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev294.dist-info/RECORD,,