omdev 0.0.16__tar.gz → 0.0.18__tar.gz

{omdev-0.0.16/omdev.egg-info → omdev-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.16
+Version: 0.0.18
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,16 +14,16 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.16
+Requires-Dist: omlish==0.0.18
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.16; extra == "all"
-Requires-Dist: ommlds==0.0.16; extra == "all"
+Requires-Dist: ominfra==0.0.18; extra == "all"
+Requires-Dist: ommlds==0.0.18; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.22; extra == "all"
-Requires-Dist: markdown-it-py~=4.0; extra == "all"
-Requires-Dist: mdit-py-plugins~=0.5; extra == "all"
+Requires-Dist: markdown-it-py~=4.2; extra == "all"
+Requires-Dist: mdit-py-plugins~=0.6; extra == "all"
 Requires-Dist: pygments~=2.20; extra == "all"
 Requires-Dist: mypy~=1.20; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.16; extra == "ominfra"
+Requires-Dist: ominfra==0.0.18; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.16; extra == "ommlds"
+Requires-Dist: ommlds==0.0.18; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c
@@ -43,8 +43,8 @@ Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.22; extra == "doc"
-Requires-Dist: markdown-it-py~=4.0; extra == "doc"
-Requires-Dist: mdit-py-plugins~=0.5; extra == "doc"
+Requires-Dist: markdown-it-py~=4.2; extra == "doc"
+Requires-Dist: mdit-py-plugins~=0.6; extra == "doc"
 Requires-Dist: pygments~=2.20; extra == "doc"
 Provides-Extra: mypy
 Requires-Dist: mypy~=1.20; extra == "mypy"

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

@@ -241,18 +241,6 @@
       }
     }
   },
-  {
-    "module": ".py.scripts.execstat",
-    "attr": "_CLI_MODULE",
-    "file": "omdev/py/scripts/execstat.py",
-    "line": 92,
-    "value": {
-      "!.cli.types.CliModule": {
-        "name": "py/execstat",
-        "module": "omdev.py.scripts.execstat"
-      }
-    }
-  },
   {
     "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",

{omdev-0.0.16 → omdev-0.0.18}/omdev/__about__.py

@@ -34,8 +34,8 @@ class Project(ProjectBase):
         'doc': [
             'docutils ~= 0.22',
 
-            'markdown-it-py ~= 4.0',
-            'mdit-py-plugins ~= 0.5',
+            'markdown-it-py ~= 4.2',
+            'mdit-py-plugins ~= 0.6',
 
             'pygments ~= 2.20',
         ],

{omdev-0.0.16 → omdev-0.0.18}/omdev/cache/data/actions.py

@@ -18,6 +18,7 @@ from .consts import SERIALIZATION_VERSION
 
 
 @dc.dataclass(frozen=True)
+@msh.set_polymorphic_from_subclasses(naming=msh.Naming.SNAKE, strip_suffix=True)
 class Action(lang.Abstract, lang.Sealed):
     serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 
@@ -33,15 +34,3 @@ def _non_empty_strs(v: ta.Sequence[str]) -> ta.Sequence[str]:
 class ExtractAction(Action, lang.Final):
     files: ta.Sequence[str] = dc.xfield(coerce=_non_empty_strs)
     keep_archive: bool = False
-
-
-##
-
-
-@lang.static_init
-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),
-        msh.PolymorphismUnmarshalerFactory(actions_poly),
-    )

{omdev-0.0.16 → omdev-0.0.18}/omdev/cache/data/cache.py

@@ -23,7 +23,7 @@ import urllib.request
 from omlish import check
 from omlish import lang
 from omlish import marshal as msh
-from omlish.formats import json
+from omlish.formats.json import all as json
 from omlish.logs import all as logs
 from omlish.os.files import touch
 

{omdev-0.0.16 → omdev-0.0.18}/omdev/cache/data/specs.py

@@ -10,7 +10,7 @@ from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
 from omlish import marshal as msh
-from omlish.formats import json as jf
+from omlish.formats.json import all as jf
 
 from .actions import Action
 from .consts import SERIALIZATION_VERSION
@@ -20,6 +20,7 @@ from .consts import SERIALIZATION_VERSION
 
 
 @dc.dataclass(frozen=True)
+@msh.set_polymorphic_from_subclasses(naming=msh.Naming.SNAKE, strip_suffix=True)
 class Spec(lang.Abstract, lang.Sealed):
     serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 
@@ -63,7 +64,7 @@ class UrlSpec(Spec):
 
     _: dc.KW_ONLY
 
-    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.with_field_options(omit_if=operator.not_)
+    headers: ta.Mapping[str, str] | None = dc.field(default=None) | msh.dc_field_options(omit_if=operator.not_)
 
     @cached.property
     def file_name_or_default(self) -> str:
@@ -87,15 +88,3 @@ class GithubContentSpec(Spec):
     repo: str = dc.field(validate=_repo_str)  # type: ignore
     rev: str
     files: lang.SequenceNotStr[str]
-
-
-##
-
-
-@lang.static_init
-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),
-        msh.PolymorphismUnmarshalerFactory(specs_poly),
-    )

{omdev-0.0.16 → omdev-0.0.18}/omdev/cc/cli.py

@@ -39,7 +39,7 @@ import typing as ta
 from omlish import check
 from omlish import marshal as msh
 from omlish.argparse import all as ap
-from omlish.formats import json
+from omlish.formats.json import all as json
 
 from .. import intellij as ij
 from .. import magic

{omdev-0.0.16 → omdev-0.0.18}/omdev/cmdlog/cli.py

@@ -3,7 +3,7 @@ import os.path
 import subprocess
 import typing as ta
 
-from omlish.formats import json
+from omlish.formats.json import all as json
 
 from .cmdlog import CmdLog
 

{omdev-0.0.16 → omdev-0.0.18}/omdev/dataclasses/codegen.py

@@ -291,7 +291,7 @@ class DataclassCodeGen:
         # Sorted by first cls name for more stable diffs than say sha1
         for grp in sorted(
                 dumped_by_plan_repr.values(),
-                key=lambda grp: sorted([(y.mod_name, y.cls_qualname) for y in grp])[0],
+                key=lambda grp: sorted([(y.cls_module, y.cls_qualname) for y in grp])[0],
         ):
             x = grp[0]
             pr = x.plan_repr
@@ -335,7 +335,7 @@ class DataclassCodeGen:
                 *[
                     f'        {cn!r},'
                     for cn in sorted([
-                        (y.mod_name, y.cls_qualname)
+                        (y.cls_module, y.cls_qualname)
                         for y in grp
                     ])
                 ],

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/cli.py

@@ -31,6 +31,7 @@ finally:
     subprocess.check_call(['docker', 'image', 'rm', tag], stdout=subprocess.DEVNULL)
 """
 import os
+import subprocess
 import sys
 import tomllib
 
@@ -42,6 +43,7 @@ from omlish.argparse import all as ap
 from .build import build_image
 from .config import Config
 from .gen import gen_src
+from .run import LABEL_PREFIX
 from .run import RunArgs
 from .run import run_image
 
@@ -85,7 +87,8 @@ class Cli(ap.Cli):
         ap.arg('--mount', action='append'),
         ap.arg('-C', '--mount-caches', action='store_true'),
         ap.arg('-D', '--mount-docker-sock', action='store_true'),
-        ap.arg('-G', '--mount-git', action='store_true'),
+        ap.arg('--mount-git', action='store_true'),
+        ap.arg('-G', '--clone-mount-git', action='store_true'),
 
         ap.arg('-P', '--privileged', action='store_true'),
 
@@ -97,6 +100,8 @@ class Cli(ap.Cli):
 
         ap.arg('-X', '--x11', action='store_true'),
 
+        ap.arg('--inject-secrets', action='append'),
+
         ap.arg('--shift-uid'),
         ap.arg('-U', '--auto-shift-uid', action='store_true'),
 
@@ -122,6 +127,7 @@ class Cli(ap.Cli):
                 mount_caches=bool(self.args.mount_caches),
                 mount_docker_sock=bool(self.args.mount_docker_sock),
                 mount_git=bool(self.args.mount_git),
+                clone_mount_git=bool(self.args.clone_mount_git),
 
                 privileged=bool(self.args.privileged),
 
@@ -133,6 +139,8 @@ class Cli(ap.Cli):
 
                 x11=bool(self.args.x11),
 
+                inject_secrets_pats=self.args.inject_secrets,
+
                 shift_uid=shift_uid,
 
                 unknown_args=self.unknown_args,
@@ -140,6 +148,26 @@ class Cli(ap.Cli):
             ),
         )
 
+    #
+
+    @ap.cmd(
+        ap.arg('-j', '--json', action='store_true'),
+
+        ap.arg('args', nargs=ap.REMAINDER),
+        accepts_unknown=True,
+    )
+    def ps(self) -> None:
+        out = subprocess.check_output([
+            'docker',
+            'ps',
+            *(self.unknown_args or []),
+            f'--filter=label={LABEL_PREFIX}',
+            *(['--format=json'] if self.args.json else []),
+            *(self.args.args or []),
+        ])
+
+        print(out.decode(), end='')
+
 
 def _main() -> None:
     Cli().cli_run_and_exit()

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/resources/.python-versions.json

@@ -8,12 +8,12 @@
   "13d": "3.13.13d",
   "13t": "3.13.13t",
   "13dt": "3.13.13dt",
-  "14": "3.14.4",
-  "14d": "3.14.4d",
-  "14t": "3.14.4t",
-  "14dt": "3.14.4dt",
-  "15": "3.15.0a8",
-  "15d": "3.15.0a8d",
-  "15t": "3.15.0a8t",
-  "15dt": "3.15.0a8dt"
+  "14": "3.14.5",
+  "14d": "3.14.5d",
+  "14t": "3.14.5t",
+  "14dt": "3.14.5dt",
+  "15": "3.15.0b1",
+  "15d": "3.15.0b1d",
+  "15t": "3.15.0b1t",
+  "15dt": "3.15.0b1dt"
 }

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/resources/configs/.tmux.conf

@@ -5,3 +5,4 @@ set -g status-fg black
 set -g history-limit 50000
 set -g update-environment "DISPLAY"
 set -sg default-terminal "xterm-256color"
+set -g extended-keys on

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/resources/scripts/install-claude

@@ -1,4 +1,4 @@
 #!/bin/bash
-set -ex
+set -e
 
 curl -fsSL 'https://claude.ai/install.sh' | bash

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/resources/scripts/install-codex

@@ -1,4 +1,4 @@
 #!/bin/bash
-set -ex
+set -e
 
 npm i -g @openai/codex

omdev-0.0.18/omdev/dockerdev/resources/scripts/install-pi

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+curl -fsSL https://pi.dev/install.sh | sh

{omdev-0.0.16 → omdev-0.0.18}/omdev/dockerdev/run.py

@@ -44,6 +44,7 @@ exec gosu omlish bash  # "$@"
 """
 import os.path
 import platform
+import re
 import shutil
 import sys
 import tempfile
@@ -53,8 +54,10 @@ from omlish import check
 from omlish import dataclasses as dc
 from omlish import lang
 from omlish.os.paths import is_path_in_dir
+from omlish.secrets import all as sec
 
 from ..home.paths import get_cache_dir
+from ..home.secrets import load_secrets
 from .build import build_image
 from .config import Config
 
@@ -70,6 +73,7 @@ class RunArgs:
     mount_caches: bool = False
     mount_docker_sock: bool = False
     mount_git: bool = False
+    clone_mount_git: bool = False
 
     privileged: bool = False
 
@@ -83,6 +87,9 @@ class RunArgs:
 
     no_default_labels: bool = False
 
+    # TODO: k=v? currently hardcodes env key as `sk.upper()`
+    inject_secrets_pats: ta.Sequence[str | re.Pattern[str]] | None = None
+
     shift_uid: tuple[int, int] | None = None
 
     unknown_args: ta.Sequence[str] | None = None
@@ -92,11 +99,21 @@ class RunArgs:
 LABEL_PREFIX = 'omlish.dockerdev'
 
 
+@dc.dataclass(frozen=True)
+@dc.extra_class_params(default_repr_fn=lang.opt_repr)
+class ProcessedRunArgs:
+    args: list[str]
+
+    _: dc.KW_ONLY
+
+    env: dict[str, str | sec.Secret] | None = None
+
+
 def process_run_args(
         cfg: Config,
         args: RunArgs,
         sha: str,
-) -> list[str]:
+) -> ProcessedRunArgs:
     run_args: list[str] = []
 
     if args.unknown_args:
@@ -127,11 +144,16 @@ def process_run_args(
             os.makedirs(cld, exist_ok=True)
             run_args.append(f'--mount=type=bind,src={cld},dst={cr}')
 
-    if args.mount_git:
+    autoexecs: list[str] = []
+
+    if args.mount_git or args.clone_mount_git:
         git_path = os.path.join(os.getcwd(), '.git')
         check.state(os.path.isdir(git_path))
         run_args.append(f'--mount=type=bind,src={git_path},dst=/git,ro')
 
+        if args.clone_mount_git:
+            autoexecs.append('git clone -q /git /work/git')
+
     if not args.no_host_platform:
         run_args.extend([f'--env=DOCKER_HOST_PLATFORM={platform.system().lower()}'])
 
@@ -145,13 +167,15 @@ def process_run_args(
 
     entrypoint: str | None = None
 
-    if args.autoexecs:
+    autoexecs.extend(args.autoexecs or [])
+
+    if autoexecs:
         tmp_ep = os.path.join(tmp_dir(), 'autoexec.sh')
         with open(tmp_ep, 'w') as f:
             f.write('\n'.join([
                 '#!/bin/sh',
                 'set -e',
-                *args.autoexecs,
+                *autoexecs,
                 'exec "$@"',
             ]))
         os.chmod(tmp_ep, 0o755)  # noqa
@@ -201,6 +225,20 @@ def process_run_args(
     if not args.no_default_labels:
         run_args.append(f'--label={LABEL_PREFIX}')
 
+    env: dict[str, str | sec.Secret] = {}
+
+    if isp_lst := args.inject_secrets_pats:
+        secrets = check.isinstance(load_secrets(), sec.IterableSecrets)
+
+        isp_pats: list[re.Pattern[str]] = [x if isinstance(x, re.Pattern) else re.compile(x) for x in isp_lst]
+
+        for sk in secrets:
+            if any(xp.fullmatch(sk) for xp in isp_pats):
+                ek = sk.upper()
+                env[ek] = secrets.get(sk)
+                run_args.append(f'--env={ek}')
+                break
+
     run_args.append(sha)
 
     if args.extra_args:
@@ -208,7 +246,10 @@ def process_run_args(
     else:
         run_args.append('bash')
 
-    return run_args
+    return ProcessedRunArgs(
+        run_args,
+        env=env or None,
+    )
 
 
 def run_image(
@@ -225,7 +266,7 @@ def run_image(
 
     #
 
-    run_args = process_run_args(
+    p_args = process_run_args(
         cfg,
         args,
         sha,
@@ -233,9 +274,16 @@ def run_image(
 
     #
 
-    os.execl(
+    os.execle(
         docker := check.not_none(shutil.which('docker')),
         docker,
         'run',
-        *run_args,
+        *p_args.args,
+        {
+            **os.environ,
+            **({
+                ek: ev.reveal() if isinstance(ev, sec.Secret) else ev
+                for ek, ev in p_args.env.items()
+            } if p_args.env else {}),
+        },
     )

{omdev-0.0.16 → omdev-0.0.18}/omdev/imgur.py

@@ -28,7 +28,7 @@ import typing as ta
 
 from omlish import check
 from omlish import marshal as msh
-from omlish.formats import json
+from omlish.formats.json import all as json
 from omlish.http import all as hu
 from omlish.secrets.secrets import Secret
 

{omdev-0.0.16 → omdev-0.0.18}/omdev/packaging/marshal.py

@@ -86,8 +86,8 @@ def _install_standard_marshaling() -> None:
         msh.ObjectOptions(
             fields=dict(
                 marker=msh.FieldOptions(
-                    marshal_as=RequiresMarkerList | None,
-                    unmarshal_as=RequiresMarkerList | None,
+                    marshal_via=msh.MarshalVia(RequiresMarkerList | None),
+                    unmarshal_via=msh.UnmarshalVia(RequiresMarkerList | None),
                 ),
             ),
         ),

{omdev-0.0.16 → omdev-0.0.18}/omdev/py/tools/pipdepup.py

@@ -49,7 +49,7 @@ from omlish import cached
 from omlish import check
 from omlish import collections as col
 from omlish.concurrent import all as conc
-from omlish.formats import json
+from omlish.formats.json import all as json
 from omlish.sync.objectpools import ObjectPool
 
 
@@ -511,7 +511,11 @@ def format_for_json(
 #
 
 
-def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], list[str]]:
+def format_for_columns(
+        pkgs: ta.Sequence[Package],
+        *,
+        show_latest: bool = False,
+) -> tuple[list[list[str]], list[str]]:
     """Convert the package data into something usable by output_package_listing_columns."""
 
     header = [
@@ -523,8 +527,10 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
         'Suggested',
         'Age',
 
-        'Latest',
-        'Age',
+        *([
+            'Latest',
+            'Age',
+        ] if show_latest else []),
     ]
 
     # def wheel_build_tag(dist: BaseDistribution) -> str | None:
@@ -545,9 +551,6 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
 
     rows = []
     for pkg in pkgs:
-        sc = check.not_none(pkg.suggested_candidate)
-        lc = check.not_none(pkg.latest_candidate)
-
         row = [
             pkg.dist.raw_name,
 
@@ -575,8 +578,12 @@ def format_for_columns(pkgs: ta.Sequence[Package]) -> tuple[list[list[str]], lis
             else:
                 row.append('')
 
+        sc = check.not_none(pkg.suggested_candidate)
         add_c(sc if sc.version != pkg.dist.version else None)
-        add_c(lc if sc is not lc else None)
+
+        if show_latest:
+            lc = check.not_none(pkg.latest_candidate)
+            add_c(lc if sc is not lc else None)
 
         # if has_build_tags:
         #     row.append(build_tags[i] or '')
@@ -632,6 +639,7 @@ def _main() -> None:
     parser = argparse.ArgumentParser()
     parser.add_argument('--exclude', action='append', dest='excludes')
     parser.add_argument('--min-age-h', type=float, default=3 * 24)
+    parser.add_argument('--show-latest', action='store_true')
     parser.add_argument('-P', '--parallelism', type=int, default=3)
     parser.add_argument('--json', action='store_true')
     args = parser.parse_args()
@@ -676,11 +684,13 @@ def _main() -> None:
 
     #
 
+    show_latest = args.show_latest or (args.min_age_h is None)
+
     outdated_pkgs = [
         pkg
         for pkg in pkgs
-        if (li := pkg.latest_candidate) is not None
-        and li.version > pkg.dist.version
+        if (xi := pkg.latest_candidate if show_latest else pkg.suggested_candidate) is not None
+        and xi.version > pkg.dist.version
     ]
 
     outdated_pkgs.sort(key=lambda x: x.dist.raw_name)
@@ -696,7 +706,10 @@ def _main() -> None:
         #     lambda pkg: pkg.latest_candidate is pkg.suggested_candidate,
         # )
 
-        print('\n'.join(render_package_listing_columns(*format_for_columns(outdated_pkgs))))
+        print('\n'.join(render_package_listing_columns(*format_for_columns(
+            outdated_pkgs,
+            show_latest=show_latest,
+        ))))
 
 
 if __name__ == '__main__':

{omdev-0.0.16 → omdev-0.0.18}/omdev/tools/docker.py

@@ -24,7 +24,7 @@ from omlish.argparse import all as ap
 from omlish.concurrent import all as conc
 from omlish.docker import all as dck
 from omlish.docker.ns1 import build_docker_ns1_run_cmd
-from omlish.formats import json
+from omlish.formats.json import all as json
 from omlish.formats.yaml import pyyaml
 from omlish.logs import all as logs
 

{omdev-0.0.16 → omdev-0.0.18}/omdev/tools/git/cli.py

@@ -32,7 +32,7 @@ from omlish import check
 from omlish import lang
 from omlish.argparse import all as ap
 from omlish.configs.processing.merging import merge_configs
-from omlish.formats import json
+from omlish.formats.json import all as json
 from omlish.formats.yaml import all as yaml
 from omlish.logs import all as logs
 from omlish.subprocesses.sync import subprocesses

{omdev-0.0.16 → omdev-0.0.18}/omdev/tools/pip.py

@@ -9,7 +9,7 @@ import typing as ta
 
 from omlish import marshal as msh
 from omlish.argparse import all as ap
-from omlish.formats import json
+from omlish.formats.json import all as json
 
 from ..cli import CliModule
 from ..packaging import marshal as _  # noqa

{omdev-0.0.16 → omdev-0.0.18}/omdev/tools/shell.py

@@ -3,7 +3,7 @@ import typing as ta
 
 from omlish import check
 from omlish.argparse import all as ap
-from omlish.formats import json
+from omlish.formats.json import all as json
 
 from ..cli.types import CliModule