omlish 0.0.0.dev340__py3-none-any.whl → 0.0.0.dev342__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev340'
-__revision__ = 'de9a88b0e8d5578e5348e4f23db01e09dd3ebbd0'
+__version__ = '0.0.0.dev342'
+__revision__ = '37c634909aaecb50fcea253cc6c335d8d906c25f'
 
 
 #

omlish/check.py

@@ -14,6 +14,10 @@ from .lite.check import Checks
 from .lite.check import check
 
 
+T = ta.TypeVar('T')
+SizedT = ta.TypeVar('SizedT', bound=ta.Sized)
+
+
 _isinstance = isinstance
 _issubclass = issubclass
 _callable = callable
@@ -22,8 +26,12 @@ _callable = callable
 ##
 
 
-register_on_raise = check.register_on_raise
-unregister_on_raise = check.unregister_on_raise
+def register_on_raise(fn: OnRaiseFn) -> None:
+    check.register_on_raise(fn)
+
+
+def unregister_on_raise(fn: OnRaiseFn) -> None:
+    check.unregister_on_raise(fn)
 
 
 ##
@@ -57,48 +65,207 @@ check.register_late_configure(_try_enable_args_rendering)
 
 
 ##
+# The following code manually proxies to the lite code, as opposed to simply assigning global names to instance methods
+# of `check`, to assist type analysis in tools - pycharm for example has a hard time deducing the return types in such
+# cases. The functions are however dynamically overwritten below with direct references to the method to remove one
+# layer of call indirection at runtime.
+
+
+_CHECK_PROXY_FUNCTIONS: dict[str, ta.Any] = {}
+
+
+def _check_proxy_function(fn: T) -> T:
+    name = fn.__name__  # type: ignore[attr-defined]
+    if name in _CHECK_PROXY_FUNCTIONS:
+        raise NameError(fn)
+    _CHECK_PROXY_FUNCTIONS[name] = fn
+    return fn
+
+
+##
+
+
+@ta.overload
+def isinstance(v: ta.Any, spec: type[T], msg: Message = None) -> T:  # noqa
+    ...
+
+
+@ta.overload
+def isinstance(v: ta.Any, spec: ta.Any, msg: Message = None) -> ta.Any:  # noqa
+    ...
+
+
+@_check_proxy_function
+def isinstance(v, spec, msg=None):  # noqa
+    return check.isinstance(v, spec, msg=msg)
+
+
+@ta.overload
+def of_isinstance(spec: type[T], msg: Message = None) -> ta.Callable[[ta.Any], T]:
+    ...
+
 
+@ta.overload
+def of_isinstance(spec: ta.Any, msg: Message = None) -> ta.Callable[[ta.Any], ta.Any]:
+    ...
+
+
+@_check_proxy_function
+def of_isinstance(spec, msg=None):
+    return check.of_isinstance(spec, msg=msg)
+
+
+@_check_proxy_function
+def cast(v: ta.Any, cls: type[T], msg: Message = None) -> T:
+    return check.cast(v, cls, msg=msg)
+
+
+@_check_proxy_function
+def of_cast(cls: type[T], msg: Message = None) -> ta.Callable[[T], T]:
+    return check.of_cast(cls, msg=msg)
+
+
+@_check_proxy_function
+def not_isinstance(v: T, spec: ta.Any, msg: Message = None) -> T:
+    return check.not_isinstance(v, spec, msg=msg)
+
+
+@_check_proxy_function
+def of_not_isinstance(spec: ta.Any, msg: Message = None) -> ta.Callable[[T], T]:
+    return check.of_not_isinstance(spec, msg=msg)
 
-isinstance = check.isinstance  # noqa
-of_isinstance = check.of_isinstance
-cast = check.cast
-of_cast = check.of_cast
-not_isinstance = check.not_isinstance
-of_not_isinstance = check.of_not_isinstance
 
 #
 
-issubclass = check.issubclass  # noqa
-not_issubclass = check.not_issubclass
+
+@_check_proxy_function
+def issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:  # noqa
+    return check.issubclass(v, spec, msg=msg)
+
+
+@_check_proxy_function
+def not_issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:
+    return check.not_issubclass(v, spec, msg=msg)
+
 
 #
 
-in_ = check.in_
-not_in = check.not_in
-empty = check.empty
-iterempty = check.iterempty
-not_empty = check.not_empty
-unique = check.unique
-single = check.single
-opt_single = check.opt_single
+
+@_check_proxy_function
+def in_(v: T, c: ta.Container[T], msg: Message = None) -> T:
+    return check.in_(v, c, msg=msg)
+
+
+@_check_proxy_function
+def not_in(v: T, c: ta.Container[T], msg: Message = None) -> T:
+    return check.not_in(v, c, msg=msg)
+
+
+@_check_proxy_function
+def empty(v: SizedT, msg: Message = None) -> SizedT:
+    return check.empty(v, msg=msg)
+
+
+@_check_proxy_function
+def iterempty(v: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
+    return check.iterempty(v, msg=msg)
+
+
+@_check_proxy_function
+def not_empty(v: SizedT, msg: Message = None) -> SizedT:
+    return check.not_empty(v, msg=msg)
+
+
+@_check_proxy_function
+def unique(it: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
+    return check.unique(it, msg=msg)
+
+
+@_check_proxy_function
+def single(obj: ta.Iterable[T], msg: Message = None) -> T:
+    return check.single(obj, msg=msg)
+
+
+@_check_proxy_function
+def opt_single(obj: ta.Iterable[T], msg: Message = None) -> T | None:
+    return check.opt_single(obj, msg=msg)
+
 
 #
 
-none = check.none
-not_none = check.not_none
+
+@_check_proxy_function
+def none(v: ta.Any, msg: Message = None) -> None:
+    return check.none(v, msg=msg)
+
+
+@_check_proxy_function
+def not_none(v: T | None, msg: Message = None) -> T:
+    return check.not_none(v, msg=msg)
+
 
 #
 
-equal = check.equal
-not_equal = check.not_equal
-is_ = check.is_
-is_not = check.is_not
-callable = check.callable  # noqa
-non_empty_str = check.non_empty_str
-replacing = check.replacing
-replacing_none = check.replacing_none
+
+@_check_proxy_function
+def equal(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.equal(v, o, msg=msg)
+
+
+@_check_proxy_function
+def not_equal(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.not_equal(v, o, msg=msg)
+
+
+@_check_proxy_function
+def is_(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.is_(v, o, msg=msg)
+
+
+@_check_proxy_function
+def is_not(v: T, o: ta.Any, msg: Message = None) -> T:
+    return check.is_not(v, o, msg=msg)
+
+
+@_check_proxy_function
+def callable(v: T, msg: Message = None) -> T:  # noqa
+    return check.callable(v, msg=msg)
+
+
+@_check_proxy_function
+def non_empty_str(v: str | None, msg: Message = None) -> str:
+    return check.non_empty_str(v, msg=msg)
+
+
+@_check_proxy_function
+def replacing(expected: ta.Any, old: ta.Any, new: T, msg: Message = None) -> T:
+    return check.replacing(expected, old, new, msg=msg)
+
+
+@_check_proxy_function
+def replacing_none(old: ta.Any, new: T, msg: Message = None) -> T:
+    return check.replacing_none(old, new, msg=msg)
+
 
 #
 
-arg = check.arg
-state = check.state
+
+@_check_proxy_function
+def arg(v: bool, msg: Message = None) -> None:
+    return check.arg(v, msg=msg)
+
+
+@_check_proxy_function
+def state(v: bool, msg: Message = None) -> None:
+    return check.state(v, msg=msg)
+
+
+##
+
+
+def _install_direct_check_proxy_functions() -> None:
+    for n in _CHECK_PROXY_FUNCTIONS:
+        globals()[n] = getattr(check, n)
+
+
+_install_direct_check_proxy_functions()

omlish/lite/check.py

@@ -177,7 +177,7 @@ class Checks:
 
         return inner
 
-    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None) -> T:  # noqa
+    def cast(self, v: ta.Any, cls: ta.Type[T], msg: CheckMessage = None) -> T:
         if not isinstance(v, cls):
             self._raise(
                 TypeError,
@@ -226,7 +226,7 @@ class Checks:
 
         return v
 
-    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:  # noqa
+    def not_issubclass(self, v: ta.Type[T], spec: ta.Any, msg: CheckMessage = None) -> ta.Type[T]:
         if issubclass(v, spec):
             self._raise(
                 TypeError,
@@ -317,21 +317,21 @@ class Checks:
 
         return it
 
-    def single(self, obj: ta.Iterable[T], message: CheckMessage = None) -> T:
+    def single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> T:
         try:
             [value] = obj
         except ValueError:
             self._raise(
                 ValueError,
                 'Must be single',
-                message,
+                msg,
                 Checks._ArgsKwargs(obj),
                 render_fmt='%s',
             )
 
         return value
 
-    def opt_single(self, obj: ta.Iterable[T], message: CheckMessage = None) -> ta.Optional[T]:
+    def opt_single(self, obj: ta.Iterable[T], msg: CheckMessage = None) -> ta.Optional[T]:
         it = iter(obj)
         try:
             value = next(it)
@@ -346,7 +346,7 @@ class Checks:
         self._raise(
             ValueError,
             'Must be empty or single',
-            message,
+            msg,
             Checks._ArgsKwargs(obj),
             render_fmt='%s',
         )

omlish/logs/standard.py

@@ -39,7 +39,7 @@ class StandardLogFormatter(logging.Formatter):
     converter = datetime.datetime.fromtimestamp  # type: ignore
 
     def formatTime(self, record, datefmt=None):
-        ct = self.converter(record.created)  # type: ignore
+        ct = self.converter(record.created)
         if datefmt:
             return ct.strftime(datefmt)  # noqa
         else:

omlish/reflect/types.py

@@ -385,17 +385,19 @@ class Reflector:
                     obj,
                 )
 
+            r_args = tuple(self.type(a) for a in args)
+
             if _is_immediate_protocol(origin):
                 return Protocol(
                     origin,
-                    args,
+                    r_args,
                     params,
                     obj,
                 )
 
             return Generic(
                 origin,
-                tuple(self.type(a) for a in args),
+                r_args,
                 params,
                 obj,
             )

omlish/typedvalues/__init__.py

@@ -6,12 +6,17 @@ from .collection import (  # noqa
     DuplicateUniqueTypedValueError,
 
     TypedValues,
+
+    collect,
+    as_collection,
 )
 
 from .consumer import (  # noqa
     UnconsumedTypedValuesError,
 
     TypedValuesConsumer,
+
+    consume,
 )
 
 from .generic import (  # noqa

omlish/typedvalues/collection.py

@@ -205,3 +205,13 @@ class TypedValues(
         ret = tuple(tv for tv in self if isinstance(tv, cls))
         any_dct[cls] = ret
         return ret
+
+
+collect = TypedValues
+
+
+def as_collection(src: ta.Sequence[TypedValueT]) -> TypedValues[TypedValueT]:
+    if isinstance(src, TypedValues):
+        return src
+    else:
+        return TypedValues(*src)

omlish/typedvalues/consumer.py

@@ -173,3 +173,15 @@ class TypedValuesConsumer(ta.Generic[TypedValueT]):
                 continue
             dct[k] = v.v  # type: ignore[attr-defined]
         return dct
+
+
+def consume(
+    *tvs: TypedValueT,
+    override: bool = False,
+    check_type: type | tuple[type, ...] | None = None,
+) -> TypedValuesConsumer[TypedValueT]:
+    return tvc.TypedValues(
+        *tvs,
+        override=override,
+        check_type=check_type,
+    ).consume()

{omlish-0.0.0.dev340.dist-info → omlish-0.0.0.dev342.dist-info}/METADATA

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

{omlish-0.0.0.dev340.dist-info → omlish-0.0.0.dev342.dist-info}/RECORD

@@ -1,9 +1,9 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=6UJoYTHXIFWagDFn93wfY_32T-1b-9-HV7hM8VXYLNE,3478
+omlish/__about__.py,sha256=h_piuyiG-CBdDD0iiqc_k8SApwpVT4rdvA81oh0ud9g,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
-omlish/check.py,sha256=VcvqYk3lbxUx3zmbln9tCQsyahTXck0Mg4nIPy-DdOc,2383
+omlish/check.py,sha256=DDNZnLxNoY2Y7N0Hz7nMR1q912ZzRLoBgOJVLcsXVws,6575
 omlish/datetimes.py,sha256=iFqCki3MKmBq_ZX-03cW4KE6AsR_pUJCWML2ifBLtdU,2157
 omlish/defs.py,sha256=-4UuZoJUUNO_bZ6eSSdhR4CK4NKN2Wwr1FfUvfTF--8,4918
 omlish/dynamic.py,sha256=zy0oO70_Vlh5dW8Nwav_O9bhIzQ6L16UgSuKR6y43VU,6526
@@ -449,7 +449,7 @@ omlish/lifecycles/states.py,sha256=zqMOU2ZU-MDNnWuwauM3_anIAiXM8LoBDElDEraptFg,1
 omlish/lifecycles/transitions.py,sha256=qQtFby-h4VzbvgaUqT2NnbNumlcOx9FVVADP9t83xj4,1939
 omlish/lite/__init__.py,sha256=ISLhM4q0LR1XXTCaHdZOZxBRyIsoZqYm4u0bf1BPcVk,148
 omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
-omlish/lite/check.py,sha256=d3622_iX19iAL-B9QtucLbAt7Z0cZAvJEHOJBVhg3Og,13886
+omlish/lite/check.py,sha256=Mqp-0Ky8WKuut0aNVR4Nfjw2QQ7GunI3cMfLR-nLNXI,13854
 omlish/lite/configs.py,sha256=Ev_19sbII67pTWzInYjYqa9VyTiZBvyjhZqyG8TtufE,908
 omlish/lite/contextmanagers.py,sha256=WrL2NPT7OA5JvHp4H-opwsCpYTHod27EJ4qB1cJ9Mjc,5691
 omlish/lite/dataclasses.py,sha256=t1G5-xOuvE6o6w9RyqHzLT9wHD0HkqBh5P8HUZWxGzs,1912
@@ -482,7 +482,7 @@ omlish/logs/json.py,sha256=muekHkKmGIqq_wr-tV94WwXjNFtUBbFeRdni-JhrCkA,1371
 omlish/logs/noisy.py,sha256=hWpbseerZqlHdEPEajDTSmcRhx8LmmNAxz_7GBZAO9s,353
 omlish/logs/protocol.py,sha256=dfAR0_5kLEAkx0nhuWBhWMTVjWjhEl2uL-MxejrW1lk,4732
 omlish/logs/proxy.py,sha256=9FmqWQuX3pXezWkCeN17H805CicKN6-QqMKGptk45PI,2378
-omlish/logs/standard.py,sha256=FbKdF2Z4Na5i2TNwKn0avLJXyICe2JKsPufjvKCHGn0,3162
+omlish/logs/standard.py,sha256=tT9HtpvCRrJaJSc5K9pTBxv6o6O-Zv5jHkzv059aStc,3146
 omlish/logs/timing.py,sha256=XrFUHIPT4EHDujLKbGs9fGFMmoM3NEP8xPRaESJr7bQ,1513
 omlish/logs/utils.py,sha256=OkFWf1exmWImmT7BaSiIC7c0Fk9tAis-PRqo8H4ny3c,398
 omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -570,7 +570,7 @@ omlish/reflect/__init__.py,sha256=9pzXLXXNMHkLhhI79iUr-o0SMOtR6HMUmAEUplZkIdE,85
 omlish/reflect/inspect.py,sha256=WCo2YpBYauKw6k758FLlZ_H4Q05rgVPs96fEv9w6zHQ,1538
 omlish/reflect/ops.py,sha256=RxUc9sFZxYP_f5y-jU2DujFLkzhzx8DsyITShPSpW3U,2614
 omlish/reflect/subst.py,sha256=jpBgYR1_JyH9fz5b-gmOg7OhFKk7jIxEh7hwtKYKC9Q,3691
-omlish/reflect/types.py,sha256=C3NsAQFam_9mXhvSUa0H0RnJxhVAzIbY1Z_WHXHcNcs,11213
+omlish/reflect/types.py,sha256=2LJjaa2SuyhmeMh4Vmrgq-pdqQ-diKGAJJv9ln-wKrg,11244
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/secrets/all.py,sha256=gv_d9SfyMxso30HsrSz9XmIrSZOdl3rLA5MSH0ZXfgM,486
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
@@ -854,19 +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=Br1vFbV-dEjAfBbZ9Zg2xCGO87U6kduxxq69lrMRODw,722
+omlish/typedvalues/__init__.py,sha256=vYdqZdjczcNrHVI35UxLH0z23dvLTzXjFeecrq2Ep-8,769
 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/collection.py,sha256=vqYkO1R_LB-RE_aRHwIsKZB3gV7OpZQKJz-1SzWADIg,5774
+omlish/typedvalues/consumer.py,sha256=Apw1s7eedbKeTNMk5BITCJISA_7hPNqi2tWK15g3e1M,4651
 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.dev340.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev340.dist-info/METADATA,sha256=C8Px98rFp8jX4oXUDcpPH5CJ5UFR9qVA5TcDjeu07KA,4416
-omlish-0.0.0.dev340.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev340.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev340.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev340.dist-info/RECORD,,
+omlish-0.0.0.dev342.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev342.dist-info/METADATA,sha256=TPlLZlee7l-FgQDJWRp5jML5a8wgTpiQgOyl9g6l-eQ,4416
+omlish-0.0.0.dev342.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev342.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev342.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev342.dist-info/RECORD,,