omdev 0.0.0.dev310__tar.gz → 0.0.0.dev312__tar.gz

{omdev-0.0.0.dev310/omdev.egg-info → omdev-0.0.0.dev312}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev310
+Version: 0.0.0.dev312
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev310
+Requires-Dist: omlish==0.0.0.dev312
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

omdev-0.0.0.dev312/README.md

@@ -0,0 +1,44 @@
+# Overview
+
+Development utilities and support code.
+
+# Notable packages
+
+- **[cli](cli)** - The codebase's all-in-one CLI. This is not installed as an entrypoint / command when this package is
+  itself installed - that is separated into the `omdev-cli` installable package so as to not pollute users' bin/
+  directories when depping this lib for its utility code.
+
+- **[amalg](amalg)** - The [amalgamator](#amalgamation).
+
+- **[pyproject](pyproject)** ([amalg](scripts/pyproject.py)) - python project management tool. wrangles but does not
+  replace tools like venv, pip, setuptools, and uv. this should grow to eat more and more of the Makefile. as it is
+  amalgamated it requires no installation and can just be dropped into other projects / repos.
+
+- **[ci](ci)** ([amalg](scripts/ci.py)) - ci runner. given a [compose.yml](https://github.com/wrmsr/omlish/blob/master/docker/compose.yml)
+  and requirements.txt files, takes care of building and caching of containers and venvs and execution of required ci
+  commands. detects and [natively uses](ci/github/api/v2) github-action's caching system. unifies ci execution between
+  local dev and github runners.
+
+- **[tools.json](tools/json)** (cli: `om j`) - a tool for json-like data, obviously in the vein of [jq](https://github.com/jqlang/jq)
+  but using the internal [jmespath](https://github.com/wrmsr/omlish/tree/master/omlish/specs/jmespath) engine. supports
+  [true streaming](https://github.com/wrmsr/omlish/blob/master/omlish/formats/json/stream) json input and output, as
+  well as [various other](tools/json/formats.py) non-streaming input formats.
+
+- **[tools.git](tools/git)** (cli: `om git`) - a tool for various lazy git operations, including the one that (poorly)
+  writes all of these commit messages.
+
+# Amalgamation
+
+Amalgamation is the process of stitching together multiple python source files into a single self-contained python
+script. ['lite'](https://github.com/wrmsr/omlish/blob/master/omlish#lite-code) code is written in a style conducive to
+this.
+
+# Local storage
+
+Some of this code, when asked, will store things on the local filesystem. The only directories used (outside of ones
+explicitly specified as command or function arguments) are managed in [home.paths](home/paths.py), and are the
+following:
+
+- `$OMLISH_HOME`, default of `~/.omlish` - persistent things like config and state.
+- `$OMLISH_CACHE`, default of `~/.cache/omlish` - used for things like the local ci cache and
+  [various other](https://github.com/search?q=repo%3Awrmsr%2Fomlish+%22dcache.%22&type=code) cached data.

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev/.manifests.json

@@ -290,6 +290,18 @@
       }
     }
   },
+  {
+    "module": ".tools.antlr.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tools/antlr/__main__.py",
+    "line": 4,
+    "value": {
+      "$.cli.types.CliModule": {
+        "cmd_name": "antlr",
+        "mod_name": "omdev.tools.antlr.__main__"
+      }
+    }
+  },
   {
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev/ptk/__init__.py

@@ -1,8 +1,7 @@
 # ruff: noqa: F401
 # flake8: noqa: F401
 
-from prompt_toolkit import Application
-from prompt_toolkit import prompt
+from prompt_toolkit.application import Application
 from prompt_toolkit.application import get_app
 from prompt_toolkit.application import get_app_session
 from prompt_toolkit.application import run_in_terminal
@@ -80,7 +79,9 @@ from prompt_toolkit.output import DummyOutput
 from prompt_toolkit.output import Output
 from prompt_toolkit.search import SearchDirection
 from prompt_toolkit.selection import SelectionType
+from prompt_toolkit.shortcuts import confirm
 from prompt_toolkit.shortcuts import print_formatted_text
+from prompt_toolkit.shortcuts import prompt
 from prompt_toolkit.styles import BaseStyle
 from prompt_toolkit.styles import DynamicStyle
 from prompt_toolkit.styles import Style
@@ -95,3 +96,5 @@ from prompt_toolkit.widgets.toolbars import FormattedTextToolbar
 from prompt_toolkit.widgets.toolbars import SearchToolbar
 from prompt_toolkit.widgets.toolbars import SystemToolbar
 from prompt_toolkit.widgets.toolbars import ValidationToolbar
+
+from .confirm import strict_confirm

omdev-0.0.0.dev312/omdev/ptk/confirm.py

@@ -0,0 +1,54 @@
+from prompt_toolkit.formatted_text import merge_formatted_text
+from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.key_binding import KeyPressEvent
+from prompt_toolkit.shortcuts import PromptSession
+
+from omlish import check
+
+
+##
+
+
+def create_strict_confirm_session(
+        message: str,
+        suffix: str = ' (y/n) ',
+) -> PromptSession[str | bool]:
+    """Create a `PromptSession` object for the 'confirm' function."""
+
+    bindings = KeyBindings()
+
+    @bindings.add('y')
+    @bindings.add('Y')
+    def yes(event: KeyPressEvent) -> None:
+        session.default_buffer.text = 'y'
+        event.app.exit(result=True)
+
+    @bindings.add('n')
+    @bindings.add('N')
+    def no(event: KeyPressEvent) -> None:
+        session.default_buffer.text = 'n'
+        event.app.exit(result=False)
+
+    complete_message = merge_formatted_text([message, suffix])
+    session: PromptSession[str | bool] = PromptSession(
+        complete_message,
+        key_bindings=bindings,
+    )
+    return session
+
+
+def strict_confirm(message: str = 'Confirm?', suffix: str = ' (y/n) ') -> bool:
+    """Display a confirmation prompt that returns True/False. Requires an explicit answer."""
+
+    while True:
+        session = create_strict_confirm_session(message, suffix)
+        ret = session.prompt()
+
+        if isinstance(ret, str):
+            check.empty(ret)
+
+        elif isinstance(ret, bool):
+            return ret
+
+        else:
+            raise TypeError(ret)

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev/ptk/markdown/markdown.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - accept pre-parsed tokens
+ - provide live view in this pkg
+"""
 import itertools
 import typing as ta
 
@@ -36,6 +41,7 @@ class Markdown:
     def __init__(
             self,
             markup: str,
+            *,
             width: int | None = None,
             strip_trailing_lines: bool = True,
     ) -> None:

omdev-0.0.0.dev312/omdev/tools/antlr/__main__.py

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

omdev-0.0.0.dev312/omdev/tools/antlr/cli.py

@@ -0,0 +1,62 @@
+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-0.0.0.dev310/omdev → omdev-0.0.0.dev312/omdev/tools}/antlr/consts.py

@@ -4,4 +4,4 @@ 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.antlr._runtime._all'
+ANTLR_RUNTIME_VENDOR = 'omlish.text.antlr._runtime._all'

omdev-0.0.0.dev312/omdev/tools/antlr/gen.py

@@ -0,0 +1,187 @@
+"""
+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',
+        ]
+
+        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)

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev/tools/git/cli.py

@@ -23,7 +23,6 @@ import dataclasses as dc
 import logging
 import os
 import re
-import sys
 import typing as ta
 import urllib.parse
 
@@ -380,6 +379,8 @@ class Cli(ap.Cli):
     )
     def update_submodule_branches(self) -> None:
         def run_submodule(submodule: str, cwd: str | None) -> None:
+            log.info('Updating submodule %s', submodule)
+
             submodule_path = submodule if cwd is None else os.path.join(cwd, submodule)
 
             # Get the HEAD branch from origin
@@ -401,21 +402,32 @@ class Cli(ap.Cli):
             subprocesses.check_call('git', 'checkout', head_branch, cwd=submodule_path)
             subprocesses.check_call('git', 'pull', cwd=submodule_path)
 
+        failed: set[str] = set()
+
         def run(cwd: str | None) -> None:
             submodules = subprocesses.check_output(
                 'git', 'submodule', 'foreach', '-q', 'echo $name',
                 cwd=cwd,
             ).decode().strip().splitlines()
 
-            for submodule in submodules:
+            for submodule in sorted(submodules):
                 try:
                     run_submodule(submodule, cwd)
-                except Exception as e:
+
+                except Exception:  # noqa
+                    failed.add(submodule)
+
                     if self.args.on_error_resume_next:
-                        print(e, file=sys.stderr)
+                        log.exception('Failed to update submodule %s', submodule)
                     else:
                         raise
 
+            if failed:
+                log.error(
+                    'The following submodules failed to update:\n%s',
+                    '\n'.join([f'  {f}' for f in failed]),
+                )
+
         if not self.args.dir:
             run(None)
         else:

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev310
+Version: 0.0.0.dev312
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev310
+Requires-Dist: omlish==0.0.0.dev312
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev.egg-info/SOURCES.txt

@@ -26,9 +26,6 @@ omdev/amalg/srcfiles.py
 omdev/amalg/strip.py
 omdev/amalg/types.py
 omdev/amalg/typing.py
-omdev/antlr/__init__.py
-omdev/antlr/consts.py
-omdev/antlr/gen.py
 omdev/cache/__init__.py
 omdev/cache/compute/__init__.py
 omdev/cache/compute/cache.py
@@ -215,6 +212,7 @@ omdev/precheck/main.py
 omdev/precheck/manifests.py
 omdev/precheck/scripts.py
 omdev/ptk/__init__.py
+omdev/ptk/confirm.py
 omdev/ptk/apps/__init__.py
 omdev/ptk/apps/ncdu.py
 omdev/ptk/markdown/LICENSE
@@ -276,6 +274,11 @@ omdev/tools/prof.py
 omdev/tools/qr.py
 omdev/tools/shadow.py
 omdev/tools/sqlrepl.py
+omdev/tools/antlr/__init__.py
+omdev/tools/antlr/__main__.py
+omdev/tools/antlr/cli.py
+omdev/tools/antlr/consts.py
+omdev/tools/antlr/gen.py
 omdev/tools/git/__init__.py
 omdev/tools/git/__main__.py
 omdev/tools/git/cli.py

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev310
+omlish==0.0.0.dev312
 
 [all]
 black~=25.1

{omdev-0.0.0.dev310 → omdev-0.0.0.dev312}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev310'
+version = '0.0.0.dev312'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev310',
+    'omlish == 0.0.0.dev312',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev310/README.md

@@ -1,17 +0,0 @@
-# Overview
-
-Development utilities and support code.
-
-# Notable packages
-
-- **[cli](cli)** - The codebase's all-in-one CLI. This is not installed as an entrypoint / command when this package is
-  itself installed - that is separated into the `omdev-cli` installable package so as to not pollute users' bin/
-  directories when depping this lib for its utility code.
-
-- **[amalg](amalg)** - The [amalgamator](#amalgamation).
-
-# Amalgamation
-
-Amalgamation is the process of stitching together multiple python source files into a single self-contained python
-script. ['lite'](https://github.com/wrmsr/omlish/blob/master/omlish#lite-code) code is written in a style conducive to
-this.