omdev 0.0.0.dev394__py3-none-any.whl → 0.0.0.dev396__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",

omdev/cache/data/manifests.py

@@ -27,13 +27,15 @@ def _lib_revision() -> str | None:
 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,96 @@
+"""
+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 json
+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(**json.load(f))
+                    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/imgur.py

@@ -97,7 +97,7 @@ def upload_image(
 
     resp = hu.request(
         url,
-        headers={
+        headers={  # type: ignore[arg-type]
             hu.consts.HEADER_AUTH: hu.consts.format_bearer_auth_header(Secret.of(auth_key).reveal()),
             hu.consts.HEADER_CONTENT_TYPE: me.content_type().decode(),
         },

omdev/intellij/ides.py

@@ -78,7 +78,7 @@ def infer_directory_ide(cwd: str | None) -> Ide | None:
 ##
 
 
-def get_ide_version(ide: Ide) -> str:
+def get_ide_version(ide: Ide) -> str | None:
     if ide is Ide.PYCHARM:
         return get_pycharm_version()
     else:

{omdev-0.0.0.dev394.dist-info → omdev-0.0.0.dev396.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev394
+Version: 0.0.0.dev396
 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.dev394
+Requires-Dist: omlish==0.0.0.dev396
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev394.dist-info → omdev-0.0.0.dev396.dist-info}/RECORD

@@ -1,8 +1,8 @@
-omdev/.manifests.json,sha256=IuYiaGqGlhwqLm9NpW2koVLjr5dmDxt-BztIpn3E9YQ,12170
+omdev/.manifests.json,sha256=zs6pTjCl5WETKw4-z4zXwBY5t-hWIhu-tjcxr_K3Nmo,12451
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
-omdev/imgur.py,sha256=4XolajBnAJ1U2zvT6Y0fiUyBi_a8G9arXffvPxf3w-M,3103
+omdev/imgur.py,sha256=oG4jZH2EAk1my0JzoPNes-4LCtF2_aU08vmKbGzmuxo,3129
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=cBmAc9-TtOBupvGQ9G4T1jjjtzijx4ihQCBu6FezzV0,5490
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco,989
+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=yXTgTBSHafFwkbPOlnyxgaO_S5rDpSxB4awA5U6qMPU,3041
 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
@@ -142,7 +146,7 @@ omdev/home/secrets.py,sha256=Bq9Pak4lzsogw5GvOeQ4zs3Yatmn7glGH0q-b0Sf6h8,2003
 omdev/home/shadow.py,sha256=6mGDJV70IExa-nzd7mOUW4R3OZIXO0fBwmOUU9T9f4M,295
 omdev/intellij/__init__.py,sha256=OkihYdld_LTk_gTcyzOWc9Nze_drjsIYMYpbA5DG6m4,132
 omdev/intellij/cli.py,sha256=Sds9Xj_OHgbm76j70frhwrZEzlVi-1Rd93g0ypIe6t4,2038
-omdev/intellij/ides.py,sha256=ll-NKTKeS6ZgcWB3xYXr3gxGFgNOc0ZPulTimHkvU9Y,1573
+omdev/intellij/ides.py,sha256=uYSbVDPOlhKeImRCPV6HdcrO2JtACBPUpElbecTz7uM,1580
 omdev/intellij/open.py,sha256=3HlbJsGkwZ28UBi1P7dVJMRDMLbJyOGQs9QMQqgYVus,2679
 omdev/interp/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/interp/__main__.py,sha256=GMCqeGYltgt5dlJzHxY9gqisa8cRkrPfmZYuZnjg4WI,162
@@ -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.dev394.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev394.dist-info/METADATA,sha256=HYQNbi6EYWrZA0QLIKxpDmlUk2AHHjci4-Lf7WORUrw,5094
-omdev-0.0.0.dev394.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev394.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev394.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev394.dist-info/RECORD,,
+omdev-0.0.0.dev396.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev396.dist-info/METADATA,sha256=P-t7fBSvtfmpL6qn22sWqHkKJ5RS-fAAjn_ncEb9nQw,5094
+omdev-0.0.0.dev396.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev396.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev396.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev396.dist-info/RECORD,,