omdev 0.0.0.dev416__py3-none-any.whl → 0.0.0.dev500__py3-none-any.whl

omdev/{.manifests.json → .omlish-manifests.json}

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 333,
+    "line": 335,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cmake",
@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 233,
+    "line": 263,
     "value": {
       "!.cli.types.CliModule": {
         "name": "cli",
@@ -73,7 +73,7 @@
   },
   {
     "module": ".imgur",
-    "attr": "_FOO_CLI_MODULE",
+    "attr": "_CLI_MODULE",
     "file": "omdev/imgur.py",
     "line": 136,
     "value": {
@@ -157,38 +157,11 @@
       }
     }
   },
-  {
-    "module": ".ptk.apps.ncdu",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/ptk/apps/ncdu.py",
-    "line": 162,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "ptk/ncdu",
-        "module": "omdev.ptk.apps.ncdu"
-      }
-    }
-  },
-  {
-    "module": ".ptk.markdown.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/ptk/markdown/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": [
-          "ptk/markdown",
-          "ptk/md"
-        ],
-        "module": "omdev.ptk.markdown.__main__"
-      }
-    }
-  },
   {
     "module": ".py.attrdocs",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/attrdocs.py",
-    "line": 160,
+    "line": 159,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/attrdocs",
@@ -236,7 +209,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 89,
+    "line": 92,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/execstat",
@@ -284,7 +257,7 @@
     "module": ".py.tools.mkrelimp",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/tools/mkrelimp.py",
-    "line": 149,
+    "line": 148,
     "value": {
       "!.cli.types.CliModule": {
         "name": "py/mkrelimp",
@@ -328,18 +301,6 @@
       }
     }
   },
-  {
-    "module": ".tools.antlr.__main__",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/tools/antlr/__main__.py",
-    "line": 4,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "antlr",
-        "module": "omdev.tools.antlr.__main__"
-      }
-    }
-  },
   {
     "module": ".tools.cloc",
     "attr": "_CLI_MODULE",
@@ -380,7 +341,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 259,
+    "line": 271,
     "value": {
       "!.cli.types.CliModule": {
         "name": "docker",
@@ -503,7 +464,7 @@
     "module": ".tools.pip",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/pip.py",
-    "line": 123,
+    "line": 131,
     "value": {
       "!.cli.types.CliModule": {
         "name": "pip",
@@ -573,5 +534,20 @@
         "module": "omdev.tools.sqlrepl"
       }
     }
+  },
+  {
+    "module": ".tui.apps.markdown.__main__",
+    "attr": "_CLI_MODULE",
+    "file": "omdev/tui/apps/markdown/__main__.py",
+    "line": 4,
+    "value": {
+      "!.cli.types.CliModule": {
+        "name": [
+          "tui/markdown",
+          "tui/md"
+        ],
+        "module": "omdev.tui.apps.markdown.__main__"
+      }
+    }
   }
 ]

omdev/README.md

@@ -0,0 +1,51 @@
+# Overview
+
+Development utilities and support code.
+
+# Notable packages
+
+- **[cli](https://github.com/wrmsr/omlish/blob/master/omdev/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](https://github.com/wrmsr/omlish/blob/master/omdev/amalg)** - The [amalgamator](#amalgamation).
+
+- **[pyproject](https://github.com/wrmsr/omlish/blob/master/omdev/pyproject)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/omdev/scripts/pyproject.py)) - python project management tool.
+  wrangles but does not replace tools like venv, pip, setuptools, and uv. does things like sets up venvs, generates
+  [`.pkg`](https://github.com/wrmsr/omlish/blob/master/.pkg) directories and their `pyproject.toml`'s (from their
+  `__about__.py`'s), and packages them. 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](https://github.com/wrmsr/omlish/blob/master/omdev/ci)**
+  ([amalg](https://github.com/wrmsr/omlish/blob/master/omdev/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](https://github.com/wrmsr/omlish/blob/master/omdev/ci/github/api/v2)
+  github-action's caching system. unifies ci execution between local dev and github runners.
+
+- **[tools.json](https://github.com/wrmsr/omlish/blob/master/omdev/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/blob/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](https://github.com/wrmsr/omlish/blob/master/omdev/tools/json/formats.py) non-streaming input
+  formats.
+
+- **[tools.git](https://github.com/wrmsr/omlish/blob/master/omdev/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](https://github.com/wrmsr/omlish/blob/master/omdev/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/__about__.py

@@ -13,11 +13,11 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'black': [
-            'black ~= 25.1',
+            'black ~= 25.12',
         ],
 
         'c': [
-            'pycparser ~= 2.22',
+            'pycparser ~= 2.23',
             'pcpp ~= 1.30',
         ],
 
@@ -31,20 +31,23 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.17',
+            'mypy ~= 1.19',
         ],
 
         'prof': [
             'gprof2dot ~= 2025.4',
         ],
 
-        'ptk': [
-            'prompt-toolkit ~= 3.0',
-        ],
-
         'qr': [
             'segno ~= 1.6',
         ],
+
+        'tui': [
+            'rich ~= 14.2',
+            'textual ~= 7.0',  # [syntax]
+            'textual-dev ~= 1.8',
+            'textual-speedups ~= 0.2',
+        ],
     }
 
     entry_points = {
@@ -57,7 +60,8 @@ class Project(ProjectBase):
 
 
 class Setuptools(SetuptoolsBase):
-    cexts = True
+    cext = True
+    rs = True
 
     find_packages = {
         'include': [Project.name, f'{Project.name}.*'],

omdev/amalg/cli/main.py

@@ -26,7 +26,6 @@ Targets:
  - supervisor?
 """
 import argparse
-import logging
 import os.path
 import stat
 import typing as ta
@@ -38,7 +37,7 @@ from ..gen.gen import SCAN_COMMENT
 from ..gen.gen import AmalgGenerator
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/amalg/gen/gen.py

@@ -9,7 +9,8 @@ from omlish.algorithm import all as alg
 from omlish.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 
 from ...git.magic import GIT_DIFF_OMIT_MAGIC
-from ...tokens import all as tks
+from ...py.tokens import all as tks
+from ..info import AMALG_INFO_ATTR
 from .srcfiles import SrcFile
 from .srcfiles import make_src_file
 from .strip import strip_main_lines
@@ -32,18 +33,22 @@ SCAN_COMMENT = '# @omlish-amalg '
 
 
 class AmalgGenerator:
+    DEFAULT_TARGET_LINE_LEN: ta.ClassVar[int] = 120
+
     def __init__(
             self,
             main_path: str,
             *,
             mounts: ta.Mapping[str, str],
             output_dir: str | None = None,
+            target_line_len: int | None = DEFAULT_TARGET_LINE_LEN,
     ) -> None:
         super().__init__()
 
         self._main_path = main_path
         self._mounts = mounts
         self._output_dir = output_dir
+        self._target_line_len = target_line_len
 
     @cached.function
     def _src_files(self) -> dict[str, SrcFile]:
@@ -105,6 +110,40 @@ class AmalgGenerator:
 
         return [*additional_header_lines, *header_lines]
 
+    def gen_amalg_info_block(self, sfs: ta.Sequence[str]) -> str:
+        md = os.path.dirname(self._main_path)
+        src_files = self._src_files()
+        sf_dcts = [
+            dict(
+                path=os.path.relpath(sfn, md),
+                sha1=src_files[sfn].sha1,
+            )
+            for sfn in sfs
+        ]
+        sf_lines = [
+            ''.join([
+                '            dict(',
+                ', '.join([f'{k}={v!r}' for k, v in sf_dct.items()]),
+                '),',
+            ])
+            for sf_dct in sf_dcts
+        ]
+        if (tll := self._target_line_len) is not None:
+            sf_lines = [
+                l + '  # noqa' if len(l) >= tll else l
+                for l in sf_lines
+            ]
+
+        return '\n'.join([
+            f'def {AMALG_INFO_ATTR}():  # noqa',
+            f'    return dict(',
+            f'        src_files=[',
+            *sf_lines,
+            f'        ],',
+            f'    )',
+            '',
+        ])
+
     @cached.function
     def gen_amalg(self) -> str:
         src_files = self._src_files()
@@ -137,6 +176,13 @@ class AmalgGenerator:
             out.write(il if isinstance(il, str) else tks.join_toks(il.toks))
         if dct:
             out.write('\n\n')
+        ##
+
+        ts = list(alg.toposort({  # noqa
+            f.path: {mp for i in f.imports if (mp := i.mod_path) is not None}
+            for f in src_files.values()
+        }))
+        sfs = [sf for ss in ts for sf in sorted(ss)]
 
         ##
 
@@ -155,11 +201,8 @@ class AmalgGenerator:
 
         ##
 
-        ts = list(alg.toposort({  # noqa
-            f.path: {mp for i in f.imports if (mp := i.mod_path) is not None}
-            for f in src_files.values()
-        }))
-        sfs = [sf for ss in ts for sf in sorted(ss)]
+        out.write(self.gen_amalg_info_block(sfs))
+        out.write('\n\n')
 
         ##
 

omdev/amalg/gen/imports.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish import check
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 ##

omdev/amalg/gen/manifests.py

@@ -2,7 +2,7 @@ import ast
 
 from omlish import check
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 ##

omdev/amalg/gen/resources.py

@@ -4,7 +4,7 @@ import itertools
 import os.path
 import typing as ta
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 ##

omdev/amalg/gen/srcfiles.py

@@ -1,10 +1,11 @@
 import dataclasses as dc
+import hashlib
 import typing as ta
 
 from omlish import collections as col
 from omlish import lang
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 from .imports import Import
 from .imports import make_import
 from .manifests import comment_out_manifest_comment
@@ -26,6 +27,9 @@ from .typing import skip_root_level_if_type_checking_block
 class SrcFile:
     path: str
 
+    src_bytes: bytes = dc.field(repr=False)
+    sha1: str = dc.field(repr=False)
+
     src: str = dc.field(repr=False)
     tokens: tks.Tokens = dc.field(repr=False)
     lines: ta.Sequence[tks.Tokens] = dc.field(repr=False)
@@ -40,17 +44,33 @@ class SrcFile:
     has_binary_resources: bool = False
 
 
+def drop_amalg_comment_lines(lines: ta.Iterable[tks.Tokens]) -> list[tks.Tokens]:
+    out: list[tks.Tokens] = []
+    for l in lines:
+        cl = list(tks.ignore_ws(l, drop_nl=True, keep=['COMMENT']))
+        if len(cl) == 1 and (t := cl[0]).name == 'COMMENT':
+            if t.src.split()[1:2] == ['@omlish-amalg']:
+                continue
+        out.append(l)
+    return out
+
+
 def make_src_file(
         path: str,
         *,
         mounts: ta.Mapping[str, str],
 ) -> SrcFile:
-    with open(path) as f:
-        src = f.read().strip()
+    with open(path, 'rb') as f:
+        src_bytes = f.read()
 
+    sha1 = hashlib.sha1(src_bytes).hexdigest()  # noqa
+
+    src = src_bytes.decode('utf-8').strip()
     tokens = tks.src_to_tokens(src)
     lines = tks.split_lines(tokens)
 
+    lines = drop_amalg_comment_lines(lines)
+
     header_lines, cls = split_header_lines(lines)
 
     header_lines = strip_header_lines(header_lines)
@@ -102,6 +122,9 @@ def make_src_file(
     return SrcFile(
         path=path,
 
+        src_bytes=src_bytes,
+        sha1=sha1,
+
         src=src,
         tokens=tokens,
         lines=lines,

omdev/amalg/gen/strip.py

@@ -2,7 +2,7 @@ import re
 import typing as ta
 
 from ... import magic
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 ##

omdev/amalg/gen/types.py

@@ -1,6 +1,6 @@
 import typing as ta
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 Tokens: ta.TypeAlias = tks.Tokens

omdev/amalg/gen/typing.py

@@ -2,7 +2,7 @@ import dataclasses as dc
 
 from omlish import check
 
-from ...tokens import all as tks
+from ...py.tokens import all as tks
 
 
 ##

omdev/amalg/info.py

@@ -0,0 +1,32 @@
+# ruff: noqa: UP045
+# @omlish-lite
+import typing as ta
+
+
+##
+
+
+AMALG_INFO_ATTR = '__omlish_amalg__'
+
+
+class AmalgInfoSrcFile(ta.NamedTuple):
+    path: str
+    sha1: str
+
+
+class AmalgInfo(ta.NamedTuple):
+    src_files: ta.Sequence[AmalgInfoSrcFile]
+
+
+def get_amalg_info() -> ta.Optional[AmalgInfo]:
+    try:
+        fn = globals()[AMALG_INFO_ATTR]
+    except KeyError:
+        return None
+    dct = fn()
+    dct['src_files'] = [AmalgInfoSrcFile(**sf_dct) for sf_dct in dct['src_files']]
+    return AmalgInfo(**dct)
+
+
+def is_amalg() -> bool:
+    return AMALG_INFO_ATTR in globals()

omdev/cache/compute/storage.py

@@ -1,5 +1,7 @@
 import abc
 
+from omlish import lang
+
 from .types import CacheEntry
 from .types import CacheKey
 
@@ -7,7 +9,7 @@ from .types import CacheKey
 ##
 
 
-class Storage(abc.ABC):
+class Storage(lang.Abstract):
     @abc.abstractmethod
     def get(self, key: CacheKey) -> CacheEntry | None:
         raise NotImplementedError

omdev/cache/data/actions.py

@@ -39,7 +39,7 @@ class ExtractAction(Action, lang.Final):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     actions_poly = msh.polymorphism_from_subclasses(Action, naming=msh.Naming.SNAKE, strip_suffix=True)
     msh.install_standard_factories(
         msh.PolymorphismMarshalerFactory(actions_poly),

omdev/cache/data/cache.py

@@ -11,7 +11,6 @@ TODO:
  - download resume ala hf_hub
 """
 import contextlib
-import logging
 import os.path
 import shutil
 import subprocess
@@ -25,6 +24,7 @@ from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json
+from omlish.logs import all as logs
 from omlish.os.files import touch
 
 from ...git.shallow import git_shallow_clone
@@ -37,7 +37,7 @@ from .specs import Spec
 from .specs import UrlSpec
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
 
 
 ##

omdev/cache/data/specs.py

@@ -93,7 +93,7 @@ class GithubContentSpec(Spec):
 
 
 @lang.static_init
-def _install_standard_marshalling() -> None:
+def _install_standard_marshaling() -> None:
     specs_poly = msh.polymorphism_from_subclasses(Spec, naming=msh.Naming.SNAKE, strip_suffix=True)
     msh.install_standard_factories(
         msh.PolymorphismMarshalerFactory(specs_poly),

omdev/cexts/_boilerplate.cc

@@ -54,9 +54,8 @@ static PyMethodDef boilerplate_methods[] = {
 
 static struct PyModuleDef_Slot boilerplate_slots[] = {
     {Py_mod_exec, (void *) boilerplate_exec},
-// #if PY_VERSION_HEX >= 0x030D0000
-//     {Py_mod_gil, Py_MOD_GIL_NOT_USED},
-// #endif
+    {Py_mod_gil, Py_MOD_GIL_NOT_USED},
+    {Py_mod_multiple_interpreters, Py_MOD_MULTIPLE_INTERPRETERS_SUPPORTED},
     {0, NULL}
 };
 

omdev/cexts/_distutils/build_ext.py

@@ -37,7 +37,6 @@ License Agreement.
 """
 import contextlib
 import dataclasses as dc
-import logging
 import os
 import site
 import sys
@@ -46,6 +45,7 @@ import typing as ta
 from omlish import cached
 from omlish import check
 from omlish import lang
+from omlish.logs import all as logs
 
 from . import compilers
 from . import errors
@@ -55,7 +55,10 @@ from . import sysconfig
 from . import util
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 def _get_str_config_var(name: str) -> str:

omdev/cexts/_distutils/compilers/ccompiler.py

@@ -1,7 +1,6 @@
 """
 Contains CCompiler, an abstract base class that defines the interface for the Distutils compiler abstraction model.
 """
-import logging
 import os
 import re
 import sys
@@ -9,6 +8,7 @@ import typing as ta
 import warnings
 
 from omlish import check
+from omlish.logs import all as logs
 
 from ..dir_util import mkpath
 from ..errors import CompileError
@@ -25,7 +25,10 @@ from .options import Macro
 from .options import gen_preprocess_options
 
 
-log = logging.getLogger(__name__)
+log = logs.get_module_logger(globals())
+
+
+##
 
 
 class CCompiler:

omdev/cexts/_distutils/compilers/options.py

@@ -4,6 +4,9 @@ import typing as ta
 from ..util import always_iterable
 
 
+##
+
+
 Macro: ta.TypeAlias = tuple[str, str | None] | tuple[str]