omlish 0.0.0.dev60__tar.gz → 0.0.0.dev61__tar.gz

{omlish-0.0.0.dev60/omlish.egg-info → omlish-0.0.0.dev61}/PKG-INFO

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

{omlish-0.0.0.dev60 → omlish-0.0.0.dev61}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev60'
-__revision__ = 'eb96b2408cdf5b153541f194ea5ab7bba1c2524b'
+__version__ = '0.0.0.dev61'
+__revision__ = '389b2eb1510880888bed8afeafacd0e55b165ebe'
 
 
 #

{omlish-0.0.0.dev60 → omlish-0.0.0.dev61}/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-0.0.0.dev60 → omlish-0.0.0.dev61}/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-0.0.0.dev60 → omlish-0.0.0.dev61}/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-0.0.0.dev61/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-0.0.0.dev60 → omlish-0.0.0.dev61}/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-0.0.0.dev60 → omlish-0.0.0.dev61}/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-0.0.0.dev60 → omlish-0.0.0.dev61}/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 → omlish-0.0.0.dev61/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev60 → omlish-0.0.0.dev61}/omlish.egg-info/SOURCES.txt

@@ -161,6 +161,7 @@ omlish/dataclasses/impl/slots.py
 omlish/dataclasses/impl/utils.py
 omlish/diag/__init__.py
 omlish/diag/asts.py
+omlish/diag/debug.py
 omlish/diag/procfs.py
 omlish/diag/procstats.py
 omlish/diag/ps.py

{omlish-0.0.0.dev60 → omlish-0.0.0.dev61}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev60'
+version = '0.0.0.dev61'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',