omlish 0.0.0.dev111__py3-none-any.whl → 0.0.0.dev113__py3-none-any.whl

omlish/.manifests.json

@@ -23,18 +23,6 @@
       }
     }
   },
-  {
-    "module": ".diag.pycharm.cli",
-    "attr": "_CLI_MODULE",
-    "file": "omlish/diag/pycharm/cli.py",
-    "line": 38,
-    "value": {
-      "$omdev.cli.types.CliModule": {
-        "cmd_name": "pycharm",
-        "mod_name": "omlish.diag.pycharm.cli"
-      }
-    }
-  },
   {
     "module": ".formats.json.cli.__main__",
     "attr": "_CLI_MODULE",

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev111'
-__revision__ = 'bb150a1986306450374f5184b47e2658a5b7c656'
+__version__ = '0.0.0.dev113'
+__revision__ = 'eafea7b4602b808e2955b7dbea769403091c6548'
 
 
 #

omlish/argparse.py

@@ -77,14 +77,23 @@ CommandFn = ta.Callable[[], int | None]
 class Command:
     name: str
     fn: CommandFn
-    args: ta.Sequence[Arg] = ()
+    args: ta.Sequence[Arg] = ()  # noqa
+
+    _: dc.KW_ONLY
+
+    aliases: ta.Sequence[str] | None = None
     parent: ta.Optional['Command'] = None
     accepts_unknown: bool = False
 
     def __post_init__(self) -> None:
-        check.isinstance(self.name, str)
-        check.not_in('_', self.name)
-        check.not_empty(self.name)
+        def check_name(s: str) -> None:
+            check.isinstance(s, str)
+            check.not_in('_', s)
+            check.not_empty(s)
+        check_name(self.name)
+        check.not_isinstance(self.aliases, str)
+        for a in self.aliases or []:
+            check_name(a)
 
         check.callable(self.fn)
         check.arg(all(isinstance(a, Arg) for a in self.args))
@@ -105,6 +114,7 @@ class Command:
 def command(
         *args: Arg,
         name: str | None = None,
+        aliases: ta.Iterable[str] | None = None,
         parent: Command | None = None,
         accepts_unknown: bool = False,
 ) -> ta.Any:  # ta.Callable[[CommandFn], Command]:  # FIXME
@@ -112,12 +122,14 @@ def command(
         check.isinstance(arg, Arg)
     check.isinstance(name, (str, None))
     check.isinstance(parent, (Command, None))
+    check.not_isinstance(aliases, str)
 
     def inner(fn):
         return Command(
             (name if name is not None else fn.__name__).replace('_', '-'),
             fn,
             args,
+            aliases=tuple(aliases) if aliases is not None else None,
             parent=parent,
             accepts_unknown=accepts_unknown,
         )
@@ -185,18 +197,23 @@ class _CliMeta(type):
             if isinstance(obj, Command):
                 if obj.parent is not None:
                     raise NotImplementedError
-                cparser = subparsers.add_parser(obj.name)
-                for arg in (obj.args or []):
-                    if (
-                            len(arg.args) == 1 and
-                            isinstance(arg.args[0], str) and
-                            not (n := check.isinstance(arg.args[0], str)).startswith('-') and
-                            'metavar' not in arg.kwargs
-                    ):
-                        cparser.add_argument(n.replace('-', '_'), **arg.kwargs, metavar=n)
-                    else:
-                        cparser.add_argument(*arg.args, **arg.kwargs)
-                cparser.set_defaults(_cmd=obj)
+                for cn in [obj.name, *(obj.aliases or [])]:
+                    cparser = subparsers.add_parser(cn)
+                    for arg in (obj.args or []):
+                        if (
+                                len(arg.args) == 1 and
+                                isinstance(arg.args[0], str) and
+                                not (n := check.isinstance(arg.args[0], str)).startswith('-') and
+                                'metavar' not in arg.kwargs
+                        ):
+                            cparser.add_argument(
+                                n.replace('-', '_'),
+                                **arg.kwargs,
+                                metavar=n,
+                            )
+                        else:
+                            cparser.add_argument(*arg.args, **arg.kwargs)
+                    cparser.set_defaults(_cmd=obj)
 
             elif isinstance(obj, Arg):
                 if att in anns:

omlish/diag/debug.py

@@ -2,25 +2,82 @@
 TODO:
  - select best debugger: ipdb, pudb,
 """
-import contextlib
-import sys
+import dataclasses as dc
+import functools
 import traceback
+import types
 import typing as ta
 
+from .. import check
+from .. import lang
 
-@contextlib.contextmanager
-def debugging_on_exception(
-        *,
-        silent: bool = False,
-) -> ta.Iterator[None]:
+
+if ta.TYPE_CHECKING:
     import pdb  # noqa
 
-    try:
-        yield
-    except Exception:
-        if not silent:
+    from . import pydevd
+
+else:
+    pdb = lang.proxy_import('pdb')
+
+    pydevd = lang.proxy_import('.pydevd', __package__)
+
+
+T = ta.TypeVar('T')
+P = ta.ParamSpec('P')
+
+ExceptionInfo: ta.TypeAlias = tuple[type[BaseException], BaseException, types.TracebackType]
+
+PostMortemDebugger: ta.TypeAlias = ta.Callable[[ExceptionInfo], None]
+
+
+##
+
+
+def pdb_post_mortem_debugger(ei: ExceptionInfo) -> None:
+    pdb.post_mortem(ei[2])
+
+
+def get_post_mortem_debugger() -> PostMortemDebugger:
+    if pydevd.is_present():
+        return pydevd.debug_unhandled_exception
+
+    else:
+        check.not_none(pdb.post_mortem)
+        return pdb_post_mortem_debugger
+
+
+##
+
+
+@dc.dataclass(kw_only=True)
+class DebuggingOnException:
+    silent: bool = False
+
+    fn: PostMortemDebugger | None = None
+
+    def __call__(self, fn: ta.Callable[P, T]) -> ta.Callable[P, T]:
+        @functools.wraps(fn)
+        def inner(*args, **kwargs):
+            with self:
+                return fn(*args, **kwargs)
+
+        return inner
+
+    def __enter__(self) -> ta.Self:
+        if self.fn is None:
+            self.fn = get_post_mortem_debugger()
+
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        if exc_val is None:
+            return
+
+        if not self.silent:
             traceback.print_exc()
 
-        pdb.post_mortem(sys.exc_info()[2])
+        check.not_none(self.fn)((exc_type, exc_val, exc_tb))
+
 
-        raise
+debugging_on_exception = DebuggingOnException

omlish/diag/{pycharm/pycharm.py → pycharm.py}

@@ -8,14 +8,14 @@ import subprocess
 import sys
 import typing as ta
 
-from ... import check
-from ... import lang
+from .. import check
+from .. import lang
 
 
 if ta.TYPE_CHECKING:
-    docker = lang.proxy_import('...docker')
+    docker = lang.proxy_import('..docker')
 else:
-    from ... import docker
+    from .. import docker
 
 
 ##

omlish/diag/pydevd.py

@@ -5,7 +5,6 @@ an already-debugging PyCharm instance to debug PySpark jobs.
 
 TODO:
  - https://www.jetbrains.com/help/pycharm/remote-debugging-with-product.html#
- - PyCharm.app/Contents/plugins/python-ce/helpers/pydev/_pydevd_bundle/pydevd_constants.py -> USE_LOW_IMPACT_MONITORING
 
 ==
 

omlish/docker/helpers.py

@@ -26,7 +26,7 @@ def timebomb_payload(delay_s: float, name: str = _DEFAULT_TIMEBOMB_NAME) -> str:
 DOCKER_FOR_MAC_HOSTNAME = 'docker.for.mac.localhost'
 
 
-_LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/docker/')
+_LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/(docker|desktop-containerd)/')
 
 
 def is_likely_in_docker() -> bool:

{omlish-0.0.0.dev111.dist-info → omlish-0.0.0.dev113.dist-info}/METADATA

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

{omlish-0.0.0.dev111.dist-info → omlish-0.0.0.dev113.dist-info}/RECORD

@@ -1,7 +1,7 @@
-omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=gvxx_bze4mfSzt-0PMk7AqSogAZ6wFVXsyllG2meSDQ,3352
+omlish/.manifests.json,sha256=CxGnj-UiRPlZgmgWoovDWrOnqpSEmBy_kqA7cdfSA3w,1431
+omlish/__about__.py,sha256=UxymFoEqTP-bPtqBabCzEoJesLLJ54WQjXVoPYATbEc,3352
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
+omlish/argparse.py,sha256=cqKGAqcxuxv_s62z0gq29L9KAvg_3-_rFvXKjVpRJjo,8126
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
 omlish/cached.py,sha256=vn3ZiKy0d3NW_kzoXCi_Fg_s5vUcH0LQ1idfKBcQhzk,489
 omlish/check.py,sha256=rZFEn6IHiMq4KGCYxlUGcUCJP12pPPUs_-AG0aouPM8,10540
@@ -151,17 +151,15 @@ omlish/dataclasses/impl/slots.py,sha256=qXRLbtFWUs_2UV1fFUdv53_6fBLKJ_8McjNiP9YQ
 omlish/dataclasses/impl/utils.py,sha256=aER2iL3UAtgS1BdLuEvTr9Tr2wC28wk1kiOeO-jIymw,6138
 omlish/diag/__init__.py,sha256=4S8v0myJM4Zld6_FV6cPe_nSv0aJb6kXftEit0HkiGE,1141
 omlish/diag/asts.py,sha256=BveUUNUcaAm4Hg55f4ZxGSI313E4L8cCZ5XjHpEkKVI,3325
-omlish/diag/debug.py,sha256=YPzQXiBAJMYHYpBKzx0QhlLMZokjR5kkAVLodA3yddQ,424
+omlish/diag/debug.py,sha256=ClED7kKXeVMyKrjGIxcq14kXk9kvUJfytBQwK9y7c4Q,1637
 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
-omlish/diag/pydevd.py,sha256=tHI0fc2ZaYKudUWTRuUe5B66qGeNktPC49ZKb8x0rSY,7298
+omlish/diag/pycharm.py,sha256=7-r_F-whXt8v-0dehxAX-MeMFPM3iZXX9IfeL0GfUtk,4643
+omlish/diag/pydevd.py,sha256=z9cy0fdmGkQf2fYKmOdAt6oPMBNMKXbz0XxK6capldI,7178
 omlish/diag/threads.py,sha256=1-x02VCDZ407gfbtXm1pWK-ubqhqfePm9PMqkHCVoqk,3642
 omlish/diag/_pycharm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/diag/_pycharm/runhack.py,sha256=eJlaUXIcFzAjOop_793RwNS_KF9NmhLv0i22xRVVeo0,34951
-omlish/diag/pycharm/__init__.py,sha256=-hZryZ3RfuoH4arwhBl-RmCZ6j-ybuUIEUf9C8o37iY,180
-omlish/diag/pycharm/cli.py,sha256=7SRh6yj8S5YGda4bq9BD4Kzwtgg4_Wa-K202ReZN2iI,1011
-omlish/diag/pycharm/pycharm.py,sha256=Xmh0PyOe51NSI7kYODvhjYCKIqSddyYOAqjx9v6zNlw,4647
 omlish/diag/replserver/__init__.py,sha256=uLo6V2aQ29v9z3IMELlPDSlG3_2iOT4-_X8VniF-EgE,235
 omlish/diag/replserver/__main__.py,sha256=LmU41lQ58bm1h4Mx7S8zhE_uEBSC6kPcp9mn5JRpulA,32
 omlish/diag/replserver/console.py,sha256=XzBDVhYlr8FY6ym4OwoaIHuFOHnGK3dTYlMDIOMUUlA,7410
@@ -175,7 +173,7 @@ omlish/dispatch/methods.py,sha256=XHjwwC9Gn4iDWxbyLAcbdSwRgVaq-8Bnn5cAwf5oZdA,54
 omlish/docker/__init__.py,sha256=dmda-4zBo0UM_CMws_1MOwtyObdF79LB0HF5IT3sDVk,482
 omlish/docker/cli.py,sha256=gtb9kitVfGnd4cr587NsVVk8D5Ok5y5SAsqD_SwGrSA,2565
 omlish/docker/compose.py,sha256=4drmnGQzbkOFJ9B6XSg9rnXkJeZz1ETmdcMe1PE790U,1237
-omlish/docker/helpers.py,sha256=j2eZIqIUpy34ZmoGyIzsYuKx9HeewwYBfrGNC99EFYk,928
+omlish/docker/helpers.py,sha256=4gd82lpFh5bQFmKOkxgVU-QyuDcGR4341qW75UcFiX0,949
 omlish/docker/hub.py,sha256=7LIuJGdA-N1Y1dmo50ynKM1KUTcnQM_5XbtPbdT_QLU,3940
 omlish/docker/manifests.py,sha256=LR4FpOGNUT3bZQ-gTjB6r_-1C3YiG30QvevZjrsVUQM,7068
 omlish/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -469,9 +467,9 @@ omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,329
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev111.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev111.dist-info/METADATA,sha256=NOhma2BjhNWfdWwTjNisoW2NP0V3sJ2Fi75u2-IF2UE,4000
-omlish-0.0.0.dev111.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-omlish-0.0.0.dev111.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev111.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev111.dist-info/RECORD,,
+omlish-0.0.0.dev113.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev113.dist-info/METADATA,sha256=xC9V1ccs4B4hZjho38fd41vMPlTr4W1MFcTA9tYwTEU,4000
+omlish-0.0.0.dev113.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+omlish-0.0.0.dev113.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev113.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev113.dist-info/RECORD,,

omlish/diag/pycharm/__init__.py

@@ -1,7 +0,0 @@
-from .pycharm import (  # noqa
-    PycharmRemoteDebugger,
-    get_pycharm_version,
-    is_pycharm_hosted,
-    pycharm_remote_debugger_attach,
-    read_darwin_pycharm_info_plist,
-)

omlish/diag/pycharm/cli.py

@@ -1,46 +0,0 @@
-import inspect
-import os.path
-import subprocess
-import tempfile
-
-from ... import argparse as ap
-from .pycharm import get_pycharm_version
-
-
-class Cli(ap.Cli):
-    @ap.command()
-    def version(self) -> None:
-        print(get_pycharm_version())
-
-    @ap.command(
-        ap.arg('python-exe'),
-        ap.arg('args', nargs=ap.REMAINDER),
-    )
-    def runhack(self) -> int:
-        if not os.path.isfile(exe := self.args.python_exe):
-            raise FileNotFoundError(exe)
-
-        from .._pycharm import runhack
-        src = inspect.getsource(runhack)
-
-        src_file = tempfile.mktemp(__package__ + '-runhack')  # noqa
-        with open(src_file, 'w') as f:
-            f.write(src)
-
-        proc = subprocess.run([exe, src_file, *self.args.args], check=False)
-        return proc.returncode
-
-
-def _main() -> None:
-    Cli().call_and_exit()
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'pycharm',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    _main()