omdev 0.0.17__tar.gz → 0.0.18__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.17
+Version: 0.0.18
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.17
+Requires-Dist: omlish==0.0.18
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.17; extra == "all"
-Requires-Dist: ommlds==0.0.17; 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"
@@ -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.17; extra == "ominfra"
+Requires-Dist: ominfra==0.0.18; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.17; extra == "ommlds"
+Requires-Dist: ommlds==0.0.18; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.17 → 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.17 → 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.17 → 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.17 → 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)
 
@@ -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.17 → 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.17 → 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.17 → 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.17 → omdev-0.0.18}/omdev/dockerdev/cli.py

@@ -100,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'),
 
@@ -137,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,

{omdev-0.0.17 → 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.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.17 → 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
 
@@ -84,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
@@ -93,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:
@@ -209,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:
@@ -216,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(
@@ -233,7 +266,7 @@ def run_image(
 
     #
 
-    run_args = process_run_args(
+    p_args = process_run_args(
         cfg,
         args,
         sha,
@@ -241,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.17 → 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.17 → 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.17 → 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
 
 
@@ -684,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)
@@ -706,7 +708,7 @@ def _main() -> None:
 
         print('\n'.join(render_package_listing_columns(*format_for_columns(
             outdated_pkgs,
-            show_latest=args.show_latest or (args.min_age_h is None),
+            show_latest=show_latest,
         ))))
 
 

{omdev-0.0.17 → 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.17 → 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.17 → 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.17 → 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
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.17
+Version: 0.0.18
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.17
+Requires-Dist: omlish==0.0.18
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.17; extra == "all"
-Requires-Dist: ommlds==0.0.17; 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"
@@ -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.17; extra == "ominfra"
+Requires-Dist: ominfra==0.0.18; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.17; extra == "ommlds"
+Requires-Dist: ommlds==0.0.18; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.17 → omdev-0.0.18}/omdev.egg-info/SOURCES.txt

@@ -203,6 +203,7 @@ omdev/dockerdev/resources/fragments/workdir.sh
 omdev/dockerdev/resources/fragments/zig.sh
 omdev/dockerdev/resources/scripts/install-claude
 omdev/dockerdev/resources/scripts/install-codex
+omdev/dockerdev/resources/scripts/install-pi
 omdev/dockerdev/resources/scripts/run-dbus
 omdev/git/__init__.py
 omdev/git/magic.py
@@ -342,7 +343,6 @@ omdev/py/docstrings/parser.py
 omdev/py/docstrings/rest.py
 omdev/py/scripts/__init__.py
 omdev/py/scripts/bumpversion.py
-omdev/py/scripts/execstat.py
 omdev/py/scripts/importtrace.py
 omdev/py/tokens/__init__.py
 omdev/py/tokens/all.py

{omdev-0.0.17 → omdev-0.0.18}/omdev.egg-info/requires.txt

@@ -1,8 +1,8 @@
-omlish==0.0.17
+omlish==0.0.18
 
 [all]
-ominfra==0.0.17
-ommlds==0.0.17
+ominfra==0.0.18
+ommlds==0.0.18
 black~=26.3
 pycparser~=3.0
 pcpp~=1.30
@@ -35,10 +35,10 @@ pygments~=2.20
 mypy~=1.20
 
 [ominfra]
-ominfra==0.0.17
+ominfra==0.0.18
 
 [ommlds]
-ommlds==0.0.17
+ommlds==0.0.18
 
 [prof]
 gprof2dot~=2025.4

{omdev-0.0.17 → omdev-0.0.18}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.14'
-version = '0.0.17'
+version = '0.0.18'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,13 +24,13 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.17',
+    'omlish == 0.0.18',
 ]
 
 [project.optional-dependencies]
 all = [
-    'ominfra == 0.0.17',
-    'ommlds == 0.0.17',
+    'ominfra == 0.0.18',
+    'ommlds == 0.0.18',
     'black ~= 26.3',
     'pycparser ~= 3.0',
     'pcpp ~= 1.30',
@@ -47,10 +47,10 @@ all = [
     'textual-speedups ~= 0.2',
 ]
 ominfra = [
-    'ominfra == 0.0.17',
+    'ominfra == 0.0.18',
 ]
 ommlds = [
-    'ommlds == 0.0.17',
+    'ommlds == 0.0.18',
 ]
 black = [
     'black ~= 26.3',