omdev 0.0.0.dev395__py3-none-any.whl → 0.0.0.dev397__py3-none-any.whl

omdev/.manifests.json

@@ -59,6 +59,18 @@
       }
     }
   },
+  {
+    "module": ".dataclasses.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/dataclasses/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "dataclasses",
+        "mod_name": "omdev.dataclasses.__main__"
+      }
+    }
+  },
   {
     "module": ".imgur",
     "attr": "_FOO_CLI_MODULE",
@@ -503,7 +515,7 @@
     "module": ".tools.prof",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/prof.py",
-    "line": 57,
+    "line": 128,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "prof",

omdev/cache/data/manifests.py

@@ -2,7 +2,6 @@ import datetime
 
 from omlish import __about__ as about
 from omlish import cached
-from omlish import check
 from omlish import dataclasses as dc
 
 from ...git.revisions import get_git_revision
@@ -14,11 +13,11 @@ from .specs import Spec
 
 
 @cached.function
-def _lib_revision() -> str:
+def _lib_revision() -> str | None:
     if (rev := about.__revision__) is not None:
         return rev  # type: ignore
 
-    return check.not_none(get_git_revision())
+    return get_git_revision()
 
 
 ##
@@ -28,13 +27,15 @@ def _lib_revision() -> str:
 class Manifest:
     spec: Spec
 
-    start_at: datetime.datetime = dc.field(kw_only=True)
-    end_at: datetime.datetime = dc.field(kw_only=True)
+    _: dc.KW_ONLY
 
-    lib_version: str = dc.field(default_factory=lambda: about.__version__, kw_only=True)
-    lib_revision: str = dc.field(default_factory=_lib_revision, kw_only=True)
+    start_at: datetime.datetime = dc.field()
+    end_at: datetime.datetime = dc.field()
 
-    serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
+    lib_version: str = dc.field(default_factory=lambda: about.__version__)
+    lib_revision: str | None = dc.field(default_factory=_lib_revision)
+
+    serialization_version: int = dc.field(default=SERIALIZATION_VERSION)
 
     @dc.validate
     def _validate_serialization_versions(self) -> bool:

omdev/dataclasses/__main__.py

@@ -0,0 +1,11 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('dataclasses', __name__)
+
+
+if __name__ == '__main__':
+    from .cli import _main  # noqa
+
+    _main()

omdev/dataclasses/cli.py

@@ -0,0 +1,28 @@
+from omlish.argparse import all as ap
+from omlish.logs.standard import configure_standard_logging
+
+from .codegen import DataclassCodeGen
+
+
+##
+
+
+class Cli(ap.Cli):
+    @ap.cmd(
+        ap.arg('roots', metavar='root', nargs='+'),
+    )
+    def codegen(self) -> None:
+        DataclassCodeGen().run(self.args.roots)
+
+
+##
+
+
+def _main() -> None:
+    configure_standard_logging()
+
+    Cli().cli_run_and_exit()
+
+
+if __name__ == '__main__':
+    _main()

omdev/dataclasses/codegen.py

@@ -0,0 +1,95 @@
+"""
+TODO:
+ - subdir conf files override parents, codegen those separately, don't duplicate
+ - refactor dc gen to just Execute and Codegen
+ - need to bubble up imports, preamble, deduped
+ - still need plan repr / cmp
+ - !! manifests for dataclass config?
+  - more sparse / diffuse intent, not package-level
+"""
+import logging
+import os.path
+import typing as ta
+
+from omlish import check
+from omlish import collections as col
+from omlish import lang
+from omlish.dataclasses.impl.configs import PACKAGE_CONFIG_FILE_NAME
+from omlish.dataclasses.impl.configs import PackageConfig
+from omlish.dataclasses.impl.generation.compilation import OpCompiler
+from omlish.dataclasses.impl.generation.processor import Codegen as CodegenProcessingOption
+from omlish.dataclasses.impl.generation.processor import GeneratorProcessor
+from omlish.dataclasses.impl.processing.base import ProcessingContext
+from omlish.dataclasses.impl.processing.driving import processing_options_context
+
+
+log = logging.getLogger(__name__)
+
+
+##
+
+
+class DataclassCodeGen:
+    def __init__(self) -> None:
+        super().__init__()
+
+    def run_package_config(
+            self,
+            pkg_root: str,
+            config: PackageConfig,
+    ) -> None:
+        if not config.codegen:
+            return
+
+        log.info('Running codegen on package: %s', pkg_root)
+
+        sub_pkgs = sorted(lang.yield_importable(
+            pkg_root,
+            recursive=True,
+            include_special=True,
+        ))
+
+        for sub_pkg in sub_pkgs:
+            def callback(
+                    ctx: ProcessingContext,
+                    prepared: GeneratorProcessor.Prepared,
+                    comp: OpCompiler.CompileResult,
+            ) -> None:
+                print(ctx.cls)
+                print(prepared.plans)
+                print(comp.src)
+
+            with processing_options_context(CodegenProcessingOption(callback)):
+                print(f'{sub_pkg=}')
+                try:
+                    __import__(sub_pkg)
+                except ImportError as e:
+                    print(repr(e))
+
+    def build_config_trie(
+            self,
+            root_dirs: ta.Iterable[str],
+    ) -> col.Trie[str, PackageConfig]:
+        check.not_isinstance(root_dirs, str)
+
+        trie: col.Trie[str, PackageConfig] = col.Trie()
+        for root_dir in root_dirs:
+            for dp, _, fns in os.walk(root_dir):
+                if PACKAGE_CONFIG_FILE_NAME in fns:
+                    with open(os.path.join(dp, PACKAGE_CONFIG_FILE_NAME)) as f:
+                        config = PackageConfig.loads(f.read())
+                    pkg_parts = dp.split(os.sep)
+                    trie[pkg_parts] = config
+
+        return trie
+
+    def run(
+            self,
+            root_dirs: ta.Iterable[str],
+    ) -> None:
+        check.not_isinstance(root_dirs, str)
+
+        config_trie = self.build_config_trie(root_dirs)
+
+        for pkg_parts, pkg_config in config_trie.iter_items(sort_children=True):
+            self.run_package_config('.'.join(pkg_parts), pkg_config)

omdev/tools/prof.py

@@ -3,6 +3,7 @@ TODO:
  - a general purpose profile tool lol - or is this for / in bootstrap?
 """
 import os.path
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -15,43 +16,113 @@ from ..cli import CliModule
 ##
 
 
+def pstats_to_pdf(
+        pstats_file: str,
+        pdf_file: str,
+) -> None:
+    dot = subprocess.check_output([
+        sys.executable,
+        '-m', 'gprof2dot',
+        '-f', 'pstats',
+        pstats_file,
+    ])
+
+    pdf = subprocess.check_output(
+        ['dot', '-Tpdf'],
+        input=dot,
+    )
+
+    with open(pdf_file, 'wb') as f:
+        f.write(pdf)
+
+
 class Cli(ap.Cli):
     @ap.cmd(
-        ap.arg('file'),
-        ap.arg('out-file', nargs='?'),
+        ap.arg('pstats-file'),
+        ap.arg('pdf-file', nargs='?'),
         ap.arg('-w', '--write', action='store_true'),
         ap.arg('-o', '--open', action='store_true'),
         ap.arg('-O', '--overwrite', action='store_true'),
     )
     def pstats_pdf(self) -> None:
-        out_file = self.args.out_file
-        if out_file is None and self.args.write:
-            out_file = self.args.file + '.pdf'
+        pdf_file = self.args.pdf_file
+        if pdf_file is None and self.args.write:
+            pdf_file = self.args.pstats_file + '.pdf'
 
-        if out_file is not None:
-            if os.path.exists(out_file) and not self.args.overwrite:
-                raise OSError(f'File exists: {out_file}')
+        if pdf_file is not None:
+            if os.path.exists(pdf_file) and not self.args.overwrite:
+                raise OSError(f'File exists: {pdf_file}')
         else:
-            out_file = tempfile.mktemp(suffix=os.path.basename(self.args.file) + '.pdf')  # noqa
+            pdf_file = tempfile.mktemp(suffix=os.path.basename(self.args.pstats_file) + '.pdf')  # noqa
+
+        pstats_to_pdf(
+            self.args.pstats_file,
+            self.args.pdf_file,
+        )
+
+        print(pdf_file)
+
+        if self.args.open:
+            subprocess.check_call(['open', pdf_file])
+
+    @ap.cmd(
+        ap.arg('src'),
+        ap.arg('out-file', nargs='?'),
+        ap.arg('-p', '--pdf', action='store_true'),
+        ap.arg('-o', '--open', action='store_true'),
+        ap.arg('-O', '--overwrite', action='store_true'),
+    )
+    def pstats_exec(self) -> None:
+        if self.args.out_file is not None:
+            if os.path.exists(self.args.out_file) and not self.args.overwrite:
+                raise OSError(f'File exists: {self.args.out_file}')
+
+        tmp_dir = tempfile.mkdtemp()
+
+        src_file = os.path.join(tmp_dir, 'pstats_exec.py')
+        with open(src_file, 'w') as f:
+            f.write(self.args.src)
+
+        pstats_file = os.path.join(tmp_dir, 'prof.pstats')
 
-        dot = subprocess.check_output([
+        # TODO: --python - and handle env vars, unset venv and pythonpath stuff - helper for this, scrub env
+        #  - share with execstat, -x
+        subprocess.check_call([
             sys.executable,
-            '-m', 'gprof2dot',
-            '-f', 'pstats',
-            self.args.file,
+            '-m', 'cProfile',
+            '-o', pstats_file,
+            os.path.abspath(src_file),
         ])
 
-        pdf = subprocess.check_output(
-            ['dot', '-Tpdf'],
-            input=dot,
-        )
+        if self.args.pdf:
+            out_file = os.path.join(tmp_dir, 'pstats.pdf')
+
+            pstats_to_pdf(
+                pstats_file,
+                out_file,
+            )
+
+        else:
+            out_file = pstats_file
+
+        if self.args.out_file is not None:
+            shutil.move(out_file, self.args.out_file)
+            out_file = self.args.out_file
 
-        with open(out_file, 'wb') as f:
-            f.write(pdf)
         print(out_file)
 
         if self.args.open:
-            subprocess.check_call(['open', out_file])
+            if self.args.pdf:
+                subprocess.check_call(['open', out_file])
+
+            else:
+                # Alt: python -i <setup.py> where setup.py is 'import pstats; stats = pstats.Stats(<out_file>)'
+                os.execl(
+                    sys.executable,
+                    sys.executable,
+                    '-m', 'pstats',
+                    out_file,
+                )
 
 
 # @omlish-manifest

{omdev-0.0.0.dev395.dist-info → omdev-0.0.0.dev397.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev395
+Version: 0.0.0.dev397
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev395
+Requires-Dist: omlish==0.0.0.dev397
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev395.dist-info → omdev-0.0.0.dev397.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=IuYiaGqGlhwqLm9NpW2koVLjr5dmDxt-BztIpn3E9YQ,12170
+omdev/.manifests.json,sha256=vqg148YzWHn61WpGqC2PuTiOIR2HcH5O55XZZGTcnVw,12452
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -30,7 +30,7 @@ omdev/cache/data/actions.py,sha256=Mv7eXeZuohCjQLpmLyvqvGjjBacXIvTYzIRMVpEh-zM,1
 omdev/cache/data/cache.py,sha256=oveyGl6gfTmQ4fKVO-NbB5Zx4rmEcti3BdZIvv5C6CU,7632
 omdev/cache/data/consts.py,sha256=d6W_aeMqgah6PmPYi9RA8Be54oQ4BcNCy8kDQ7FlB_Q,26
 omdev/cache/data/defaults.py,sha256=NL_mT7kaSLm2Mk9VO5wdSu-DIcHTR1KgcihJqdSd4TY,312
-omdev/cache/data/manifests.py,sha256=3bgVaduql65Jy3a7CXlBLQN4NzFGIUD2fMSmWCE2Rg8,1023
+omdev/cache/data/manifests.py,sha256=NweXxbkuLMBG1DiUFliOSYeXBrLPMIY4GA_gOZzHwho,949
 omdev/cache/data/specs.py,sha256=P50VSvMf2Jp3VHjhHy4i1-PwYwEGD4MMXEpxIg0CQis,2468
 omdev/capi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/capi/darwin/__init__.py,sha256=iAlc3ReV3LJOv5X9zGME1FKeZ2yf0auUuj1I3sGSo4E,86
@@ -125,6 +125,10 @@ omdev/cmdlog/__main__.py,sha256=m31h6AcI9rjRNVeBGoLcR-5pWp-yS8LXCorf4iBhX9w,162
 omdev/cmdlog/_cmdlog.py,sha256=9VSuUKXBMBHAH3OfBCeqp16YPddPT9Man2zDHgzzCtI,1507
 omdev/cmdlog/cli.py,sha256=9AJC3xeQA-2pdmTnsjo__9WRAML1jpEJUJMn6qQQpJA,1427
 omdev/cmdlog/cmdlog.py,sha256=MJqfCG7sVWjSK_i1shD7cgWpFZXZkPvGhGEh-yd6iwM,1982
+omdev/dataclasses/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omdev/dataclasses/__main__.py,sha256=N-a0Lf_s7D0VajuZCCY_dt8R4rSpeck9inbCsoIvciQ,175
+omdev/dataclasses/cli.py,sha256=j5GfpJQSkA_jmV94XTVb3amCFYjgrasMs-bp_zJEkqE,445
+omdev/dataclasses/codegen.py,sha256=T9SYsTjmNrM1HMUFVMO46-Szd3DH0Em0B-I_UTan6qg,3029
 omdev/dataserver/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/dataserver/handlers.py,sha256=YTuRfZehP9panTwq8dPReHZwXF1_fFIueh-_ZoztA98,5446
 omdev/dataserver/http.py,sha256=SMS6w-GVevG58FypqmPytcEqW8aUWpd2_F6JlBDIuBc,1730
@@ -284,7 +288,7 @@ omdev/tools/linehisto.py,sha256=0ZNm34EuiZBE9Q2YC6KNLNNydNT8QPSOwvYzXiU9S2Q,8881
 omdev/tools/mkenv.py,sha256=G2tu5bmiyKFyZuqtUoM7Z-6AI6CI86F2LwoIozoWOvo,2300
 omdev/tools/notebook.py,sha256=MGi2JEwyIPR1n7gakaaYZL1HHbSVmDKGQROqH56ppgU,3499
 omdev/tools/pip.py,sha256=HF5ILsNcU1IGn9bRthwjp4XicafZWR7zdp6rOhqSMiw,3464
-omdev/tools/prof.py,sha256=yPU0gkw4yWVsbAr3L95sO2FC8MM1DpzZiVVMcQlFt4c,1472
+omdev/tools/prof.py,sha256=AWcuToo3VACxyFRdUEmdqtGcfidPlvJCwkD-q_b6uIs,3485
 omdev/tools/qr.py,sha256=1p4tMJmImDa4YTQQNPwQPkM8FnhGRYj6J79BJR-MNHo,1742
 omdev/tools/shadow.py,sha256=4E2ilxa16liIvQxvgU37ITkOMrP6ufShRQfeW7wwtRc,1697
 omdev/tools/shell.py,sha256=5hF_8DCtB3XrzJSfmQDsr7X3Fi9KRV4M70q9qp0KREA,2341
@@ -317,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev395.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev395.dist-info/METADATA,sha256=y91uxnWMPgach_tKBqEg8wNntllDmyEseaH-IzoFY_o,5094
-omdev-0.0.0.dev395.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev395.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev395.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev395.dist-info/RECORD,,
+omdev-0.0.0.dev397.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev397.dist-info/METADATA,sha256=bAgNwHp9Gc2_P6AUojLiMF61tGyHIvXlOmx8C065zhI,5094
+omdev-0.0.0.dev397.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev397.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev397.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev397.dist-info/RECORD,,