omdev 0.0.9__tar.gz → 0.0.11__tar.gz

{omdev-0.0.9/omdev.egg-info → omdev-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.9
+Version: 0.0.11
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.9
+Requires-Dist: omlish==0.0.11
 Provides-Extra: all
+Requires-Dist: ominfra==0.0.11; extra == "all"
+Requires-Dist: ommlds==0.0.11; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -30,6 +32,10 @@ Requires-Dist: rich~=15.0; extra == "all"
 Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
+Provides-Extra: ominfra
+Requires-Dist: ominfra==0.0.11; extra == "ominfra"
+Provides-Extra: ommlds
+Requires-Dist: ommlds==0.0.11; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.9 → omdev-0.0.11}/omdev/.omlish-manifests.json

@@ -337,6 +337,20 @@
       }
     }
   },
+  {
+    "module": ".supervisor.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/supervisor/__main__.py",
+    "line": 4,
+    "value": {
+      "!.cli.types.CliModule": {
+        "name": [
+          "supervisor"
+        ],
+        "module": "omdev.supervisor.__main__"
+      }
+    }
+  },
   {
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",

{omdev-0.0.9 → omdev-0.0.11}/omdev/__about__.py

@@ -12,6 +12,16 @@ class Project(ProjectBase):
     ]
 
     optional_dependencies = {
+        'ominfra': [
+            f'ominfra == {__version__}',
+        ],
+
+        'ommlds': [
+            f'ommlds == {__version__}',
+        ],
+
+        #
+
         'black': [
             'black ~= 26.3',
         ],

{omdev-0.0.9 → omdev-0.0.11}/omdev/ci/cli.py

@@ -23,8 +23,8 @@ import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
-from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_cmd
+from omlish.argparse.parsers import argparse_arg
+from omlish.argparse.parsers import argparse_cmd
 from omlish.lite.check import check
 from omlish.lite.inject import inj
 from omlish.logs.modules import get_module_logger

{omdev-0.0.9 → omdev-0.0.11}/omdev/ci/github/cli.py

@@ -6,8 +6,8 @@ See:
 import dataclasses as dc
 
 from omlish.argparse.cli import ArgparseCli
-from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_cmd
+from omlish.argparse.parsers import argparse_arg
+from omlish.argparse.parsers import argparse_cmd
 from omlish.lite.json import json_dumps_pretty
 
 from .api.v1.client import GithubCacheServiceV1Client

{omdev-0.0.9 → omdev-0.0.11}/omdev/interp/cli.py

@@ -10,8 +10,8 @@ import asyncio
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
-from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_cmd
+from omlish.argparse.parsers import argparse_arg
+from omlish.argparse.parsers import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.inject import Injector

{omdev-0.0.9 → omdev-0.0.11}/omdev/magic/cli.py

@@ -2,8 +2,8 @@
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
-from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_cmd
+from omlish.argparse.parsers import argparse_arg
+from omlish.argparse.parsers import argparse_cmd
 
 from .find import find_magic_files
 from .find import find_magic_py_modules

{omdev-0.0.9 → omdev-0.0.11}/omdev/pyproject/cli.py

@@ -32,8 +32,8 @@ import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
-from omlish.argparse.cli import argparse_arg
-from omlish.argparse.cli import argparse_cmd
+from omlish.argparse.parsers import argparse_arg
+from omlish.argparse.parsers import argparse_cmd
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.formats.toml.parser import toml_loads
 from omlish.lite.cached import cached_nullary

{omdev-0.0.9 → omdev-0.0.11}/omdev/scripts/ci.py

@@ -129,7 +129,7 @@ def __omlish_amalg__():  # noqa
             dict(path='github/bootstrap.py', sha1='9bf24b05603cd1a82db8be8b645bbad3e0d3f22f'),
             dict(path='../oci/datarefs.py', sha1='793ce5f2774e052b28d04b226a5f1eff6eec0a72'),
             dict(path='../oci/pack/unpacking.py', sha1='f43dee9a2eee79cbbb90f0721ed234a2bc35daa7'),
-            dict(path='../../omlish/argparse/cli.py', sha1='ae89334840eadb9838667d98a0bdd4870bdd790b'),
+            dict(path='../../omlish/argparse/parsers.py', sha1='f874eb5c45e22156b2e9a762cfb68a2311b6d1f8'),
             dict(path='../../omlish/formats/yaml/goyaml/errors.py', sha1='c4dda09d78bc14d9824e45e3d5d434185ee5598b'),
             dict(path='../../omlish/http/headers.py', sha1='fa6777687a0573176750f358a4b7163d704c7e5b'),
             dict(path='../../omlish/http/parsing.py', sha1='2ee187993274e697332c7df7b46a98382f4cee2a'),
@@ -152,6 +152,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../oci/data.py', sha1='6c8b30260f3418505d0053d6a9cf8473196069d2'),
             dict(path='../oci/repositories.py', sha1='f224ea10f5d0f9d3719bc9fe867c7e1d2ccffbf3'),
             dict(path='../oci/tars.py', sha1='3ed00e97a494bd92c6a6149d22d51469bc0af384'),
+            dict(path='../../omlish/argparse/cli.py', sha1='aef500dd2d8f5a65c4c04ede11355ac8eb513f2e'),
             dict(path='../../omlish/asyncs/asyncio/sockets.py', sha1='8d24dae988a30bb73f167a9ab62d4fc9eef4ad06'),
             dict(path='../../omlish/asyncs/asyncio/timeouts.py', sha1='4d31b02b3c39b8f2fa7e94db36552fde6942e36a'),
             dict(path='../../omlish/formats/yaml/goyaml/tokens.py', sha1='e9744c171d982ea8b4a6ace5f937926d51d5ec30'),
@@ -234,14 +235,14 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/http/simple/pipelines/handlers.py', sha1='a6064bcd6dedec75072edc3a10f0f082c83dbb37'),  # noqa
             dict(path='ci.py', sha1='87b82e2bd86aa886764f1e0067251b056e359650'),
             dict(path='github/cache.py', sha1='d91f9c87d167574e94c99817e6c3a0f75925dfb9'),
-            dict(path='github/cli.py', sha1='6d14b0eb4ca5f606ad2821b63b9707ce57f50406'),
+            dict(path='github/cli.py', sha1='4f63c026d5d00b04a579ee9186a6264094eeae9d'),
             dict(path='../../omlish/http/simple/pipelines/sync.py', sha1='097922607bca8c85ee0a4d35d306dab661f11b3e'),
             dict(path='docker/dataserver.py', sha1='fa09a10352255ec3de2d87344de8c8324ad8679e'),
             dict(path='github/inject.py', sha1='99c0dd7c55767e7c49f70b7edac25da67f718b2e'),
             dict(path='docker/cacheserved/cache.py', sha1='4f8c5c2b7451b8f0d7cccb12060ff609af4f44e8'),
             dict(path='docker/inject.py', sha1='69acac65fae413cb58c1f9aa739d2cc1c3ffa09d'),
             dict(path='inject.py', sha1='e86b16d79a113a4f387e68ed0db1d067bcada93a'),
-            dict(path='cli.py', sha1='bf4845886c5e7b623e54fb98ce7c8f0fa6696d3a'),
+            dict(path='cli.py', sha1='b392df23b6eaf1a0b5223db07a3c4bcd1d1fe0a2'),
         ],
     )
 
@@ -285,8 +286,8 @@ SocketAddress = ta.Any  # ta.TypeAlias
 GithubCacheServiceV2RequestT = ta.TypeVar('GithubCacheServiceV2RequestT')
 GithubCacheServiceV2ResponseT = ta.TypeVar('GithubCacheServiceV2ResponseT')
 
-# ../../omlish/argparse/cli.py
-ArgparseCmdFn = ta.Callable[[], ta.Optional[int]]  # ta.TypeAlias
+# ../../omlish/argparse/parsers.py
+ArgparseCmdFn = ta.Callable[[], ta.Union[ta.Optional[int], ta.Awaitable[ta.Optional[int]]]]  # ta.TypeAlias
 
 # ../../omlish/formats/yaml/goyaml/errors.py
 YamlErrorOr = ta.Union['YamlError', T]  # ta.TypeAlias
@@ -3984,19 +3985,7 @@ class OciLayerUnpacker(ExitStacked):
 
 
 ########################################
-# ../../../omlish/argparse/cli.py
-"""
-FIXME:
- - exit_on_error lol
-
-TODO:
- - default command
- - auto match all underscores to hyphens
- - pre-run, post-run hooks
- - exitstack?
- - suggestion - difflib.get_close_matches
- - add_argument_group - group kw on ArgparseKwarg?
-"""
+# ../../../omlish/argparse/parsers.py
 
 
 ##
@@ -4041,6 +4030,7 @@ class ArgparseCmd:
     aliases: ta.Optional[ta.Sequence[str]] = None
     parent: ta.Optional['ArgparseCmd'] = None
     accepts_unknown: bool = False
+    default: bool = False
 
     def __post_init__(self) -> None:
         def check_name(s: str) -> None:
@@ -4064,7 +4054,7 @@ class ArgparseCmd:
             return self
         return dc.replace(self, fn=self.fn.__get__(instance, owner))  # noqa
 
-    def __call__(self, *args, **kwargs) -> ta.Optional[int]:
+    def __call__(self, *args, **kwargs) -> ta.Union[ta.Optional[int], ta.Awaitable[ta.Optional[int]]]:
         return self.fn(*args, **kwargs)
 
 
@@ -4074,12 +4064,14 @@ def argparse_cmd(
         aliases: ta.Optional[ta.Iterable[str]] = None,
         parent: ta.Optional[ArgparseCmd] = None,
         accepts_unknown: bool = False,
+        default: bool = False,
 ) -> ta.Any:  # ta.Callable[[ArgparseCmdFn], ArgparseCmd]:  # FIXME
     for arg in args:
         check.isinstance(arg, ArgparseArg)
     check.isinstance(name, (str, type(None)))
     check.isinstance(parent, (ArgparseCmd, type(None)))
     check.not_isinstance(aliases, str)
+    check.isinstance(default, bool)
 
     def inner(fn):
         return ArgparseCmd(
@@ -4089,6 +4081,7 @@ def argparse_cmd(
             aliases=tuple(aliases) if aliases is not None else None,
             parent=parent,
             accepts_unknown=accepts_unknown,
+            default=default,
         )
 
     return inner
@@ -4112,186 +4105,129 @@ def _get_argparse_arg_ann_kwargs(ann: ta.Any) -> ta.Mapping[str, ta.Any]:
         raise TypeError(ann)
 
 
-class _ArgparseCliAnnotationBox:
+class _ArgparseParserClassAnnotationBox:
     def __init__(self, annotations: ta.Mapping[str, ta.Any]) -> None:
         super().__init__()
 
         self.__annotations__ = annotations  # type: ignore
 
 
-class ArgparseCli:
-    def __init__(self, argv: ta.Optional[ta.Sequence[str]] = None) -> None:
-        super().__init__()
-
-        self._argv = argv if argv is not None else sys.argv[1:]
-
-        self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
+def configure_argparse_parser_class_parser(
+        cls: type,
+        parser: ta.Optional[argparse.ArgumentParser] = None,
+) -> argparse.ArgumentParser:
+    ns = cls.__dict__
+    objs = {}
+    mro = cls.__mro__[::-1]
+    for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
+        bseen = set()  # type: ignore
+        for k, v in bns.items():
+            if isinstance(v, (ArgparseCmd, ArgparseArg)):
+                check.not_in(v, bseen)
+                bseen.add(v)
+                objs[k] = v
+            elif k in objs:
+                del [k]
 
     #
 
-    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
-        super().__init_subclass__(**kwargs)
-
-        ns = cls.__dict__
-        objs = {}
-        mro = cls.__mro__[::-1]
-        for bns in [bcls.__dict__ for bcls in reversed(mro)] + [ns]:
-            bseen = set()  # type: ignore
-            for k, v in bns.items():
-                if isinstance(v, (ArgparseCmd, ArgparseArg)):
-                    check.not_in(v, bseen)
-                    bseen.add(v)
-                    objs[k] = v
-                elif k in objs:
-                    del [k]
-
-        #
-
-        anns = ta.get_type_hints(_ArgparseCliAnnotationBox({
-            **{k: v for bcls in reversed(mro) for k, v in getattr(bcls, '__annotations__', {}).items()},
-            **ns.get('__annotations__', {}),
-        }), globalns=ns.get('__globals__', {}))
-
-        #
+    anns = ta.get_type_hints(_ArgparseParserClassAnnotationBox({
+        **{k: v for bcls in reversed(mro) for k, v in getattr(bcls, '__annotations__', {}).items()},
+        **ns.get('__annotations__', {}),
+    }), globalns=ns.get('__globals__', {}))
 
-        if '_parser' in ns:
-            parser = check.isinstance(ns['_parser'], argparse.ArgumentParser)
-        else:
-            parser = argparse.ArgumentParser()
-            setattr(cls, '_parser', parser)
+    #
 
-        #
+    if parser is None:
+        parser = argparse.ArgumentParser()
 
-        subparsers = parser.add_subparsers()
-
-        for att, obj in objs.items():
-            if isinstance(obj, ArgparseCmd):
-                if obj.parent is not None:
-                    raise NotImplementedError
-
-                for cn in [obj.name, *(obj.aliases or [])]:
-                    subparser = 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
-                        ):
-                            subparser.add_argument(
-                                n.replace('-', '_'),
-                                **arg.kwargs,
-                                metavar=n,
-                            )
-                        else:
-                            subparser.add_argument(*arg.args, **arg.kwargs)
+    #
 
-                    subparser.set_defaults(_cmd=obj)
+    subparsers = parser.add_subparsers()
 
-            elif isinstance(obj, ArgparseArg):
-                if obj.group is not None:
-                    # FIXME: add_argument_group
-                    raise NotImplementedError
+    default_cmd: ta.Optional[ArgparseCmd] = None
 
-                if att in anns:
-                    ann_kwargs = _get_argparse_arg_ann_kwargs(anns[att])
-                    obj.kwargs = {**ann_kwargs, **obj.kwargs}
+    for att, obj in objs.items():
+        if isinstance(obj, ArgparseCmd):
+            if obj.parent is not None:
+                raise NotImplementedError
 
-                if not obj.dest:
-                    if 'dest' in obj.kwargs:
-                        obj.dest = obj.kwargs['dest']
+            if obj.default:
+                if default_cmd:
+                    raise TypeError(f'Already have a default command: {default_cmd}, {obj}')
+                default_cmd = obj
+
+            for cn in [obj.name, *(obj.aliases or [])]:
+                subparser = 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
+                    ):
+                        subparser.add_argument(
+                            n.replace('-', '_'),
+                            **arg.kwargs,
+                            metavar=n,
+                        )
                     else:
-                        obj.dest = obj.kwargs['dest'] = att  # type: ignore
-
-                parser.add_argument(*obj.args, **obj.kwargs)
-
-            else:
-                raise TypeError(obj)
+                        subparser.add_argument(*arg.args, **arg.kwargs)
 
-    #
-
-    _parser: ta.ClassVar[argparse.ArgumentParser]
+                subparser.set_defaults(_cmd=obj)
 
-    @classmethod
-    def get_parser(cls) -> argparse.ArgumentParser:
-        return cls._parser
+        elif isinstance(obj, ArgparseArg):
+            if obj.group is not None:
+                # FIXME: add_argument_group
+                raise NotImplementedError
 
-    @property
-    def argv(self) -> ta.Sequence[str]:
-        return self._argv
+            if att in anns:
+                ann_kwargs = _get_argparse_arg_ann_kwargs(anns[att])
+                obj.kwargs = {**ann_kwargs, **obj.kwargs}
 
-    @property
-    def args(self) -> argparse.Namespace:
-        return self._args
+            if not obj.dest:
+                if 'dest' in obj.kwargs:
+                    obj.dest = obj.kwargs['dest']
+                else:
+                    obj.dest = obj.kwargs['dest'] = att  # type: ignore
 
-    @property
-    def unknown_args(self) -> ta.Sequence[str]:
-        return self._unknown_args
+            parser.add_argument(*obj.args, **obj.kwargs)
 
-    #
+        else:
+            raise TypeError(obj)
 
-    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
-        return cmd.__get__(self, type(self))
+    if default_cmd is not None:
+        parser.set_defaults(_cmd=default_cmd)
 
-    def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
-        cmd = getattr(self.args, '_cmd', None)
+    return parser
 
-        if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
-            msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
-            if (parser := self.get_parser()).exit_on_error:  # noqa
-                parser.error(msg)
-            else:
-                raise argparse.ArgumentError(None, msg)
 
-        if cmd is None:
-            self.get_parser().print_help()
-            return None
+##
 
-        return self._bind_cli_cmd(cmd)
 
-    #
+class ArgparseParserClass(Abstract):
+    def __init_subclass__(cls, **kwargs: ta.Any) -> None:
+        super().__init_subclass__(**kwargs)
 
-    def cli_run(self) -> ta.Optional[int]:
-        if (fn := self.prepare_cli_run()) is None:
-            return 0
+        ns = cls.__dict__
 
-        return fn()
+        if '_parser' in ns:
+            parser = check.isinstance(ns['_parser'], argparse.ArgumentParser)
+        else:
+            parser = argparse.ArgumentParser()
 
-    def cli_run_and_exit(self) -> ta.NoReturn:
-        rc = self.cli_run()
-        if not isinstance(rc, int):
-            rc = 0
-        raise SystemExit(rc)
+        configure_argparse_parser_class_parser(cls, parser)
 
-    def __call__(self, *, exit: bool = False) -> ta.Optional[int]:  # noqa
-        if exit:
-            return self.cli_run_and_exit()
-        else:
-            return self.cli_run()
+        setattr(cls, '_parser', parser)
 
     #
 
-    async def async_cli_run(
-            self,
-            *,
-            force_async: bool = False,
-    ) -> ta.Optional[int]:
-        if (fn := self.prepare_cli_run()) is None:
-            return 0
-
-        if force_async:
-            is_async = True
-        else:
-            tfn = fn
-            if isinstance(tfn, ArgparseCmd):
-                tfn = tfn.fn
-            is_async = inspect.iscoroutinefunction(tfn)
+    _parser: ta.ClassVar[argparse.ArgumentParser]
 
-        if is_async:
-            return await fn()
-        else:
-            return fn()
+    @classmethod
+    def get_parser(cls) -> argparse.ArgumentParser:
+        return cls._parser
 
 
 ########################################
@@ -11625,6 +11561,110 @@ def write_oci_data_tar_file(
     return tgw.info()
 
 
+########################################
+# ../../../omlish/argparse/cli.py
+"""
+FIXME:
+ - exit_on_error lol
+
+TODO:
+ - default command
+ - auto match all underscores to hyphens
+ - pre-run, post-run hooks
+ - exitstack?
+ - suggestion - difflib.get_close_matches
+ - add_argument_group - group kw on ArgparseKwarg?
+"""
+
+
+##
+
+
+class ArgparseCli(ArgparseParserClass, Abstract):
+    def __init__(self, argv: ta.Optional[ta.Sequence[str]] = None) -> None:
+        super().__init__()
+
+        self._argv = argv if argv is not None else sys.argv[1:]
+
+        self._args, self._unknown_args = self.get_parser().parse_known_args(self._argv)
+
+    @property
+    def argv(self) -> ta.Sequence[str]:
+        return self._argv
+
+    @property
+    def args(self) -> argparse.Namespace:
+        return self._args
+
+    @property
+    def unknown_args(self) -> ta.Sequence[str]:
+        return self._unknown_args
+
+    #
+
+    def _bind_cli_cmd(self, cmd: ArgparseCmd) -> ta.Callable:
+        return cmd.__get__(self, type(self))
+
+    def prepare_cli_run(self) -> ta.Optional[ta.Callable]:
+        cmd = getattr(self.args, '_cmd', None)
+
+        if self._unknown_args and not (cmd is not None and cmd.accepts_unknown):
+            msg = f'unrecognized arguments: {" ".join(self._unknown_args)}'
+            if (parser := self.get_parser()).exit_on_error:  # noqa
+                parser.error(msg)
+            else:
+                raise argparse.ArgumentError(None, msg)
+
+        if cmd is None:
+            self.get_parser().print_help()
+            return None
+
+        return self._bind_cli_cmd(cmd)
+
+    #
+
+    def cli_run(self) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
+            return 0
+
+        return check.isinstance(fn(), (int, None))
+
+    def cli_run_and_exit(self) -> ta.NoReturn:
+        rc = self.cli_run()
+        if not isinstance(rc, int):
+            rc = 0
+        raise SystemExit(rc)
+
+    def __call__(self, *, exit: bool = False) -> ta.Optional[int]:  # noqa
+        if exit:
+            return self.cli_run_and_exit()
+        else:
+            return self.cli_run()
+
+    #
+
+    async def async_cli_run(
+            self,
+            *,
+            force_async: bool = False,
+    ) -> ta.Optional[int]:
+        if (fn := self.prepare_cli_run()) is None:
+            return 0
+
+        if force_async:
+            is_async = True
+        else:
+            tfn = fn
+            if isinstance(tfn, ArgparseCmd):
+                tfn = tfn.fn
+            is_async = inspect.iscoroutinefunction(tfn)
+
+        if is_async:
+            return await fn()
+        else:
+            return fn()
+
+
 ########################################
 # ../../../omlish/asyncs/asyncio/sockets.py