omlish 0.0.0.dev60__py3-none-any.whl → 0.0.0.dev62__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev60'
-__revision__ = 'eb96b2408cdf5b153541f194ea5ab7bba1c2524b'
+__version__ = '0.0.0.dev62'
+__revision__ = 'a5ef2d1548d1cdfb856b4a7ff99fe61080ab791e'
 
 
 #

omlish/bootstrap/diag.py

@@ -17,6 +17,7 @@ if ta.TYPE_CHECKING:
     import cProfile  # noqa
     import pstats
 
+    from ..diag import debug as ddbg
     from ..diag import pycharm as diagpc
     from ..diag import replserver as diagrs
     from ..diag import threads as diagt
@@ -25,6 +26,7 @@ else:
     cProfile = lang.proxy_import('cProfile')  # noqa
     pstats = lang.proxy_import('pstats')
 
+    ddbg = lang.proxy_import('..diag.debug', __package__)
     diagpc = lang.proxy_import('..diag.pycharm', __package__)
     diagrs = lang.proxy_import('..diag.replserver', __package__)
     diagt = lang.proxy_import('..diag.threads', __package__)
@@ -200,3 +202,20 @@ class ReplServerBootstrap(ContextBootstrap['ReplServerBootstrap.Config']):
             thread.start()
 
             yield
+
+
+##
+
+
+class DebugBootstrap(ContextBootstrap['DebugBootstrap.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Bootstrap.Config):
+        enable: bool = False
+
+    @contextlib.contextmanager
+    def enter(self) -> ta.Iterator[None]:
+        if not self._config.enable:
+            return
+
+        with ddbg.debugging_on_exception():
+            yield

omlish/bootstrap/harness.py

@@ -16,8 +16,6 @@ TODO diag:
 
 
 TODO new items:
- - debugging / pdb
-  - https://github.com/inducer/pudb
  - packaging fixups
  - daemonize ( https://github.com/thesharp/daemonize/blob/master/daemonize.py )
 """

omlish/bootstrap/main.py

@@ -1,13 +1,15 @@
 """
 TODO:
  - -x / --exec - os.exec entrypoint
-  - refuse to install non-exec-relevant Bootstraps when chosen
+ - refuse to install non-exec-relevant Bootstraps when chosen
 """
 # ruff: noqa: UP006 UP007
 import argparse
 import dataclasses as dc
 import io
 import itertools
+import os
+import shutil
 import sys
 import typing as ta
 
@@ -152,18 +154,36 @@ def _main() -> int:
     _add_arguments(parser)
 
     parser.add_argument('-m', '--module', action='store_true')
+    parser.add_argument('-c', '--code', action='store_true')
+    parser.add_argument('-x', '--exec', action='store_true')
     parser.add_argument('target')
     parser.add_argument('args', nargs=argparse.REMAINDER)
 
     args = parser.parse_args()
+
+    if len([a for a in ('module', 'code', 'exec') if getattr(args, a)]) > 1:
+        raise Exception('Multiple exec mode specified')
+
     cfgs = _process_arguments(args)
 
     with bootstrap(*cfgs):
         tgt = args.target
 
+        if args.exec:
+            exe = shutil.which(tgt)
+            if exe is None:
+                raise FileNotFoundError(exe)
+
+            os.execl(exe, exe, *args.args)
+
+            return 0  # type: ignore  # noqa
+
         sys.argv = [tgt, *(args.args or ())]
 
-        if args.module:
+        if args.code:
+            exec(tgt, {}, {})
+
+        elif args.module:
             runpy._run_module_as_main(tgt)  # type: ignore  # noqa
 
         else:

omlish/diag/debug.py

@@ -0,0 +1,26 @@
+"""
+TODO:
+ - select best debugger: ipdb, pudb,
+"""
+import contextlib
+import sys
+import traceback
+import typing as ta
+
+
+@contextlib.contextmanager
+def debugging_on_exception(
+        *,
+        silent: bool = False,
+) -> ta.Iterator[None]:
+    import pdb  # noqa
+
+    try:
+        yield
+    except Exception:
+        if not silent:
+            traceback.print_exc()
+
+        pdb.post_mortem(sys.exc_info()[2])
+
+        raise

omlish/marshal/base.py

@@ -164,9 +164,12 @@ class BaseContext(lang.Abstract):
     options: col.TypeMap[Option] = col.TypeMap()
 
     def _reflect(self, o: ta.Any) -> rfl.Type:
-        if (ovr := self.registry.get_of(o, ReflectOverride)):
-            return ovr[-1].rty
-        return rfl.type_(o)
+        def override(o):
+            if (ovr := self.registry.get_of(o, ReflectOverride)):
+                return ovr[-1].rty
+            return None
+
+        return rfl.Reflector(override=override).type(o)
 
 
 @dc.dataclass(frozen=True)

omlish/reflect/__init__.py

@@ -1,18 +1,6 @@
-from .types import (  # noqa
-    ANY,
-    Annotated,
-    Any,
-    Generic,
-    NewType,
-    TYPES,
-    Type,
-    Union,
-    get_orig_bases,
-    get_orig_class,
-    get_params,
-    is_type,
-    is_union_type,
-    type_,
+from .isinstance import (  # noqa
+    KNOWN_ISINSTANCE_GENERICS,
+    isinstance_of,
 )
 
 from .ops import (  # noqa
@@ -24,11 +12,6 @@ from .ops import (  # noqa
     types_equivalent,
 )
 
-from .isinstance import (  # noqa
-    KNOWN_ISINSTANCE_GENERICS,
-    isinstance_of,
-)
-
 from .subst import (  # noqa
     ALIAS_UPDATING_GENERIC_SUBSTITUTION,
     DEFAULT_GENERIC_SUBSTITUTION,
@@ -38,3 +21,22 @@ from .subst import (  # noqa
     get_type_var_replacements,
     replace_type_vars,
 )
+
+from .types import (  # noqa
+    ANY,
+    Annotated,
+    Any,
+    DEFAULT_REFLECTOR,
+    Generic,
+    NewType,
+    Reflector,
+    TYPES,
+    Type,
+    Union,
+    get_orig_bases,
+    get_orig_class,
+    get_params,
+    is_type,
+    is_union_type,
+    type_,
+)

omlish/reflect/types.py

@@ -195,92 +195,111 @@ TYPES: tuple[type, ...] = (
 ##
 
 
-def is_type(obj: ta.Any) -> bool:
-    if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
-        return True
+class Reflector:
+    def __init__(
+            self,
+            *,
+            override: ta.Callable[[ta.Any], ta.Any] | None = None,
+    ) -> None:
+        super().__init__()
 
-    oty = type(obj)
+        self._override = override
 
-    return (
-            oty is _UnionGenericAlias or oty is types.UnionType or  # noqa
+    def is_type(self, obj: ta.Any) -> bool:
+        if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
+            return True
 
-            isinstance(obj, ta.NewType) or  # noqa
+        oty = type(obj)
 
-            (
-                is_simple_generic_alias_type(oty) or
-                oty is _CallableGenericAlias
-            ) or
+        return (
+                oty is _UnionGenericAlias or oty is types.UnionType or  # noqa
 
-            isinstance(obj, type) or
+                isinstance(obj, ta.NewType) or  # noqa
 
-            isinstance(obj, _SpecialGenericAlias)
-    )
+                (
+                    is_simple_generic_alias_type(oty) or
+                    oty is _CallableGenericAlias
+                ) or
 
+                isinstance(obj, type) or
 
-def type_(obj: ta.Any) -> Type:
-    if obj is ta.Any:
-        return ANY
+                isinstance(obj, _SpecialGenericAlias)
+        )
 
-    if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
-        return obj
+    def type(self, obj: ta.Any) -> Type:
+        if self._override is not None:
+            if (ovr := self._override(obj)) is not None:
+                return ovr
 
-    oty = type(obj)
+        if obj is ta.Any:
+            return ANY
 
-    if oty is _UnionGenericAlias or oty is types.UnionType:
-        return Union(frozenset(type_(a) for a in ta.get_args(obj)))
-
-    if isinstance(obj, ta.NewType):  # noqa
-        return NewType(obj)
-
-    if (
-            is_simple_generic_alias_type(oty) or
-            oty is _CallableGenericAlias
-    ):
-        origin = ta.get_origin(obj)
-        args = ta.get_args(obj)
-        if oty is _CallableGenericAlias:
-            p, r = args
-            if p is Ellipsis or isinstance(p, ta.ParamSpec):
-                raise TypeError(f'Callable argument not yet supported for {obj=}')
-            args = (*p, r)
-            params = _KNOWN_SPECIAL_TYPE_VARS[:len(args)]
-        elif origin is ta.Generic:
-            params = args
-        else:
-            params = get_params(origin)
-        if len(args) != len(params):
-            raise TypeError(f'Mismatched {args=} and {params=} for {obj=}')
-        return Generic(
-            origin,
-            tuple(type_(a) for a in args),
-            params,
-            obj,
-        )
+        if isinstance(obj, (Union, Generic, ta.TypeVar, NewType, Any)):  # noqa
+            return obj
 
-    if isinstance(obj, type):
-        if issubclass(obj, ta.Generic):  # type: ignore
-            params = get_params(obj)
-            if params:
+        oty = type(obj)
+
+        if oty is _UnionGenericAlias or oty is types.UnionType:
+            return Union(frozenset(self.type(a) for a in ta.get_args(obj)))
+
+        if isinstance(obj, ta.NewType):  # noqa
+            return NewType(obj)
+
+        if (
+                is_simple_generic_alias_type(oty) or
+                oty is _CallableGenericAlias
+        ):
+            origin = ta.get_origin(obj)
+            args = ta.get_args(obj)
+            if oty is _CallableGenericAlias:
+                p, r = args
+                if p is Ellipsis or isinstance(p, ta.ParamSpec):
+                    raise TypeError(f'Callable argument not yet supported for {obj=}')
+                args = (*p, r)
+                params = _KNOWN_SPECIAL_TYPE_VARS[:len(args)]
+            elif origin is ta.Generic:
+                params = args
+            else:
+                params = get_params(origin)
+            if len(args) != len(params):
+                raise TypeError(f'Mismatched {args=} and {params=} for {obj=}')
+            return Generic(
+                origin,
+                tuple(self.type(a) for a in args),
+                params,
+                obj,
+            )
+
+        if isinstance(obj, type):
+            if issubclass(obj, ta.Generic):  # type: ignore
+                params = get_params(obj)
+                if params:
+                    return Generic(
+                        obj,
+                        params,
+                        params,
+                        obj,
+                    )
+            return obj
+
+        if isinstance(obj, _SpecialGenericAlias):
+            if (ks := _KNOWN_SPECIALS_BY_ALIAS.get(obj)) is not None:
+                params = _KNOWN_SPECIAL_TYPE_VARS[:ks.nparams]
                 return Generic(
-                    obj,
+                    ks.origin,
                     params,
                     params,
                     obj,
                 )
-        return obj
 
-    if isinstance(obj, _SpecialGenericAlias):
-        if (ks := _KNOWN_SPECIALS_BY_ALIAS.get(obj)) is not None:
-            params = _KNOWN_SPECIAL_TYPE_VARS[:ks.nparams]
-            return Generic(
-                ks.origin,
-                params,
-                params,
-                obj,
-            )
+        if isinstance(obj, _AnnotatedAlias):
+            o = ta.get_args(obj)[0]
+            return Annotated(self.type(o), md=obj.__metadata__, obj=obj)
 
-    if isinstance(obj, _AnnotatedAlias):
-        o = ta.get_args(obj)[0]
-        return Annotated(type_(o), md=obj.__metadata__, obj=obj)
+        raise TypeError(obj)
 
-    raise TypeError(obj)
+
+DEFAULT_REFLECTOR = Reflector()
+
+is_type = DEFAULT_REFLECTOR.is_type
+type_ = DEFAULT_REFLECTOR.type

{omlish-0.0.0.dev60.dist-info → omlish-0.0.0.dev62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev60
+Version: 0.0.0.dev62
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev60.dist-info → omlish-0.0.0.dev62.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=jvyoQ7x8UJ9lpRgkh7eElwJ8qnzyG5aUGameT9Yk8GM,1419
-omlish/__about__.py,sha256=FBKxqP5dW_gNqz7t1xG_3WdV2AUAJW3mxH9f6_99dok,3420
+omlish/__about__.py,sha256=u-gRUFmrAMM8C-1-u6UfjGvA_1qc3iVQiZLYnMGHQxg,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Vr70_85EVLJLgEkRtwOr264tMRtqtlN7ncFfXRUk5aM,6914
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -89,9 +89,9 @@ omlish/asyncs/trio_asyncio.py,sha256=oqdOHy0slj9PjVxaDf3gJkq9AAgg7wYZbB469jOftVw
 omlish/bootstrap/__init__.py,sha256=-Rtsg7uPQNhh1dIT9nqrz96XlqizwoLnWf-FwOEstJI,730
 omlish/bootstrap/__main__.py,sha256=4jCwsaogp0FrJjJZ85hzF4-WqluPeheHbfeoKynKvNs,194
 omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
-omlish/bootstrap/diag.py,sha256=x_BKS_uhfW8QFk1NeH_VIocHif-A6FVTZ37262qCgZ0,5052
-omlish/bootstrap/harness.py,sha256=vDnpM0ZLSJaylxQNA4u2lwQwiU-KXZDb7MlkrhchFJY,2022
-omlish/bootstrap/main.py,sha256=u-TfxO4GkAK3LbRweQERogtO4kT0z3gqXRjnXvtJzC8,5328
+omlish/bootstrap/diag.py,sha256=LADLhusbJ1tKxVD8-gmia1HShX1VeszRO1OApIQhSpI,5507
+omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
+omlish/bootstrap/main.py,sha256=ripSWAlYz3LVyv6S_Js9MWYO3QNKgBSaFQv3gqGjuRM,5885
 omlish/bootstrap/marshal.py,sha256=ZxdAeMNd2qXRZ1HUK89HmEhz8tqlS9OduW34QBscKw0,516
 omlish/bootstrap/sys.py,sha256=i6veZeE83wO0HTl9b6ykj_pEN05fqu0enoAv4sw5Ayc,8742
 omlish/collections/__init__.py,sha256=tGUzvS_ZjiqALsLRy7JX3h4KZRQX2CmtdAfTRD7UwMk,1677
@@ -151,6 +151,7 @@ omlish/dataclasses/impl/slots.py,sha256=_sm-x9v1tPnXEHBHNUMTHZocgVyhZaPdvamIPPBU
 omlish/dataclasses/impl/utils.py,sha256=aER2iL3UAtgS1BdLuEvTr9Tr2wC28wk1kiOeO-jIymw,6138
 omlish/diag/__init__.py,sha256=BYQoq12W2qU0O7m2Z-RLCX6YLIYEW9MmfN7_i9--Yk0,132
 omlish/diag/asts.py,sha256=BveUUNUcaAm4Hg55f4ZxGSI313E4L8cCZ5XjHpEkKVI,3325
+omlish/diag/debug.py,sha256=YPzQXiBAJMYHYpBKzx0QhlLMZokjR5kkAVLodA3yddQ,424
 omlish/diag/procfs.py,sha256=vBovaMvAUKdl7FbtFq3TNsSmdhs8DaYfhoEsKeWYta8,9704
 omlish/diag/procstats.py,sha256=UkqxREqfd-38xPYZ9T1SIJISz5ARQCEhTtOZrxtm2dE,777
 omlish/diag/ps.py,sha256=1JWxZen3fVG-20R6ZZ8BtO_gpzw_5bhHZiKdoHkgxoU,1004
@@ -288,7 +289,7 @@ omlish/logs/noisy.py,sha256=Ubc-eTH6ZbGYsLfUUi69JAotwuUwzb-SJBeGo_0dIZI,348
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
 omlish/marshal/__init__.py,sha256=G0MDeBStBjz9Njq-rt5C6WbuCik6c8st7cipwMVw668,2139
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
-omlish/marshal/base.py,sha256=I7IOzFGn_DFeBRFCH8F0ONBa-NzM4mmMDld6bmoW-rc,6501
+omlish/marshal/base.py,sha256=_ZKSSuv6p9r86sja_jaxI09WYpjCBFi0KTsOiZCYyk0,6587
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
 omlish/marshal/dataclasses.py,sha256=G6Uh8t4vvNBAx2BhzH8ksj8Hq_bo6npFphQhyF298VU,6892
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
@@ -318,11 +319,11 @@ omlish/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/math/bits.py,sha256=yip1l8agOYzT7bFyMGc0RR3XlnGCfHMpjw_SECLLh1I,3477
 omlish/math/floats.py,sha256=UimhOT7KRl8LXTzOI5cQWoX_9h6WNWe_3vcOuO7-h_8,327
 omlish/math/stats.py,sha256=MegzKVsmv2kra4jDWLOUgV0X7Ee2Tbl5u6ql1v4-dEY,10053
-omlish/reflect/__init__.py,sha256=8t2955chuWPzj8yiV7R_jlREAezSz6CVTJ0HKY58Vpk,687
+omlish/reflect/__init__.py,sha256=eJzSLlCWcjGWn7NGzIR66vANvxiHQym73YJeMwB7mCw,725
 omlish/reflect/isinstance.py,sha256=x5T9S2634leinBT4hl3CZZkRttvdvvlxChkC_x9Qu2s,1176
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=JM2RGv2-Rcex8wCqhmgvRG59zD242P9jM3O2QLjKWWo,3586
-omlish/reflect/types.py,sha256=Zkcp8nx_vFNH7pBZ5pU5P0wIgQCauj5Nic3BZb5cRik,7030
+omlish/reflect/types.py,sha256=8EhhLU-ko-Uepk3Xa0v22w8LBS7MbjPwJ4HNM_Dtf5g,7779
 omlish/secrets/__init__.py,sha256=SGB1KrlNrxlNpazEHYy95NTzteLi8ndoEgMhU7luBl8,420
 omlish/secrets/crypto.py,sha256=6CsLy0UEqCrBK8Xx_3-iFF6SKtu2GlEqUQ8-MliY3tk,3709
 omlish/secrets/marshal.py,sha256=U9uSRTWzZmumfNZeh_dROwVdGrARsp155TylRbjilP8,2048
@@ -407,9 +408,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev60.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev60.dist-info/METADATA,sha256=ywbae2f6yzK7ZJn0W83KHW9L1sTuH-Y7h4sf8pAl95k,4167
-omlish-0.0.0.dev60.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev60.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev60.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev60.dist-info/RECORD,,
+omlish-0.0.0.dev62.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev62.dist-info/METADATA,sha256=mt0fT8Bk_wKy64eUKY_AYPNxHg-yruiGNd2EYcnYUPw,4167
+omlish-0.0.0.dev62.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev62.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev62.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev62.dist-info/RECORD,,