omdev 0.0.64__tar.gz → 0.0.66__tar.gz

{omdev-0.0.64/omdev.egg-info → omdev-0.0.66}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.64
+Version: 0.0.66
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,21 +14,21 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.64
+Requires-Dist: omcore==0.0.66
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.64; extra == "ominfra"
+Requires-Dist: ominfra==0.0.66; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.64; extra == "omllm"
+Requires-Dist: omllm==0.0.66; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.10; extra == "black"
 Provides-Extra: c
-Requires-Dist: pycparser~=3.1; extra == "c"
+Requires-Dist: pycparser~=3.11; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.23; extra == "doc"
 Provides-Extra: ocr
 Requires-Dist: rapidocr~=3.10; extra == "ocr"
-Requires-Dist: onnxruntime~=1.30; extra == "ocr"
+Requires-Dist: onnxruntime~=1.31; extra == "ocr"
 Provides-Extra: pillow
 Requires-Dist: pillow~=12.3; extra == "pillow"
 Provides-Extra: prof
@@ -38,7 +38,7 @@ Requires-Dist: basedpyright~=1.40; extra == "pyright"
 Provides-Extra: qr
 Requires-Dist: segno~=1.6; extra == "qr"
 Provides-Extra: ruff
-Requires-Dist: ruff~=0.16; extra == "ruff"
+Requires-Dist: ruff~=0.17; extra == "ruff"
 Provides-Extra: tui-syntax
 Requires-Dist: tree-sitter~=0.26; extra == "tui-syntax"
 Requires-Dist: tree-sitter-bash~=0.25; extra == "tui-syntax"
@@ -57,25 +57,25 @@ Requires-Dist: tree-sitter-toml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "tui-syntax"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "tui-syntax"
 Provides-Extra: cext
-Requires-Dist: omdev-cext==0.0.64; extra == "cext"
+Requires-Dist: omdev-cext==0.0.66; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.64; extra == "rs"
+Requires-Dist: omdev-rs==0.0.66; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.64; extra == "cli"
+Requires-Dist: omdev-cli==0.0.66; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.64; extra == "all"
-Requires-Dist: omllm==0.0.64; extra == "all"
+Requires-Dist: ominfra==0.0.66; extra == "all"
+Requires-Dist: omllm==0.0.66; extra == "all"
 Requires-Dist: black~=26.10; extra == "all"
-Requires-Dist: pycparser~=3.1; extra == "all"
+Requires-Dist: pycparser~=3.11; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.23; extra == "all"
 Requires-Dist: rapidocr~=3.10; extra == "all"
-Requires-Dist: onnxruntime~=1.30; extra == "all"
+Requires-Dist: onnxruntime~=1.31; extra == "all"
 Requires-Dist: pillow~=12.3; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: basedpyright~=1.40; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
-Requires-Dist: ruff~=0.16; extra == "all"
+Requires-Dist: ruff~=0.17; extra == "all"
 Requires-Dist: tree-sitter~=0.26; extra == "all"
 Requires-Dist: tree-sitter-bash~=0.25; extra == "all"
 Requires-Dist: tree-sitter-css~=0.25; extra == "all"
@@ -92,9 +92,9 @@ Requires-Dist: tree-sitter-sql~=0.3; extra == "all"
 Requires-Dist: tree-sitter-toml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-xml~=0.7; extra == "all"
 Requires-Dist: tree-sitter-yaml~=0.7; extra == "all"
-Requires-Dist: omdev-cext==0.0.64; extra == "all"
-Requires-Dist: omdev-rs==0.0.64; extra == "all"
-Requires-Dist: omdev-cli==0.0.64; extra == "all"
+Requires-Dist: omdev-cext==0.0.66; extra == "all"
+Requires-Dist: omdev-rs==0.0.66; extra == "all"
+Requires-Dist: omdev-cli==0.0.66; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.64 → omdev-0.0.66}/omdev/__about__.py

@@ -27,7 +27,7 @@ class Project(ProjectBase):
         ],
 
         'c': [
-            'pycparser ~= 3.1',
+            'pycparser ~= 3.11',
 
             'pcpp ~= 1.30',
         ],
@@ -38,7 +38,7 @@ class Project(ProjectBase):
 
         'ocr': [
             'rapidocr ~= 3.10',
-            'onnxruntime ~= 1.30',
+            'onnxruntime ~= 1.31',
         ],
 
         'pillow': [
@@ -58,10 +58,10 @@ class Project(ProjectBase):
         ],
 
         'ruff': [
-            'ruff ~= 0.16',
+            'ruff ~= 0.17',
         ],
 
-        # 'sqlrepl': [
+        # 'sqlrepl':
         #     'litecli ~= 1.17',
         #     'mycli ~= 2.17',
         #     'pgcli ~= 4.6',

{omdev-0.0.64 → omdev-0.0.66}/omdev/amalg/gen/gen.py

@@ -1,3 +1,4 @@
+import hashlib
 import io
 import os.path
 import textwrap
@@ -11,6 +12,7 @@ from omcore.lite.runtime import LITE_REQUIRED_PYTHON_VERSION
 from ...git.magic import GIT_DIFF_OMIT_MAGIC
 from ...py.tokens import all as tks
 from ..info import AMALG_INFO_ATTR
+from ..info import AMALG_SHA1_ATTR
 from .srcfiles import SrcFile
 from .srcfiles import make_src_file
 from .strip import strip_main_lines
@@ -113,10 +115,11 @@ class AmalgGenerator:
     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,
+                path=os.path.relpath(sfn, md),
             )
             for sfn in sfs
         ]
@@ -134,7 +137,16 @@ class AmalgGenerator:
                 for l in sf_lines
             ]
 
+        file_sha1_src = ''.join([
+            f'{sfd["sha1"]} {sfd["path"]} \n'
+            for sfd in sf_dcts
+        ])
+        file_sha1 = hashlib.sha1(file_sha1_src.encode('utf-8')).hexdigest()  # noqa
+
         return '\n'.join([
+            f'{AMALG_SHA1_ATTR} = {file_sha1!r}',
+            '',
+            '',
             f'def {AMALG_INFO_ATTR}():  # noqa',
             f'    return dict(',
             f'        src_files=[',

{omdev-0.0.64 → omdev-0.0.66}/omdev/amalg/info.py

@@ -6,6 +6,8 @@ import typing as ta
 ##
 
 
+AMALG_SHA1_ATTR = '__om_amalg_sha1__'
+
 AMALG_INFO_ATTR = '__om_amalg__'
 
 

{omdev-0.0.64 → omdev-0.0.66}/omdev/clipboard/commands.py

@@ -12,6 +12,36 @@ from .types import TextClipboardContents
 ##
 
 
+class CommandError(subprocess.CalledProcessError):
+    def __str__(self):
+        msg = super().__str__()
+        if self.stderr:
+            msg += f'\nstderr:\n{self.stderr.strip()}'
+        return msg
+
+
+def check_subprocess_output(cmd: ta.Sequence[str], **kwargs: ta.Any) -> str:
+    result = subprocess.run(
+        cmd,
+        capture_output=True,
+        check=True,
+        **kwargs,
+    )
+
+    if result.returncode != 0:
+        raise CommandError(
+            result.returncode,
+            cmd,
+            result.stdout,
+            result.stderr.decode(),  # noqa
+        )
+
+    return result.stdout.decode()  # noqa
+
+
+##
+
+
 class TextCommandClipboard(Clipboard, lang.Abstract):
     @property
     @abc.abstractmethod
@@ -19,7 +49,7 @@ class TextCommandClipboard(Clipboard, lang.Abstract):
         raise NotImplementedError
 
     def get(self) -> list[ClipboardContents]:
-        s = subprocess.check_output(self._get_cmd).decode()
+        s = check_subprocess_output(self._get_cmd)
         return [TextClipboardContents(s)]
 
     @property
@@ -29,7 +59,7 @@ class TextCommandClipboard(Clipboard, lang.Abstract):
 
     def put(self, c: ClipboardContents) -> None:
         if isinstance(c, TextClipboardContents):
-            subprocess.run(self._put_cmd, input=c.s.encode(), check=True)
+            check_subprocess_output(self._put_cmd, input=c.s.encode())
         else:
             raise TypeError(c)
 

{omdev-0.0.64 → omdev-0.0.66}/omdev/clipboard/types.py

@@ -1,4 +1,9 @@
-"""https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility"""
+"""
+https://askubuntu.com/questions/11925/a-command-line-clipboard-copy-and-paste-utility
+
+TODO:
+ - async? timeout?
+"""
 import abc
 import dataclasses as dc
 

{omdev-0.0.64 → omdev-0.0.66}/omdev/cmdlog/_cmdlog.py

@@ -1,4 +1,4 @@
-# NOTE: not '@om-lite' due to root level __init__ imports, but effectively lite.
+# @om-lite
 import dataclasses as dc
 import fcntl
 import json

{omdev-0.0.64 → omdev-0.0.66}/omdev/dataclasses/_dumping.py

@@ -35,18 +35,21 @@ if sys.version_info < (3, 8):
     raise OSError(f'Requires python (3, 8), got {sys.version_info} from {sys.executable}')  # noqa
 
 
+__om_amalg_sha1__ = 'b0dbf6e7f68fd479c78d16ae24fded4773ae164e'
+
+
 def __om_amalg__():  # noqa
     return dict(
         src_files=[
-            dict(path='../../omcore/lite/abstract.py', sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac'),
-            dict(path='../../omcore/lite/check.py', sha1='62b9ccea94c4f7bcef97e7adae8674b8cb11d4af'),
-            dict(path='../../omcore/lite/io.py', sha1='a60d94f0bdbb2b1541d363c301314682d1686240'),
-            dict(path='../../omcore/lite/objects.py', sha1='9566bbf3530fd71fcc56321485216b592fae21e9'),
-            dict(path='../../omcore/lite/reflect.py', sha1='64d51b5de91131349d56e4154ed235eb7fff4fd0'),
-            dict(path='../../omcore/lite/strings.py', sha1='b31b8e4b0e4fec4562ea3fa602e4ef2475e5fe7c'),
-            dict(path='../../omcore/lite/json.py', sha1='01124e62093ebd4078602f16df0ec04cb724a612'),
-            dict(path='../../omcore/lite/marshal.py', sha1='9b3f4ff802344313147f412f8f028922afc52b2f'),
-            dict(path='dumping.py', sha1='ae2f3a87e05e31449ea9afb2e8b5998a854d78a1'),
+            dict(sha1='a2fc3f3697fa8de5247761e9d554e70176f37aac', path='../../omcore/lite/abstract.py'),
+            dict(sha1='62b9ccea94c4f7bcef97e7adae8674b8cb11d4af', path='../../omcore/lite/check.py'),
+            dict(sha1='a60d94f0bdbb2b1541d363c301314682d1686240', path='../../omcore/lite/io.py'),
+            dict(sha1='9566bbf3530fd71fcc56321485216b592fae21e9', path='../../omcore/lite/objects.py'),
+            dict(sha1='64d51b5de91131349d56e4154ed235eb7fff4fd0', path='../../omcore/lite/reflect.py'),
+            dict(sha1='b31b8e4b0e4fec4562ea3fa602e4ef2475e5fe7c', path='../../omcore/lite/strings.py'),
+            dict(sha1='01124e62093ebd4078602f16df0ec04cb724a612', path='../../omcore/lite/json.py'),
+            dict(sha1='9b3f4ff802344313147f412f8f028922afc52b2f', path='../../omcore/lite/marshal.py'),
+            dict(sha1='ae2f3a87e05e31449ea9afb2e8b5998a854d78a1', path='dumping.py'),
         ],
     )
 

omdev-0.0.66/omdev/dockerdev/TODO.md

@@ -0,0 +1,23 @@
+- if launching detached write-back the container id to the db
+- embedded launch
+  - exec, sync, async, asyncio :|
+  - don't pipe stderr/stdout
+- (run) profiles
+  - auto mount r/o git share
+- autoexec - multiple options
+  - can run `bash -c 'barf barf barf && <user stuff>'
+    - or mount temp dir and exec a file in there
+  - can fast-build new (temp) image w preamble (probably slow and garbagey)
+- launch / manage compose services
+- more cache dirs
+- `--mount=type=bind,src="$(pwd)",dst=/om/pwd`
+- build --no-cache / cache bust
+  - build args
+- `run --pull=never`, `build --pull=false`
+- !! shadow config !!
+  - default autoexec, default env vars
+- idiom: mirror host paths directly (even on dar) - `/Users/spinlock/...`, `/home/spinlock/...`, etc
+  - eases remote debug
+- `docker buildx imagetools inspect --format '{{.Manifest.Digest}}' ubuntu:24.04`
+- build: per-feature config, obv
+- install pnpm

{omdev-0.0.64 → omdev-0.0.66}/omdev/dockerdev/_dataclasses.py

@@ -32,7 +32,7 @@ IMPLEMENTATION_KEY = 'ec0d825a77daf2010440f2135dbf8d063599428f1d09d40e22d60773f9
 
 
 @_register(
-    installer_sha1='ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77',
+    installer_sha1='dd8fd1e2a543faf54378144fc6d42b05f562e850',
     spec_keys=(
         (
             "(((True, True, True, False, False, True, True, False, False, False, False, False, False, False, False, Fal"
@@ -42,22 +42,23 @@ IMPLEMENTATION_KEY = 'ec0d825a77daf2010440f2135dbf8d063599428f1d09d40e22d60773f9
             "'value', None, False, False, False), (('gid', True, True, None, True, False, False, None), 'instance', 'va"
             "lue', None, False, False, False), (('workdir', True, True, None, True, False, False, None), 'instance', 'v"
             "alue', None, False, False, False), (('dep_sets', True, True, None, True, True, False, None), 'instance', '"
-            "value', None, False, False, False), (('cuda_version', True, True, None, True, True, False, None), 'instanc"
-            "e', 'value', None, False, False, False), (('jdks', True, True, None, True, True, False, None), 'instance',"
-            " 'value', None, False, False, False), (('nvm_versions', True, True, None, True, True, False, None), 'insta"
-            "nce', 'value', None, False, False, False), (('rbenv_versions', True, True, None, True, True, False, None),"
-            " 'instance', 'value', None, False, False, False), (('uv_python_versions', True, True, None, True, True, Fa"
-            "lse, None), 'instance', 'value', None, False, False, False), (('pyenv_version_keys', True, True, None, Tru"
-            "e, True, False, None), 'instance', 'value', None, False, False, False), (('cache_mounts', True, True, None"
-            ", True, True, False, None), 'instance', 'value', None, False, False, False)), False, 0, ()), ((False,), (F"
-            "alse,), (), (False,), (False, False, ()), ((),), (), (False,)))"
+            "value', None, False, False, False), (('llvm_versions', True, True, None, True, True, False, None), 'instan"
+            "ce', 'value', None, False, False, False), (('cuda_version', True, True, None, True, True, False, None), 'i"
+            "nstance', 'value', None, False, False, False), (('jdks', True, True, None, True, True, False, None), 'inst"
+            "ance', 'value', None, False, False, False), (('nvm_versions', True, True, None, True, True, False, None), "
+            "'instance', 'value', None, False, False, False), (('rbenv_versions', True, True, None, True, True, False, "
+            "None), 'instance', 'value', None, False, False, False), (('uv_python_versions', True, True, None, True, Tr"
+            "ue, False, None), 'instance', 'value', None, False, False, False), (('pyenv_version_keys', True, True, Non"
+            "e, True, True, False, None), 'instance', 'value', None, False, False, False), (('cache_mounts', True, True"
+            ", None, True, True, False, None), 'instance', 'value', None, False, False, False)), False, 0, ()), ((False"
+            ",), (False,), (), (False,), (False, False, ()), ((),), (), (False,)))"
         ),
     ),
     cls_names=(
         ('omdev.dockerdev.config', 'Config'),
     ),
 )
-def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
+def _process_dataclass__dd8fd1e2a543faf54378144fc6d42b05f562e850():
     def _process_dataclass(
         __class__,
         __dataclass__spec,
@@ -89,6 +90,8 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
         __dataclass__init__fields__11__default = __dataclass__spec.fields[11].default.must()
         __dataclass__init__fields__12__annotation = __dataclass__spec.fields[12].annotation
         __dataclass__init__fields__12__default = __dataclass__spec.fields[12].default.must()
+        __dataclass__init__fields__13__annotation = __dataclass__spec.fields[13].annotation
+        __dataclass__init__fields__13__default = __dataclass__spec.fields[13].default.must()
         __dataclass__FrozenInstanceError = __dataclass__globals['__dataclass__FrozenInstanceError']
         __dataclass__None = __dataclass__globals['__dataclass__None']
         __dataclass___recursive_repr = __dataclass__globals['__dataclass___recursive_repr']
@@ -105,6 +108,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
                 gid=self.gid,
                 workdir=self.workdir,
                 dep_sets=self.dep_sets,
+                llvm_versions=self.llvm_versions,
                 cuda_version=self.cuda_version,
                 jdks=self.jdks,
                 nvm_versions=self.nvm_versions,
@@ -128,6 +132,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
                 self.gid == other.gid and
                 self.workdir == other.workdir and
                 self.dep_sets == other.dep_sets and
+                self.llvm_versions == other.llvm_versions and
                 self.cuda_version == other.cuda_version and
                 self.jdks == other.jdks and
                 self.nvm_versions == other.nvm_versions and
@@ -146,6 +151,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
             'gid',
             'workdir',
             'dep_sets',
+            'llvm_versions',
             'cuda_version',
             'jdks',
             'nvm_versions',
@@ -183,6 +189,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
                 self.gid,
                 self.workdir,
                 self.dep_sets,
+                self.llvm_versions,
                 self.cuda_version,
                 self.jdks,
                 self.nvm_versions,
@@ -203,13 +210,14 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
             workdir: __dataclass__init__fields__04__annotation = __dataclass__init__fields__04__default,
             *,
             dep_sets: __dataclass__init__fields__05__annotation = __dataclass__init__fields__05__default,
-            cuda_version: __dataclass__init__fields__06__annotation = __dataclass__init__fields__06__default,
-            jdks: __dataclass__init__fields__07__annotation = __dataclass__init__fields__07__default,
-            nvm_versions: __dataclass__init__fields__08__annotation = __dataclass__init__fields__08__default,
-            rbenv_versions: __dataclass__init__fields__09__annotation = __dataclass__init__fields__09__default,
-            uv_python_versions: __dataclass__init__fields__10__annotation = __dataclass__init__fields__10__default,
-            pyenv_version_keys: __dataclass__init__fields__11__annotation = __dataclass__init__fields__11__default,
-            cache_mounts: __dataclass__init__fields__12__annotation = __dataclass__init__fields__12__default,
+            llvm_versions: __dataclass__init__fields__06__annotation = __dataclass__init__fields__06__default,
+            cuda_version: __dataclass__init__fields__07__annotation = __dataclass__init__fields__07__default,
+            jdks: __dataclass__init__fields__08__annotation = __dataclass__init__fields__08__default,
+            nvm_versions: __dataclass__init__fields__09__annotation = __dataclass__init__fields__09__default,
+            rbenv_versions: __dataclass__init__fields__10__annotation = __dataclass__init__fields__10__default,
+            uv_python_versions: __dataclass__init__fields__11__annotation = __dataclass__init__fields__11__default,
+            pyenv_version_keys: __dataclass__init__fields__12__annotation = __dataclass__init__fields__12__default,
+            cache_mounts: __dataclass__init__fields__13__annotation = __dataclass__init__fields__13__default,
         ) -> __dataclass__None:
             __dataclass__object_setattr(self, 'base_image', base_image)
             __dataclass__object_setattr(self, 'base_image_id', base_image_id)
@@ -217,6 +225,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
             __dataclass__object_setattr(self, 'gid', gid)
             __dataclass__object_setattr(self, 'workdir', workdir)
             __dataclass__object_setattr(self, 'dep_sets', dep_sets)
+            __dataclass__object_setattr(self, 'llvm_versions', llvm_versions)
             __dataclass__object_setattr(self, 'cuda_version', cuda_version)
             __dataclass__object_setattr(self, 'jdks', jdks)
             __dataclass__object_setattr(self, 'nvm_versions', nvm_versions)
@@ -236,6 +245,7 @@ def _process_dataclass__ffbc7d6b1d8496146fa0fcaa533c7844a7f7fc77():
             parts.append(f"gid={self.gid!r}")
             parts.append(f"workdir={self.workdir!r}")
             parts.append(f"dep_sets={self.dep_sets!r}")
+            parts.append(f"llvm_versions={self.llvm_versions!r}")
             parts.append(f"cuda_version={self.cuda_version!r}")
             parts.append(f"jdks={self.jdks!r}")
             parts.append(f"nvm_versions={self.nvm_versions!r}")

{omdev-0.0.64 → omdev-0.0.66}/omdev/dockerdev/build.py

@@ -1,9 +1,8 @@
 """
-TODO:
- - docker buildx imagetools inspect --format '{{.Manifest.Digest}}' ubuntu:24.04
+.
+docker buildx imagetools inspect --format '{{.Manifest.Digest}}' ubuntu:24.04
 """
 import os.path
-import re
 import subprocess
 import tempfile
 
@@ -11,15 +10,13 @@ from omcore import check
 
 from .config import Config
 from .gen import gen_src
+from .utils import PREFIXED_SHA256_PAT
 from .utils import run_and_tee
 
 
 ##
 
 
-SHA_PAT = re.compile(r'sha256:[0-9a-f]{64}')
-
-
 def build_image(
         cfg: Config,
         *,
@@ -68,7 +65,7 @@ def build_image(
 
     if not verbose:
         out = subprocess.check_output(['docker', 'build', '-q', *build_args]).decode()
-        if (m := SHA_PAT.search(out)) is not None:
+        if (m := PREFIXED_SHA256_PAT.search(out)) is not None:
             return m.group(0)
         raise RuntimeError("Can't find sha256 in output")
 
@@ -76,6 +73,6 @@ def build_image(
         proc, out = run_and_tee(['docker', 'build', *build_args])
         check.state(proc.returncode == 0)
         for line in reversed(out.splitlines()):
-            if (m := SHA_PAT.search(line)) is not None:
+            if (m := PREFIXED_SHA256_PAT.search(line)) is not None:
                 return m.group(0)
         raise RuntimeError("Can't find sha256 in output")

{omdev-0.0.64 → omdev-0.0.66}/omdev/dockerdev/cli.py

@@ -1,21 +1,4 @@
 """
-TODO:
- - (run) profiles
-   - auto mount r/o git share
- - autoexec - multiple options
-   - can run 'bash -c 'barf barf barf && <user stuff>'
-     - or mount temp dir and exec a file in there
-   - can fast-build new (temp) image w preamble (probably slow and garbagey)
- - launch / manage compose services
- - more cache dirs
- - --mount=type=bind,src="$(pwd)",dst=/om/pwd
- - build --no-cache / cache bust
-   - build args
- - `run --pull=never`, `build --pull=false`
- - !! shadow config !!
-   - default autoexec, default env vars
- - --runtime=nvidia --gpus=all --rm -it bash
-
 ====
 
 if [ -t 1 ] ; then TTY_ENV_ARGS="-e LINES=$(tput lines) -e COLUMNS=$(tput cols)" ; fi
@@ -41,6 +24,8 @@ from omcore import check
 from omcore import lang
 from omcore import marshal as msh
 from omcore.argparse import all as ap
+from omcore.docker.ps import DEFAULT_PS_FORMAT_STR
+from omcore.formats.json import all as json
 
 from ..home.secrets import load_secrets
 from .build import build_image
@@ -180,13 +165,13 @@ class Cli(ap.Cli):
 
         *_SHIFT_UID_ARGS,
 
-        ap.arg('--db', action='store_true'),
+        ap.arg('--no-db', action='store_true'),
 
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
     def run(self) -> None:
-        run_image(
+        container_id = run_image(
             self._load_config(),
 
             self._build_run_args(),
@@ -195,13 +180,17 @@ class Cli(ap.Cli):
                 load_secrets=load_secrets,
             ),
 
-            write_to_db=bool(self.args.db),
+            no_db=bool(self.args.no_db),
         )
 
+        print(container_id)
+
     #
 
     @ap.cmd(
         ap.arg('-j', '--json', action='store_true'),
+        ap.arg('-H', '--no-header', action='store_true'),
+        ap.arg('-I', '--id-only', action='store_true'),
 
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
@@ -212,11 +201,19 @@ class Cli(ap.Cli):
             'ps',
             *(self.unknown_args or []),
             f'--filter=label={ID_LABEL}',
-            *(['--format=json'] if self.args.json else []),
+            *(
+                ['--format={{.ID}}'] if self.args.id_only else
+                ['--format=json'] if self.args.json else
+                [f'--format={DEFAULT_PS_FORMAT_STR}'] if self.args.no_header else
+                []
+            ),
             *(self.args.args or []),
-        ])
+        ]).decode().strip()
+
+        if self.args.id_only and self.args.json:
+            out = json.dumps_compact([sl for l in out.splitlines() if (sl := l.strip())])
 
-        print(out.decode(), end='')
+        print(out)
 
     #
 

{omdev-0.0.64 → omdev-0.0.66}/omdev/dockerdev/config.py

@@ -25,6 +25,8 @@ class Config:
 
     dep_sets: ta.Sequence[str] | None = None
 
+    llvm_versions: ta.Sequence[str] | None = None
+
     cuda_version: str | None = None
 
     jdks: ta.Sequence[str] | None = None

{omdev-0.0.64 → omdev-0.0.66}/omdev/dockerdev/config.toml

@@ -7,6 +7,11 @@ dep_sets = [
     'x11',
 ]
 
+llvm_versions = [
+    '21',
+    '22',
+]
+
 cuda_version = '13.4'
 
 jdks = [