omdev 0.0.0.dev440__py3-none-any.whl → 0.0.0.dev495__py3-none-any.whl

omdev/.omlish-manifests.json

@@ -27,7 +27,7 @@
     "module": ".cexts.cmake",
     "attr": "_CLI_MODULE",
     "file": "omdev/cexts/cmake.py",
-    "line": 332,
+    "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",
@@ -157,33 +157,6 @@
       }
     }
   },
-  {
-    "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",
@@ -491,7 +464,7 @@
     "module": ".tools.pip",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/pip.py",
-    "line": 123,
+    "line": 131,
     "value": {
       "!.cli.types.CliModule": {
         "name": "pip",
@@ -561,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,7 +13,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'black': [
-            'black ~= 25.1',
+            'black ~= 25.12',
         ],
 
         'c': [
@@ -31,20 +31,23 @@ class Project(ProjectBase):
         ],
 
         'mypy': [
-            'mypy ~= 1.18',
+            'mypy ~= 1.19',
         ],
 
         'prof': [
             'gprof2dot ~= 2025.4',
         ],
 
-        'ptk': [
-            'prompt-toolkit ~= 3.0',
-        ],
-
         'qr': [
             'segno ~= 1.6',
         ],
+
+        'tui': [
+            'rich ~= 14.2',
+            'textual ~= 6.11',  # [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/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)
@@ -56,9 +60,12 @@ def make_src_file(
         *,
         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)
 
@@ -115,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/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/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/cmake.py

@@ -266,7 +266,10 @@ class CmakeProjectGen:
                         '-g',
                         '-c',
                     ],
-                    ['-std=c++20'],
+                    [
+                        '$<$<COMPILE_LANGUAGE:C>:-std=c11>',
+                        '$<$<COMPILE_LANGUAGE:CXX>:-std=c++20>',
+                    ],
                 ),
             ))
 

omdev/ci/cli.py

@@ -14,7 +14,6 @@ import argparse
 import asyncio
 import itertools
 import os.path
-import sys
 import typing as ta
 
 from omlish.argparse.cli import ArgparseCli
@@ -23,7 +22,7 @@ from omlish.argparse.cli import argparse_cmd
 from omlish.lite.check import check
 from omlish.lite.inject import inj
 from omlish.logs.modules import get_module_logger
-from omlish.logs.standard import configure_standard_logging
+from omlish.logs.std.standard import configure_standard_logging
 
 from .cache import DirectoryFileCache
 from .ci import Ci
@@ -260,7 +259,7 @@ async def _async_main() -> ta.Optional[int]:
 def _main() -> None:
     configure_standard_logging('DEBUG')
 
-    sys.exit(rc if isinstance(rc := asyncio.run(_async_main()), int) else 0)
+    raise SystemExit(rc if isinstance(rc := asyncio.run(_async_main()), int) else 0)
 
 
 if __name__ == '__main__':

omdev/cli/clicli.py

@@ -1,9 +1,11 @@
+import dataclasses as dc
 import inspect
 import os
 import re
 import shlex
 import subprocess
 import sys
+import time
 import typing as ta
 import urllib.parse
 import urllib.request
@@ -13,6 +15,7 @@ from omlish import lang
 from omlish.argparse import all as ap
 from omlish.os.temp import temp_dir_context
 
+from ..packaging.versions import Version
 from ..pip import get_root_dists
 from ..pip import lookup_latest_package_version
 from . import install
@@ -87,22 +90,49 @@ class CliCli(ap.Cli):
 
     #
 
+    @dc.dataclass()
+    class ReinstallWouldNotUpgradeError(Exception):
+        current_version: str
+        target_version: str
+
+        def __str__(self) -> str:
+            return f'Current version {self.current_version} is not older than target version {self.target_version} '
+
     @ap.cmd(
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
         ap.arg('--no-uv', action='store_true'),
         ap.arg('--dry-run', action='store_true'),
+        ap.arg('--must-upgrade', action='store_true'),
+        ap.arg('--must-upgrade-loop', action='store_true'),
         ap.arg('--version'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
-        latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
-
-        if self.args.version is not None:
-            target_version: str = self.args.version
-        else:
-            target_version = latest_version
+        current_version = __about__.__version__
+
+        while True:
+            latest_version = _parse_latest_version_str(lookup_latest_package_version(__package__.split('.')[0]))
+
+            if self.args.version is not None:
+                target_version: str = self.args.version
+            else:
+                target_version = latest_version
+
+            if self.args.must_upgrade or self.args.must_upgrade_loop:
+                current_vo = Version(current_version)
+                target_vo = Version(target_version)
+                if not (target_vo > current_vo):
+                    ex = CliCli.ReinstallWouldNotUpgradeError(current_version, target_version)
+                    if self.args.must_upgrade_loop:
+                        print(ex)
+                        time.sleep(1)
+                        continue
+                    else:
+                        raise ex
+
+            break
 
         #
 
@@ -186,7 +216,7 @@ class CliCli(ap.Cli):
 
         #
 
-        print(f'Current version: {__about__.__version__}')
+        print(f'Current version: {current_version}')
         print(f'Latest version: {latest_version}')
         print(f'Target version: {target_version}')
         print()

omdev/cmdlog/cli.py

@@ -1,7 +1,6 @@
 import argparse
 import os.path
 import subprocess
-import sys
 import typing as ta
 
 from omlish.formats import json
@@ -60,7 +59,7 @@ def _main() -> None:
             entry_dcts = [json.loads(sl) for l in log_lines if (sl := l.strip())]
             print(json.dumps_compact(entry_dcts))
 
-    sys.exit(rc)
+    raise SystemExit(rc)
 
 
 if __name__ == '__main__':