omdev 0.0.10__tar.gz → 0.0.12__tar.gz

{omdev-0.0.10/omdev.egg-info → omdev-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.10
+Version: 0.0.12
 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.10
+Requires-Dist: omlish==0.0.12
 Provides-Extra: all
+Requires-Dist: ominfra==0.0.12; extra == "all"
+Requires-Dist: ommlds==0.0.12; 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.12; extra == "ominfra"
+Provides-Extra: ommlds
+Requires-Dist: ommlds==0.0.12; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/omdev/dataclasses/_dumping.py

@@ -44,7 +44,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
             dict(path='../../omlish/lite/marshal.py', sha1='66bc88d705df274e9fa1168d2aab20c7e3935cf6'),
-            dict(path='dumping.py', sha1='982d4f7a46f40e48da4daadb082b7e66acb34ae9'),
+            dict(path='dumping.py', sha1='ae4148f671d2cb1e7bf1a819b78ca388b4680bbc'),
         ],
     )
 
@@ -1909,6 +1909,7 @@ class _DataclassCodegenDumper:
             *,
             init_file_path: str,
             out_file_path: str,
+            cfg_pkg_name: ta.Optional[str] = None,
     ) -> None:
         from omlish.dataclasses.impl.configs import PACKAGE_CONFIG_CACHE  # noqa
         from omlish.dataclasses.impl.generation.compilation import OpCompiler  # noqa
@@ -1928,6 +1929,13 @@ class _DataclassCodegenDumper:
                 prepared: GeneratorProcessor.Prepared,
                 comp: OpCompiler.CompileResult,
         ) -> None:
+            if (
+                    cfg_pkg_name is not None and
+                    ctx.pkg_cfg.pkg is not None and
+                    ctx.pkg_cfg.pkg != cfg_pkg_name
+            ):
+                return
+
             d_refs: ta.List[DumpedDataclassCodegen.Ref] = []
             for ref in comp.refs:
                 if isinstance(ref, OpRef):

{omdev-0.0.10 → omdev-0.0.12}/omdev/dataclasses/cli.py

@@ -10,13 +10,21 @@ from .codegen import DataclassCodeGen
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('roots', metavar='root', nargs='+'),
+        ap.arg('--dump-inline', action='store_true'),
+        ap.arg('--dry-run', action='store_true'),
+        ap.arg('--print-code', action='store_true'),
+        ap.arg('-j', '--jobs', type=int),
     )
     def codegen(self) -> None:
         import asyncio
+
         asyncio.run(DataclassCodeGen(
-            # dump_inline=True,
+            dump_inline=self.args.dump_inline,
+            print_code=self.args.print_code,
+            dry_run=self.args.dry_run,
         ).run(
             self.args.roots,
+            **(dict(concurrency=self.args.jobs) if self.args.jobs is not None else {}),
         ))
 
 

{omdev-0.0.10 → omdev-0.0.12}/omdev/dataclasses/codegen.py

@@ -74,12 +74,16 @@ class DataclassCodeGen:
             *,
             target_line_width: int | None = None,
             dump_inline: bool = False,
+            print_code: bool = False,
+            dry_run: bool = False,
             subprocess_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__()
 
         self._target_line_width = target_line_width or self.DEFAULT_TARGET_LINE_WIDTH
         self._dump_inline = dump_inline
+        self._print_code = print_code
+        self._dry_run = dry_run
         self._subprocess_kwargs = subprocess_kwargs
 
     #
@@ -198,6 +202,7 @@ class DataclassCodeGen:
         dumper_kwargs = dict(
             init_file_path=cfg_pkg.init_file_path,
             out_file_path=out_file_path,
+            cfg_pkg_name=cfg_pkg.name,
         )
 
         start_time = time.time()
@@ -235,7 +240,8 @@ class DataclassCodeGen:
                 raise RuntimeError(f'Refusing to overwrite non-generated file: {gen_file_path!r}')
 
             if not output.dumped:
-                os.unlink(gen_file_path)
+                if not self._dry_run:
+                    os.unlink(gen_file_path)
                 return
 
         #
@@ -351,8 +357,14 @@ class DataclassCodeGen:
 
         lines.append('')
 
-        with open(gen_file_path, 'w') as f:  # noqa
-            f.write('\n'.join(lines))
+        code = '\n'.join(lines)
+
+        if self._print_code:
+            print(code)
+
+        if not self._dry_run:
+            with open(gen_file_path, 'w') as f:  # noqa
+                f.write(code)
 
     async def run(
             self,

{omdev-0.0.10 → omdev-0.0.12}/omdev/dataclasses/dumping.py

@@ -56,6 +56,7 @@ class _DataclassCodegenDumper:
             *,
             init_file_path: str,
             out_file_path: str,
+            cfg_pkg_name: ta.Optional[str] = None,
     ) -> None:
         from omlish.dataclasses.impl.configs import PACKAGE_CONFIG_CACHE  # noqa
         from omlish.dataclasses.impl.generation.compilation import OpCompiler  # noqa
@@ -75,6 +76,13 @@ class _DataclassCodegenDumper:
                 prepared: GeneratorProcessor.Prepared,
                 comp: OpCompiler.CompileResult,
         ) -> None:
+            if (
+                    cfg_pkg_name is not None and
+                    ctx.pkg_cfg.pkg is not None and
+                    ctx.pkg_cfg.pkg != cfg_pkg_name
+            ):
+                return
+
             d_refs: ta.List[DumpedDataclassCodegen.Ref] = []
             for ref in comp.refs:
                 if isinstance(ref, OpRef):

{omdev-0.0.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/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.10 → omdev-0.0.12}/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