omlish 0.0.0.dev338__py3-none-any.whl → 0.0.0.dev339__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev338'
-__revision__ = '8d983648c5770796c8addb2cf217a0d7235a9b29'
+__version__ = '0.0.0.dev339'
+__revision__ = '0d8d4714d9a9ea7145586e0bce55833b86e980bd'
 
 
 #

omlish/lang/__init__.py

@@ -61,12 +61,21 @@ from .classes.abstract import (  # noqa
     unabstract_class,
 )
 
+from .classes.bindable import (  # noqa
+    BindableClass,
+)
+
 from .classes.namespaces import (  # noqa
     GenericNamespaceMeta,
     Namespace,
     NamespaceMeta,
 )
 
+from .classes.protocols import (  # noqa
+    ProtocolForbiddenAsBaseClass,
+    ProtocolForbiddenAsBaseClassTypeError,
+)
+
 from .classes.restrict import (  # noqa
     AnySensitive,
     Final,

omlish/lang/classes/bindable.py

@@ -0,0 +1,41 @@
+import typing as ta
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+class _ClassOrInstanceMethod:
+    def __init__(self, func):
+        super().__init__()
+
+        self.__func__ = func
+
+    def __get__(self, instance, owner=None):
+        return self.__func__.__get__(instance if instance is not None else owner)
+
+
+class BindableClass(ta.Generic[T]):
+    # FIXME: apparently can't have TypeVars in ClassVars, but could stick in a @classmethod (which gets transformed)...
+    _bound: ta.ClassVar[type[T] | None] = None  # type: ignore[misc]
+
+    def __init__(self, *, _bound):
+        super().__init__()
+
+        setattr(self, '_bound', _bound)
+
+    def __class_getitem__(cls, *args, **kwargs):
+        if cls is BindableClass:
+            return super().__class_getitem__(*args, **kwargs)  # type: ignore[misc]
+
+        [bind_cls] = args
+        return cls(_bound=bind_cls)
+
+    def __init_subclass__(cls, **kwargs):
+        super().__init_subclass__(**kwargs)
+
+        for k, v in cls.__dict__.items():
+            if isinstance(v, classmethod):
+                setattr(cls, k, _ClassOrInstanceMethod(v.__func__))

omlish/lang/classes/protocols.py

@@ -0,0 +1,26 @@
+import typing as ta
+
+
+##
+
+
+class ProtocolForbiddenAsBaseClass(ta.Protocol):
+    pass
+
+
+class ProtocolForbiddenAsBaseClassTypeError(TypeError):
+    pass
+
+
+def _ProtocolForbiddenAsBaseClass__init_subclass__(cls: ta.Any, **kwargs: ta.Any) -> None:  # noqa
+    if ta.Protocol not in cls.__mro__:
+        raise TypeError(f'Class {cls} must be a Protocol')
+
+    super(ProtocolForbiddenAsBaseClass, cls).__init_subclass__(**kwargs)  # noqa
+
+    # TODO: ta.Protocol not in cls.__bases__ ?
+    if not cls.__dict__['_is_protocol']:
+        raise ProtocolForbiddenAsBaseClassTypeError(cls)
+
+
+setattr(ProtocolForbiddenAsBaseClass, '__init_subclass__', classmethod(_ProtocolForbiddenAsBaseClass__init_subclass__))

omlish/testing/pytest/plugins/switches/plugin.py

@@ -3,6 +3,7 @@ TODO:
  - inheritance
  - dynamic registration
  - dynamic switching (skip docker if not running, skip online if not online, ...)
+ - probably make IF_SINGLE understand parametErization
 """
 import dataclasses as dc
 import typing as ta
@@ -121,6 +122,7 @@ class SwitchesPlugin:
     def pytest_sessionstart(self, session):
         session.stash[self._states_key] = self._States(session)
 
+    @pytest.hookimpl(tryfirst=True)
     def pytest_collection_modifyitems(self, config, items):
         def process_item(item):
             state: SwitchesPlugin._States = item.session.stash[self._states_key]

omlish/testing/pytest/skip.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - if_not_single? switches does this
+"""
 import shutil
 import sys
 import sysconfig
@@ -11,8 +15,9 @@ from ... import lang
 ##
 
 
-def if_cant_import(module: str, *args, **kwargs):
-    return pytest.mark.skipif(not lang.can_import(module, *args, **kwargs), reason=f'requires import {module}')
+def if_cant_import(*modules: str, **kwargs):
+    missing = [m for m in modules if not lang.can_import(m, **kwargs)]
+    return pytest.mark.skipif(bool(missing), reason=f'requires import {", ".join(missing)}')
 
 
 def if_not_on_path(exe: str):
@@ -27,11 +32,5 @@ def if_not_platform(*platforms: str):
     return pytest.mark.skipif(sys.platform not in platforms, reason=f'requires platform in {platforms}')
 
 
-def if_not_single():
-    # FIXME
-    # [resolve_collection_argument(a) for a in session.config.args]
-    raise NotImplementedError
-
-
 def if_nogil():
     return pytest.mark.skipif(sysconfig.get_config_var('Py_GIL_DISABLED'), reason='requires gil build')

omlish/typedvalues/__init__.py

@@ -22,6 +22,10 @@ from .holder import (  # noqa
     TypedValueHolder,
 )
 
+from .of_ import (  # noqa
+    of,
+)
+
 from .reflect import (  # noqa
     reflect_typed_values_impls,
 )

omlish/typedvalues/accessor.py

@@ -27,7 +27,11 @@ class _NOT_SET(lang.Marker):  # noqa
     pass
 
 
-class TypedValuesAccessor(lang.Abstract, ta.Sequence[TypedValueT0]):
+class TypedValuesAccessor(
+    lang.Abstract,
+    ta.Sequence[TypedValueT0],
+    ta.Generic[TypedValueT0],
+):
     def __iter__(self):
         raise TypeError(
             'TypedValuesAccessor does not implement __iter__ - it is reserved for implementation by subclasses.',

omlish/typedvalues/collection.py

@@ -10,6 +10,7 @@ from .values import UniqueTypedValue
 
 
 TypedValueT = ta.TypeVar('TypedValueT', bound='TypedValue')
+TypedValueU = ta.TypeVar('TypedValueU', bound='TypedValue')
 
 UniqueTypedValueT = ta.TypeVar('UniqueTypedValueT', bound='UniqueTypedValue')
 

omlish/typedvalues/of_.py

@@ -0,0 +1,51 @@
+import typing as ta
+
+from .. import lang
+from .collection import TypedValues
+from .consumer import TypedValuesConsumer
+from .values import TypedValue
+
+
+TypedValueT = ta.TypeVar('TypedValueT', bound=TypedValue)
+
+
+##
+
+
+class _TypedValuesOf(lang.BindableClass[TypedValueT]):  # noqa
+    @classmethod
+    def collect(
+            cls,
+            *tvs: TypedValueT,
+            override: bool = False,
+            check_type: bool | type | tuple[type, ...] | None = None,
+    ) -> TypedValues[TypedValueT]:  # noqa
+        if isinstance(check_type, bool):
+            if check_type:
+                if cls._bound is None:
+                    raise TypeError('TypedValues.of unbound, cannot use check_type=True')
+                check_type = cls._bound
+            else:
+                check_type = None
+
+        return TypedValues(
+            *tvs,
+            override=override,
+            check_type=check_type,
+        )
+
+    @classmethod
+    def consume(
+            cls,
+            *tvs: TypedValueT,
+            override: bool = False,
+            check_type: bool | type | tuple[type, ...] | None = None,
+    ) -> TypedValuesConsumer[TypedValueT]:
+        return cls.collect(
+            *tvs,
+            override=override,
+            check_type=check_type,
+        ).consume()
+
+
+of = _TypedValuesOf

{omlish-0.0.0.dev338.dist-info → omlish-0.0.0.dev339.dist-info}/METADATA

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

{omlish-0.0.0.dev338.dist-info → omlish-0.0.0.dev339.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=p63JDbIzq9Uyt4DamGvFNixWASVUZ_s5JryuZGRCE5I,3478
+omlish/__about__.py,sha256=9rj0m3n7RBQVQZMvY6T23ySBhV_U7yrnp5EbbcfsW48,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=YuPEZ3sIP6q5gGbISbQQ_CsOU5Zlu_IXHqxjO7muI-4,6251
+omlish/lang/__init__.py,sha256=nFH_r4AnosVDh6gyQ-2-y5OBgWiRik_Mx5hcN0TItdg,6434
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -433,7 +433,9 @@ omlish/lang/cached/function.py,sha256=su9QxYECK9NK-UfMFKbgx4lqH2WoGBiYshnEfaGvfh
 omlish/lang/cached/property.py,sha256=WHYyg4-6EA86TcNMfbXTjVhjEZPc0kngt9hfY3WN5w8,2768
 omlish/lang/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/lang/classes/abstract.py,sha256=A-Jg5X8o_WvFryN0Cm2TpVkrZoTT1SYKQnv_pXjZk7o,3808
+omlish/lang/classes/bindable.py,sha256=ekVyOxrM9kQ9AtI9Zzc89zP_JBfJizIThKFNw4YZtS8,1096
 omlish/lang/classes/namespaces.py,sha256=_FBLekx2gNLql1C1ZRlpBtxuLWbcdFEzBm8CrD5XeOA,3589
+omlish/lang/classes/protocols.py,sha256=T98ZsHLgzw8hPvvNluxoreevoF8fD4zs8SwcnTXkLuY,701
 omlish/lang/classes/restrict.py,sha256=Ki-UOc2yUVteqC7i_EgIVpeEcnvRHVczjts5Fyiz7Mk,4125
 omlish/lang/classes/simple.py,sha256=2C7u8k0K75xzcr6DT8zYd8U-1Yr_Xq1pfF3a0J6wo3g,2538
 omlish/lang/classes/virtual.py,sha256=z0MYQD9Q5MkX8DzF325wDB4J9XoYbsB09jZ1omC62To,3366
@@ -743,7 +745,7 @@ omlish/testing/testing.py,sha256=zmBHw5gw1ZUUcDYC0uonSThjhRn0HNuorjpo0jLvju8,288
 omlish/testing/pytest/__init__.py,sha256=i4ti6Q2rVYJ-XBk9UYDfUUagCrEDTC5jOeSykBjYYZQ,234
 omlish/testing/pytest/helpers.py,sha256=HxiKvpJQ4b6WCiQXOqQTqKbmr7CMAgCF6hViT6pfIuw,202
 omlish/testing/pytest/marks.py,sha256=qhVnq-3LlQ5uRLS1LXYkh8Xk-8aQGOgs2Nr49T8YqOA,280
-omlish/testing/pytest/skip.py,sha256=imDrBhQKQkEmStaSn0Js-zsfyKMPmNod-mW1ANdIhak,989
+omlish/testing/pytest/skip.py,sha256=tra8FM5CZTh4M7ZWVf9YPmKUX4yhesf61XRoIkO4s9c,954
 omlish/testing/pytest/inject/__init__.py,sha256=pdRKv1HcDmJ_yArKJbYITPXXZthRSGgBJWqITr0Er38,117
 omlish/testing/pytest/inject/harness.py,sha256=_Qf7lLcYc_dpauYOE68u_a65jPCFWmQUYv9m_OOdNqs,5724
 omlish/testing/pytest/plugins/__init__.py,sha256=ys1zXrYrNm7Uo6YOIVJ6Bd3dQo6kv387k7MbTYlqZSI,467
@@ -767,7 +769,7 @@ omlish/testing/pytest/plugins/asyncs/backends/base.py,sha256=fTZ6R_iKpAp-8DVw8js
 omlish/testing/pytest/plugins/asyncs/backends/trio.py,sha256=xty9TR7-Kk6n0cdOqErLilPLLCchJe6zmEyhpypTmKM,3330
 omlish/testing/pytest/plugins/asyncs/backends/trio_asyncio.py,sha256=VcGVwf4V-1ZFK_70FrFS9b11EU1dOy1ozhhIDXGNSEo,3169
 omlish/testing/pytest/plugins/switches/__init__.py,sha256=KTdm9xe8AYQvNT-IKSGr9O8q_hgRGEqhK3zcto0EbWk,43
-omlish/testing/pytest/plugins/switches/plugin.py,sha256=kHHXpawEgyDMzvcLgfdYBUhcCML2xAo9sdJ6611sm-M,5744
+omlish/testing/pytest/plugins/switches/plugin.py,sha256=RBxjefl9RDJuSmT_W0lTSd9DlAT-nkyy_U2fBYzdWNs,5835
 omlish/testing/pytest/plugins/switches/switches.py,sha256=lj8S9RMwUAW7a93ZqqTjoD4dRVkeGts2sl8Cn-H17hc,1890
 omlish/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/asdl.py,sha256=AS3irh-sag5pqyH3beJif78PjCbOaFso1NeKq-HXuTs,16867
@@ -852,18 +854,19 @@ omlish/text/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B
 omlish/text/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 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=TjNuEEyTXbGfbsk7nvBB_Jhgz94R5JSs0u6ocNAlj3Y,5511
+omlish/typedvalues/__init__.py,sha256=Br1vFbV-dEjAfBbZ9Zg2xCGO87U6kduxxq69lrMRODw,722
+omlish/typedvalues/accessor.py,sha256=959QsdK1zildcBTvFKSA6uAgi7SSo2RPKqcKWsuEZrM,3162
+omlish/typedvalues/collection.py,sha256=QxQwaSmJGF2oAWAv2CZkgpOljbnxor104XOrCD0v1a8,5571
 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=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0,4956
+omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev338.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev338.dist-info/METADATA,sha256=ZPnPJxCXqfpdEK-ad8rFWYgxjkUBGLj97TEUYcPQ6dc,4416
-omlish-0.0.0.dev338.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev338.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev338.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev338.dist-info/RECORD,,
+omlish-0.0.0.dev339.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev339.dist-info/METADATA,sha256=Bx0Qfyj8FjWFBV_s8fjqv2aA13OgX8R1SCRM5RKTMSU,4416
+omlish-0.0.0.dev339.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev339.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev339.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev339.dist-info/RECORD,,