omdev 0.0.0.dev424__py3-none-any.whl → 0.0.0.dev425__py3-none-any.whl

omdev/scripts/interp.py

@@ -1393,13 +1393,13 @@ def format_num_bytes(num_bytes: int) -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -1410,13 +1410,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -1442,9 +1442,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -2754,7 +2754,7 @@ class PredicateTimeout(Timeout):
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -2764,7 +2764,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -4019,6 +4019,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -4040,7 +4041,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -4059,7 +4060,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -4092,7 +4093,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -4100,7 +4101,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -4114,14 +4115,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -4134,7 +4135,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################

omdev/scripts/pyproject.py

@@ -2962,13 +2962,13 @@ def typing_annotations_attr() -> str:
 
 
 ########################################
-# ../../../omlish/logs/filters.py
+# ../../../omlish/logs/std/filters.py
 
 
 ##
 
 
-class TidLogFilter(logging.Filter):
+class TidLoggingFilter(logging.Filter):
     def filter(self, record):
         # FIXME: handle better - missing from wasm and cosmos
         if hasattr(threading, 'get_native_id'):
@@ -2979,13 +2979,13 @@ class TidLogFilter(logging.Filter):
 
 
 ########################################
-# ../../../omlish/logs/proxy.py
+# ../../../omlish/logs/std/proxy.py
 
 
 ##
 
 
-class ProxyLogFilterer(logging.Filterer):
+class ProxyLoggingFilterer(logging.Filterer):
     def __init__(self, underlying: logging.Filterer) -> None:  # noqa
         self._underlying = underlying
 
@@ -3011,9 +3011,9 @@ class ProxyLogFilterer(logging.Filterer):
         return self._underlying.filter(record)
 
 
-class ProxyLogHandler(ProxyLogFilterer, logging.Handler):
+class ProxyLoggingHandler(ProxyLoggingFilterer, logging.Handler):
     def __init__(self, underlying: logging.Handler) -> None:  # noqa
-        ProxyLogFilterer.__init__(self, underlying)
+        ProxyLoggingFilterer.__init__(self, underlying)
 
     _underlying: logging.Handler
 
@@ -5411,7 +5411,7 @@ class PredicateTimeout(Timeout):
 
 
 ########################################
-# ../../../omlish/logs/json.py
+# ../../../omlish/logs/std/json.py
 """
 TODO:
  - translate json keys
@@ -5421,7 +5421,7 @@ TODO:
 ##
 
 
-class JsonLogFormatter(logging.Formatter):
+class JsonLoggingFormatter(logging.Formatter):
     KEYS: ta.Mapping[str, bool] = {
         'name': False,
         'msg': False,
@@ -6676,6 +6676,7 @@ inj = InjectionApi()
 # ../../../omlish/logs/standard.py
 """
 TODO:
+ - !! move to std !!
  - structured
  - prefixed
  - debug
@@ -6697,7 +6698,7 @@ STANDARD_LOG_FORMAT_PARTS = [
 ]
 
 
-class StandardLogFormatter(logging.Formatter):
+class StandardLoggingFormatter(logging.Formatter):
     @staticmethod
     def build_log_format(parts: ta.Iterable[ta.Tuple[str, str]]) -> str:
         return ' '.join(v for k, v in parts)
@@ -6716,7 +6717,7 @@ class StandardLogFormatter(logging.Formatter):
 ##
 
 
-class StandardConfiguredLogHandler(ProxyLogHandler):
+class StandardConfiguredLoggingHandler(ProxyLoggingHandler):
     def __init_subclass__(cls, **kwargs):
         raise TypeError('This class serves only as a marker and should not be subclassed.')
 
@@ -6749,7 +6750,7 @@ def configure_standard_logging(
         target: ta.Optional[logging.Logger] = None,
         force: bool = False,
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
-) -> ta.Optional[StandardConfiguredLogHandler]:
+) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
             target = logging.root
@@ -6757,7 +6758,7 @@ def configure_standard_logging(
         #
 
         if not force:
-            if any(isinstance(h, StandardConfiguredLogHandler) for h in list(target.handlers)):
+            if any(isinstance(h, StandardConfiguredLoggingHandler) for h in list(target.handlers)):
                 return None
 
         #
@@ -6771,14 +6772,14 @@ def configure_standard_logging(
 
         formatter: logging.Formatter
         if json:
-            formatter = JsonLogFormatter()
+            formatter = JsonLoggingFormatter()
         else:
-            formatter = StandardLogFormatter(StandardLogFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
         handler.setFormatter(formatter)
 
         #
 
-        handler.addFilter(TidLogFilter())
+        handler.addFilter(TidLoggingFilter())
 
         #
 
@@ -6791,7 +6792,7 @@ def configure_standard_logging(
 
         #
 
-        return StandardConfiguredLogHandler(handler)
+        return StandardConfiguredLoggingHandler(handler)
 
 
 ########################################
@@ -8941,7 +8942,7 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
         #         '*.c',
         #         '*.cc',
         #         '*.h',
-        #         '.manifests.json',
+        #         '.omlish-manifests.json',
         #         'LICENSE',
         #     ],
         # }

{omdev-0.0.0.dev424.dist-info → omdev-0.0.0.dev425.dist-info}/METADATA

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

{omdev-0.0.0.dev424.dist-info → omdev-0.0.0.dev425.dist-info}/RECORD

@@ -1,8 +1,8 @@
-omdev/.manifests.json,sha256=ZAZsJbIOCRvMs_KnlVkZov1U0KUzvvprzUP3UtLSpX8,12182
+omdev/.omlish-manifests.json,sha256=diaasURIGOs_kTukNgRFlaZ3Vq7kRGYLvOKAP5hqeMU,11909
 omdev/__about__.py,sha256=fQNmzSa1MntcPSrzg_Vpo6JRU2RbXik2NqRz0oQCApE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
-omdev/imgur.py,sha256=oG4jZH2EAk1my0JzoPNes-4LCtF2_aU08vmKbGzmuxo,3129
+omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
 omdev/pip.py,sha256=PqzAWDO_CbiZvXzJAZcCkFqWynUDls1jIgBWlrswQyA,2012
 omdev/tagstrings.py,sha256=cBmAc9-TtOBupvGQ9G4T1jjjtzijx4ihQCBu6FezzV0,5490
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,7 +90,7 @@ omdev/ci/docker/cmds.py,sha256=1aSLQqbMJpdAMskxfeGI-he5Amb910RWvo2DE6ZgID8,3067
 omdev/ci/docker/dataserver.py,sha256=v5q5z0HaGMMSbDhh7xsGePwBfmkn-dL8b2JVotbMVRs,5880
 omdev/ci/docker/imagepulling.py,sha256=Ut-qE7nmuCxNw5l_LpeJdCcu9f7MCX_KuEFyFkBYMd0,1875
 omdev/ci/docker/inject.py,sha256=vlWoIJHx2hzCai4wWspIcWnR3WhZ2bsOjq7fqq0qozE,2006
-omdev/ci/docker/packing.py,sha256=IayecomyP6AdaiKP1-Ki1wcb2ayfZz2mDqHWbPD8y50,2022
+omdev/ci/docker/packing.py,sha256=ePvHU6rtMh7fq8Ijethuw8eCfjOTi-xhzBQbLSk7M0A,2021
 omdev/ci/docker/repositories.py,sha256=-uNB93u3pOxsOeib4xovixtbhwGhFWVfxQ00V8Yy89Y,1278
 omdev/ci/docker/utils.py,sha256=7Tobiq2hMxicGpQfTkDoU7oTa8Tyw47LpDh8C554LLs,1135
 omdev/ci/docker/cacheserved/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -185,7 +185,7 @@ omdev/magic/styles.py,sha256=6LAL7XR3fkkH2rh-8nwUvdCYVHBkQxCfP0oEuPuw1Bg,670
 omdev/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
 omdev/manifests/_dumping.py,sha256=LqrqmiiJp774xW2nxNqt4qWOzN-UhLSMJf_eUss8D0s,52703
-omdev/manifests/building.py,sha256=vdUJNcuZtJUNDLjnEOIXsptnGh_oxNEclQGMUM6HGKA,13832
+omdev/manifests/building.py,sha256=LHUUuu5a4_uG9kskQIFsHU-lyMnfToHyW2vS34yu35s,13846
 omdev/manifests/dumping.py,sha256=WUIZDvOyO25AhnCPn5Nxj2OkMcZa1LRjGuCnpyx8AL8,4506
 omdev/manifests/main.py,sha256=mYb8iM5bdwaO8jSd9_hIBSoYLf2h7e0iLb9aCCbgJ6c,2175
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -266,16 +266,16 @@ omdev/pyproject/cexts.py,sha256=GLD4fe61M_fHhdMcKlcQNUoCb7MeVXY6Fw-grKH4hTU,4264
 omdev/pyproject/cli.py,sha256=Umsu2bcJUYeeVXICaZFhKckUBT6VWuYDL4htgCGGQIs,8749
 omdev/pyproject/configs.py,sha256=baNRwHtUW8S8DKCxuKlMbV3Gduujd1PyNURxQ48Nnxk,2813
 omdev/pyproject/inject.py,sha256=Von8_8ofkITLoCEwDHNRAwY0AEdFQg7r2ILS8kcTMuY,325
-omdev/pyproject/pkg.py,sha256=b3lMCIJY9H-c3B2fbrM9h2njZPxJUYw2eabKlarQVXo,14895
+omdev/pyproject/pkg.py,sha256=DYvq5j-Qsfi9ehUx1Dbvq3RhUsYpTq8ebzW_W9twNbQ,14902
 omdev/pyproject/reqs.py,sha256=PmML_hxPyt7HL4z4gd9Sr7OlExnRLGOYsf8QpD141c0,2418
 omdev/pyproject/venvs.py,sha256=_vwhcgMxWUpu1ojNyVw2Zlx1gWwpW_c5EfPMijUqwgU,1918
 omdev/pyproject/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQo04dR1czcc,838
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
-omdev/scripts/ci.py,sha256=RcaPmV0_M7OYSPrzJWeSOvlfBY1JeI2XgUKaHw_MsNY,371152
-omdev/scripts/interp.py,sha256=31eOLNomhUy9OinV3fLXW2Etc4PYqtW_wVi8vWP5Vec,162513
-omdev/scripts/pyproject.py,sha256=7P6rscfhfhtDikZb0AVyPSgKfuNlutn3_Bj3_mO2EOQ,278706
+omdev/scripts/ci.py,sha256=a3m2wAGzXGBH7JpWTHBOnBfoMk6GY7tP4l330jqu_GU,374487
+omdev/scripts/interp.py,sha256=cUzE8sCoY0DmCNBl_mK1VV7TJhJ0JZP04UJM8Jrfn10,162610
+omdev/scripts/pyproject.py,sha256=rPADZxS4rElSZCuujtGNt98N_yoGhauGSdsiLCWLGIQ,278810
 omdev/scripts/slowcat.py,sha256=PwdT-pg62imEEb6kcOozl9_YUi-4KopvjvzWT1OmGb0,2717
 omdev/scripts/tmpexec.py,sha256=t0nErDRALjTk7H0X8ADjZUIDFjlPNzOOokmjCjBHdzs,1431
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -296,11 +296,6 @@ omdev/tools/qr.py,sha256=1p4tMJmImDa4YTQQNPwQPkM8FnhGRYj6J79BJR-MNHo,1742
 omdev/tools/shadow.py,sha256=4E2ilxa16liIvQxvgU37ITkOMrP6ufShRQfeW7wwtRc,1697
 omdev/tools/shell.py,sha256=5hF_8DCtB3XrzJSfmQDsr7X3Fi9KRV4M70q9qp0KREA,2341
 omdev/tools/sqlrepl.py,sha256=TcLJlElzfXqYUkfIOwhJHtXiQjXOg4xBTwSoSRDpNkg,5758
-omdev/tools/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/tools/antlr/__main__.py,sha256=7db8YIfCp4GoU-lW7jJJDiLQ6dDrd25M7gUv1AHGj4w,170
-omdev/tools/antlr/cli.py,sha256=QeO5vSUJDL43lAa2EYsLnN-jZBcNOTwB1C9Ua_h7qoA,1228
-omdev/tools/antlr/consts.py,sha256=4xH4jyNE5czXRWCn65jFF0MrAodMPe_kYMWpgMxWmpo,289
-omdev/tools/antlr/gen.py,sha256=spYfyfX_r_1YT4uZ_bEhtGwANenUtZvSOFck5eiNHhQ,5122
 omdev/tools/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/git/__main__.py,sha256=gI87SBUgTkKUcUM-RtZWnei-UUDDqzbr5aPztb-gvbE,168
 omdev/tools/git/cli.py,sha256=I4AiCTz4OCzK6s8J2TJF1eYw9FH2JIK_CsdjQH_9UTE,16757
@@ -324,9 +319,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.dev424.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev424.dist-info/METADATA,sha256=4op3rDPil6eMw7DVQDINlO4nzTc0URmEiz4UU7113oQ,5100
-omdev-0.0.0.dev424.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev424.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev424.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev424.dist-info/RECORD,,
+omdev-0.0.0.dev425.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev425.dist-info/METADATA,sha256=Dd1v3YB72dri1LHiv9gxpaE4K4id4BRMcA6rj4Hooas,5100
+omdev-0.0.0.dev425.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev425.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev425.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev425.dist-info/RECORD,,

omdev/tools/antlr/__main__.py

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

omdev/tools/antlr/cli.py

@@ -1,62 +0,0 @@
-import logging
-import re
-import subprocess
-import sys
-
-from omlish.argparse import all as ap
-from omlish.logs import all as logs
-
-from .consts import ANTLR_RUNTIME_PACKAGE
-from .gen import GenPy
-from .gen import get_jar_path
-
-
-log = logging.getLogger(__name__)
-
-
-##
-
-
-class Cli(ap.Cli):
-    @ap.cmd()
-    def jar(self) -> None:
-        print(get_jar_path())
-
-    @ap.cmd()
-    def latest(self) -> None:
-        o, _ = subprocess.Popen(
-            [
-                sys.executable,
-                '-m', 'pip',
-                'index', 'versions',
-                ANTLR_RUNTIME_PACKAGE,
-            ],
-            stdout=subprocess.PIPE,
-        ).communicate()
-        tl = o.decode().splitlines()[0]
-        m = re.fullmatch(rf'{ANTLR_RUNTIME_PACKAGE} \((?P<version>[^)]+)\)', tl)
-        if m is None:
-            raise ValueError(f'Failed to parse version: {tl}')
-        v = m.groupdict()['version']
-        print(v)
-
-    #
-
-    @ap.cmd(
-        ap.arg('roots', nargs='+'),
-    )
-    def gen(self) -> None:
-        gp = GenPy(
-            self.args.roots,
-        )
-        gp.run()
-
-
-def _main() -> None:
-    logs.configure_standard_logging(logging.INFO)
-    cli = Cli()
-    cli()
-
-
-if __name__ == '__main__':
-    _main()

omdev/tools/antlr/consts.py

@@ -1,7 +0,0 @@
-ANTLR_VERSION = '4.13.2'
-ANTLR_JAR_NAME = f'antlr-{ANTLR_VERSION}-complete.jar'
-ANTLR_JAR_URL = f'https://www.antlr.org/download/{ANTLR_JAR_NAME}'
-ANTLR_RUNTIME_PACKAGE = 'antlr4-python3-runtime'
-ANTLR_GITHUB_REPO = 'antlr/antlr4'
-
-ANTLR_RUNTIME_VENDOR = 'omlish.text.antlr._runtime._all'

omdev/tools/antlr/gen.py

@@ -1,188 +0,0 @@
-"""
-TODO:
- - mtime cmp
- - parallelism
-"""
-import logging
-import os.path
-import re
-import shutil
-import subprocess
-import typing as ta
-
-from omlish import check
-from omlish import lang
-from omlish.os.paths import is_path_in_dir
-
-from ...cache import data as dcache
-from .consts import ANTLR_JAR_URL
-from .consts import ANTLR_RUNTIME_VENDOR
-
-
-log = logging.getLogger(__name__)
-
-
-##
-
-
-ANTLR_JAR_CACHE = dcache.UrlSpec(ANTLR_JAR_URL)
-
-
-@lang.cached_function
-def get_jar_path() -> str:
-    return dcache.default().get(ANTLR_JAR_CACHE)
-
-
-##
-
-
-def _find_dirs(*base_paths: str, filter: ta.Callable[[str], bool] = lambda _: True) -> ta.Sequence[str]:  # noqa
-    return sorted(
-        os.path.join(dp, dn)
-        for base_path in base_paths
-        for dp, dns, fns in os.walk(base_path)
-        for dn in dns
-        if filter(dn)
-    )
-
-
-def _find_files(*base_paths: str, filter: ta.Callable[[str], bool] = lambda _: True) -> ta.Sequence[str]:  # noqa
-    return sorted(
-        os.path.join(dp, fn)
-        for base_path in base_paths
-        for dp, dns, fns in os.walk(base_path)
-        for fn in fns
-        if filter(fn)
-    )
-
-
-class GenPy:
-    def __init__(
-            self,
-            root_dirs: str,  # noqa
-            *,
-            out_subdir: str = '_antlr',
-            runtime_import: str = ANTLR_RUNTIME_VENDOR,
-            jar_path: str | None = None,
-            # parallelism: int | None = None,
-    ) -> None:
-        super().__init__()
-
-        check.non_empty_str(out_subdir)
-        check.arg(not os.path.isabs(out_subdir) and '.' not in out_subdir and '/' not in out_subdir)
-
-        self._root_dirs = frozenset(check.non_empty_str(rd) for rd in check.not_isinstance(root_dirs, str))
-        self._out_subdir = out_subdir
-        self._runtime_import = runtime_import
-        self._given_jar_path = jar_path
-
-    #
-
-    def _rmtree(self, tgt: str) -> None:  # noqa
-        if not any(is_path_in_dir(rd, tgt) for rd in self._root_dirs):
-            raise RuntimeError(f'Refusing to delete {tgt!r} outside of {self._root_dirs!r}')
-        shutil.rmtree(tgt)
-
-    #
-
-    @lang.cached_function
-    def jar_path(self) -> str:
-        if (gjp := self._given_jar_path) is not None:
-            return gjp
-        return get_jar_path()
-
-    #
-
-    def process_g4(self, g4_file: str) -> None:
-        ap = os.path.abspath(g4_file)
-        check.state(os.path.isfile(ap))
-
-        od = os.path.join(os.path.dirname(ap), self._out_subdir)
-        os.makedirs(od, exist_ok=True)
-
-        log.info('Compiling grammar %s', g4_file)
-
-        try:
-            subprocess.check_call([
-                'java',
-                '-jar', self.jar_path(),
-                '-Dlanguage=Python3',
-                '-visitor',
-                '-o', self._out_subdir,
-                os.path.basename(g4_file),
-            ], cwd=os.path.dirname(ap))
-
-        except Exception:  # noqa
-            log.exception('Exception in grammar %s', g4_file)
-            raise
-
-    def process_py(self, py_file: str) -> None:
-        ap = os.path.abspath(py_file)
-        with open(ap) as f:
-            in_lines = list(f)
-
-        pfp = py_file.split(os.sep)
-        arp = ANTLR_RUNTIME_VENDOR.split('.')
-        if (cpl := lang.common_prefix_len(pfp, arp)) > 0:
-            pkg_depth = len(os.path.normpath(py_file).split(os.path.sep))
-            antlr_imp = '.'.join([*([''] * (pkg_depth - cpl)), *arp[cpl:]])
-        else:
-            antlr_imp = ANTLR_RUNTIME_VENDOR
-
-        out_lines = [
-            '# type: ignore\n',
-            '# ruff: noqa\n',
-            '# flake8: noqa\n',
-            '# @omlish-generated\n',
-        ]
-
-        for l in in_lines:
-            l = re.sub(r'^(from antlr4)(.*)', rf'from {antlr_imp}\2', l)
-            out_lines.append(l)
-
-        with open(ap, 'w') as f:
-            f.write(''.join(out_lines))
-
-    def process_dir(self, dir: str) -> None:  # noqa
-        log.info('Processing directory %s', dir)
-
-        ad = os.path.join(dir, self._out_subdir)
-        if os.path.exists(ad):
-            self._rmtree(ad)
-
-        for f in os.listdir(dir):
-            fp = os.path.join(dir, f)
-            if not os.path.isfile(fp) or not f.endswith('.g4'):
-                continue
-
-            self.process_g4(fp)
-
-        if not os.path.exists(ad):
-            return
-
-        ip = os.path.join(ad, '__init__.py')
-        check.state(not os.path.exists(ip))
-
-        for f in list(os.listdir(ad)):
-            fp = os.path.join(ad, f)
-            if not os.path.isfile(fp):
-                continue
-
-            if f.split('.')[-1] in ('interp', 'tokens'):
-                os.unlink(fp)
-
-            elif f != '__init__.py' and f.endswith('.py'):
-                self.process_py(fp)
-
-        with open(ip, 'w'):
-            pass
-
-    def run(self) -> None:
-        dns = _find_dirs(*self._root_dirs, filter=lambda dn: os.path.basename(dn) == '_antlr')
-        for dn in dns:
-            self._rmtree(dn)
-
-        fns = _find_files(*self._root_dirs, filter=lambda fn: fn.endswith('.g4'))
-        fds = {os.path.dirname(fn) for fn in fns}
-        for dn in sorted(fds):
-            self.process_dir(dn)