omdev 0.0.60__tar.gz → 0.0.62__tar.gz

{omdev-0.0.60/omdev.egg-info → omdev-0.0.62}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.60
+Version: 0.0.62
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,20 +14,18 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.60
+Requires-Dist: omcore==0.0.62
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.60; extra == "ominfra"
+Requires-Dist: ominfra==0.0.62; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.60; extra == "omllm"
+Requires-Dist: omllm==0.0.62; extra == "omllm"
 Provides-Extra: black
-Requires-Dist: black~=26.5; extra == "black"
+Requires-Dist: black~=26.10; extra == "black"
 Provides-Extra: c
 Requires-Dist: pycparser~=3.0; extra == "c"
 Requires-Dist: pcpp~=1.30; extra == "c"
 Provides-Extra: doc
 Requires-Dist: docutils~=0.23; extra == "doc"
-Provides-Extra: mypy
-Requires-Dist: mypy~=2.4; extra == "mypy"
 Provides-Extra: ocr
 Requires-Dist: pytesseract~=0.3; extra == "ocr"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "ocr"
@@ -59,19 +57,18 @@ 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.60; extra == "cext"
+Requires-Dist: omdev-cext==0.0.62; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.60; extra == "rs"
+Requires-Dist: omdev-rs==0.0.62; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.60; extra == "cli"
+Requires-Dist: omdev-cli==0.0.62; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.60; extra == "all"
-Requires-Dist: omllm==0.0.60; extra == "all"
-Requires-Dist: black~=26.5; extra == "all"
+Requires-Dist: ominfra==0.0.62; extra == "all"
+Requires-Dist: omllm==0.0.62; extra == "all"
+Requires-Dist: black~=26.10; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
 Requires-Dist: docutils~=0.23; extra == "all"
-Requires-Dist: mypy~=2.4; extra == "all"
 Requires-Dist: pytesseract~=0.3; extra == "all"
 Requires-Dist: rapidocr-onnxruntime~=1.4; extra == "all"
 Requires-Dist: pillow~=12.3; extra == "all"
@@ -95,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.60; extra == "all"
-Requires-Dist: omdev-rs==0.0.60; extra == "all"
-Requires-Dist: omdev-cli==0.0.60; extra == "all"
+Requires-Dist: omdev-cext==0.0.62; extra == "all"
+Requires-Dist: omdev-rs==0.0.62; extra == "all"
+Requires-Dist: omdev-cli==0.0.62; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.60 → omdev-0.0.62}/omdev/__about__.py

@@ -23,7 +23,7 @@ class Project(ProjectBase):
         #
 
         'black': [
-            'black ~= 26.5',
+            'black ~= 26.10',
         ],
 
         'c': [
@@ -36,10 +36,6 @@ class Project(ProjectBase):
             'docutils ~= 0.23',
         ],
 
-        'mypy': [
-            'mypy ~= 2.4',
-        ],
-
         'ocr': [
             'pytesseract ~= 0.3',
 

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/cli.py

@@ -14,7 +14,7 @@ TODO:
  - `run --pull=never`, `build --pull=false`
  - !! shadow config !!
    - default autoexec, default env vars
- - --runtime=nvidia --gpus=all
+ - --runtime=nvidia --gpus=all --rm -it bash
 
 ====
 

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/config.py

@@ -16,7 +16,6 @@ class Config:
     base_image: str
     base_image_id: str | None = None
 
-    user: str | None = None
     uid: int = DEFAULT_UID
     gid: int = DEFAULT_GID
 
@@ -26,6 +25,8 @@ class Config:
 
     dep_sets: ta.Sequence[str] | None = None
 
+    cuda_version: str | None = None
+
     jdks: ta.Sequence[str] | None = None
 
     nvm_versions: ta.Sequence[str] | None = None

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/config.toml

@@ -1,7 +1,5 @@
 base_image = 'ubuntu:24.04'
-base_image_id = 'sha256:a853f94d226358a79c740cfc7bce0c289748f3fe3488d921d038ccd752c61b60'
-
-user = 'om'
+base_image_id = 'sha256:534baea6a22c03a63003dbc8dbe78fe34bc0d7e595d9a9dc9834884ff530eb55'
 
 dep_sets = [
     'system',
@@ -9,6 +7,8 @@ dep_sets = [
     'x11',
 ]
 
+cuda_version = '13.4'
+
 jdks = [
     'zulu21-ca-jdk',
     'zulu25-ca-jdk',

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/content.py

@@ -25,7 +25,8 @@ def read_resource(r: Resource) -> str:
 #
 
 
-StaticEnv: ta.TypeAlias = ta.Union[
+type StaticEnv = ta.Union[
+    ta.Sequence[StaticEnv],
     ta.Mapping[str, str | ta.Sequence[str]],
     ta.Callable[[], ta.Mapping[str, str | ta.Sequence[str]]],
 ]
@@ -48,10 +49,10 @@ class LazyContent:
 #
 
 
-Content: ta.TypeAlias = ta.Union[
+type Content = ta.Union[
     str,
     Resource,
     WithStaticEnv,
     LazyContent,
-    ta.Sequence['Content'],
+    ta.Sequence[Content],
 ]

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/gen.py

@@ -11,9 +11,10 @@ from omcore import lang
 
 from .config import Config
 from .content import LazyContent
-from .content import Resource
+from .content import StaticEnv
 from .content import WithStaticEnv
 from .helpers import APT_CACHE_MOUNTS
+from .helpers import fragment_body
 from .helpers import fragment_section
 from .helpers import read_versions_file_versions
 from .helpers import render_apt_install_dep_sets
@@ -35,6 +36,10 @@ from .rendering import render_op
 
 
 def gen_ops(cfg: Config) -> ta.Sequence[Op]:
+    home = '/om'
+
+    #
+
     ops: list[Op] = [
         From(''.join([
             cfg.base_image,
@@ -42,11 +47,61 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         ])),
     ]
 
+    #
+
+    chgrp_static_env = {
+        'CHGRP_ROOTS': [home],
+        'CHGRP_GID': str(cfg.gid),
+    }
+
+    def chgrp_fragment_run(
+            name: str,
+            *,
+            static_env: StaticEnv | None = None,
+            cache_mounts: ta.Sequence[str] | None = None,
+            cache_mount_args: ta.Sequence[str] | None = None,
+    ) -> Run:
+        body = WithStaticEnv(
+            [
+                fragment_body(name),
+                fragment_body('chgrp'),
+            ],
+            [
+                *([static_env] if static_env else []),
+                chgrp_static_env,
+            ],
+        )
+
+        return Run(
+            body,
+            cache_mounts=cache_mounts or None,
+            cache_mount_args=cache_mount_args or None,
+        )
+
+    def chgrp_fragment_section(
+            name: str,
+            *,
+            static_env: StaticEnv | None = None,
+            cache_mounts: ta.Sequence[str] | None = None,
+            cache_mount_args: ta.Sequence[str] | None = None,
+    ) -> Section:
+        return Section(name, [
+            chgrp_fragment_run(
+                name,
+                static_env=static_env,
+                cache_mounts=cache_mounts or None,
+                cache_mount_args=cache_mount_args or None,
+            ),
+        ])
+
+    #
+
     # ops.append(Section('timestamp', [
     #     Copy(src='docker/.timestamp', dst='/'),
     # ]))
 
-    home = f'/{cfg.user or "root"}'
+    ##
+    # locale
 
     ops.append(Section('locale', [
         Env([
@@ -62,76 +117,82 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ops.append(Section('deps', [
         Run(
             [
-                Resource('fragments/apt.sh'),
+                fragment_body('apt'),
                 LazyContent(lambda: render_apt_install_dep_sets(*(cfg.dep_sets or []))),
             ],
             cache_mounts=APT_CACHE_MOUNTS,
         ),
     ]))
 
-    if cfg.user is not None:
-        ops.append(Section('user', [
-            Run(
-                WithStaticEnv(
-                    Resource('fragments/user.sh'),
-                    {
-                        'NEW_USER': cfg.user,
-                        'NEW_UID': str(cfg.uid),
-                        'NEW_GID': str(cfg.gid),
-                    },
-                ),
-            ),
-            User(cfg.user),
-        ]))
+    ops.append(Section('user', [
+        chgrp_fragment_run(
+            'user',
+            static_env={
+                'NEW_USER': 'om',
+                'NEW_UID': str(cfg.uid),
+                'NEW_GID': str(cfg.gid),
+            },
+        ),
+        User('om'),
+    ]))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'firefox',
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
-    ops.append(fragment_section(
+    if cfg.cuda_version is not None:
+        ops.append(chgrp_fragment_section(
+            'cuda',
+            static_env={'CUDA_VERSION': cfg.cuda_version},
+            cache_mounts=APT_CACHE_MOUNTS,
+        ))
+
+    ops.append(chgrp_fragment_section(
         'cmake',
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'docker',
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'jdk',
         static_env={'JDKS': cfg.jdks or []},
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
+    ops.append(chgrp_fragment_section('deadsnakes'))
+
     ##
     # langs
 
-    ops.append(fragment_section('rust'))
+    ops.append(chgrp_fragment_section('rust'))
 
-    ops.append(fragment_section('go'))
+    ops.append(chgrp_fragment_section('go'))
 
-    ops.append(fragment_section('zig'))
+    ops.append(chgrp_fragment_section('zig'))
 
-    ops.append(fragment_section('vcpkg'))
+    ops.append(chgrp_fragment_section('vcpkg'))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'nvm',
         static_env={'NVM_VERSIONS': cfg.nvm_versions or []},
     ))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'rbenv',
         static_env={'RBENV_VERSIONS': cfg.rbenv_versions or []},
     ))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'uv',
         static_env={'UV_PYTHON_VERSIONS': cfg.uv_python_versions or []},
     ))
 
-    ops.append(fragment_section(
+    ops.append(chgrp_fragment_section(
         'pyenv',
         static_env=lambda: {
             'PYENV_VERSIONS': list(read_versions_file_versions(
@@ -147,7 +208,7 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ##
     # self
 
-    ops.append(fragment_section('om'))
+    ops.append(chgrp_fragment_section('om'))
 
     ##
     # config
@@ -191,6 +252,7 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ops.append(fragment_section(
         'chgrp',
         static_env={
+            **chgrp_static_env,
             'CHGRP_ROOTS': [
                 home,
                 *([cfg.workdir] if cfg.workdir is not None else []),

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/helpers.py

@@ -19,6 +19,10 @@ from .rendering import render_var_sections
 ##
 
 
+def fragment_body(name: str) -> Content:
+    return Resource(f'fragments/{name}.sh')
+
+
 def fragment_section(
         name: str,
         *,
@@ -26,7 +30,7 @@ def fragment_section(
         cache_mounts: ta.Sequence[str] | None = None,
         cache_mount_args: ta.Sequence[str] | None = None,
 ) -> Section:
-    body: Content = Resource(f'fragments/{name}.sh')
+    body = fragment_body(name)
 
     if static_env is not None:
         body = WithStaticEnv(body, static_env)

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/rendering.py

@@ -12,6 +12,7 @@ from omcore import dataclasses as dc
 from .content import Content
 from .content import LazyContent
 from .content import Resource
+from .content import StaticEnv
 from .content import WithStaticEnv
 from .content import read_resource
 from .ops import Cmd
@@ -74,22 +75,37 @@ def render_resource(c: Resource, ctx: RenderContext) -> str:
 def render_with_static_env(c: WithStaticEnv, ctx: RenderContext) -> str:
     out = io.StringIO()
 
-    if c.env:
-        kvs = c.env
+    kvs: dict[str, str] = {}
 
-        if callable(kvs):
-            kvs = kvs()
+    def rec(se: StaticEnv) -> None:
+        if not se:
+            return
 
-        for k, v in kvs.items():
-            if isinstance(v, str):
-                pass
-            elif isinstance(v, ta.Sequence):
-                v = ' '.join(v)
-            else:
-                raise TypeError(v)
+        elif callable(se):
+            rec(se())
 
-            out.write(f'export {k}={sh_quote(v)} ;\\\n')
+        elif isinstance(se, ta.Sequence):
+            for cse in se:
+                rec(cse)
+
+        elif isinstance(se, ta.Mapping):
+            for k, v in se.items():
+                if isinstance(v, str):
+                    pass
+                elif isinstance(v, ta.Sequence):
+                    v = ' '.join(v)
+                else:
+                    raise TypeError(v)
+                kvs[k] = v
+
+        else:
+            raise TypeError(se)
 
+    rec(c.env)
+
+    if kvs:
+        for k, v in kvs.items():
+            out.write(f'export {k}={sh_quote(v)} ;\\\n')
         out.write('\\\n')
 
     out.write(render_content(c.body, ctx))

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/resources/depsets/system.toml

@@ -75,6 +75,7 @@ deps = [
 
   # sandboxing
   'bubblewrap',
+  'runsc',
 
   # data formats
   'libxml2-dev',

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/resources/fragments/chgrp.sh

@@ -1,4 +1,4 @@
-find ${CHGRP_ROOTS} ! -group "$(id -g)" -exec chgrp -h "$(id -g)" {} + ;
+find ${CHGRP_ROOTS} ! -group "${CHGRP_GID:-$(id -g)}" -exec chgrp -h "${CHGRP_GID:-$(id -g)}" {} + ;
 
 find ${CHGRP_ROOTS} ! -type l \( \
   \( -perm -u=r ! -perm -g=r \) -o \( ! -perm -u=r -perm -g=r \) -o \

omdev-0.0.62/omdev/dockerdev/resources/fragments/cuda.sh

@@ -0,0 +1,22 @@
+case "$(dpkg --print-architecture)" in \
+    amd64) CUDA_REPO_ARCH=x86_64 ;; \
+    arm64) CUDA_REPO_ARCH=sbsa ;; \
+    *) echo "Unsupported CUDA architecture: $(dpkg --print-architecture)" >&2 ; exit 1 ;; \
+esac ;
+
+curl -fsSLo /tmp/cuda-keyring.deb \
+    "https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/${CUDA_REPO_ARCH}/cuda-keyring_1.1-1_all.deb" ;
+sudo dpkg -i /tmp/cuda-keyring.deb ;
+rm /tmp/cuda-keyring.deb ;
+
+sudo apt-get update ;
+sudo apt-get install -y --no-install-recommends \
+    "cuda-toolkit-$(echo ${CUDA_VERSION} | tr . -)" \
+;
+
+echo '\n
+export CUDA_HOME="/usr/local/cuda"\n
+export PATH="$CUDA_HOME/bin:$PATH"\n
+export LD_LIBRARY_PATH="/usr/local/nvidia/lib:/usr/local/nvidia/lib64:$CUDA_HOME/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"\n
+export LIBRARY_PATH="$CUDA_HOME/lib64/stubs${LIBRARY_PATH:+:$LIBRARY_PATH}"\n
+' >> ~/.bashrc ;

omdev-0.0.62/omdev/dockerdev/resources/fragments/deadsnakes.sh

@@ -0,0 +1,2 @@
+sudo add-apt-repository ppa:deadsnakes/ppa &&
+sudo apt update ;

{omdev-0.0.60 → omdev-0.0.62}/omdev/dockerdev/resources/fragments/om.sh

@@ -1,4 +1,6 @@
 curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
+  --ft \
+  \
   'omcore[cext,mypyc,plus]' \
   'omdev[cext]' \
   'ominfra' \
@@ -6,3 +8,10 @@ curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.
   \
   'pip' \
 ;
+
+bash --login -c 'om $@' - cli python -m omdev.imports.pycz \
+  omcore \
+  omdev \
+  ominfra \
+  omllm \
+;

omdev-0.0.62/omdev/dockerdev/resources/scripts/run-elasticsearch

@@ -0,0 +1,95 @@
+#!/bin/bash
+set -euo pipefail
+
+set -x
+
+ELASTICSEARCH_VERSION="${ELASTICSEARCH_VERSION:-8.19.22}"
+
+CACHE_DIR="${ELASTICSEARCH_CACHE_DIR:-$HOME/.cache/omdev/elasticsearch}"
+
+case "$(uname -m)" in
+    x86_64|amd64)
+        ARCH=x86_64
+        ;;
+    aarch64|arm64)
+        ARCH=aarch64
+        ;;
+    *)
+        echo "Unsupported architecture: $(uname -m)" >&2
+        exit 1
+        ;;
+esac
+
+NAME="elasticsearch-$ELASTICSEARCH_VERSION-linux-$ARCH"
+ARCHIVE="$CACHE_DIR/$NAME.tar.gz"
+DIST_DIR="$CACHE_DIR/$NAME"
+
+URL="https://artifacts.elastic.co/downloads/elasticsearch/$NAME.tar.gz"
+
+STATE_DIR="${ELASTICSEARCH_STATE_DIR:-$CACHE_DIR/state-$ELASTICSEARCH_VERSION}"
+DATA_DIR="${ELASTICSEARCH_DATA_DIR:-$STATE_DIR/data}"
+LOGS_DIR="${ELASTICSEARCH_LOGS_DIR:-$STATE_DIR/logs}"
+
+mkdir -p "$CACHE_DIR" "$DATA_DIR" "$LOGS_DIR"
+
+# Serialize first-time setup in case multiple agents race to start it.
+exec 9>"$CACHE_DIR/.lock"
+flock 9
+
+if ! test -s "$ARCHIVE"; then
+    TMP="$ARCHIVE.tmp.$$"
+    trap 'rm -f "$TMP"' EXIT
+
+    curl \
+        --fail \
+        --location \
+        --retry 3 \
+        --retry-all-errors \
+        --output "$TMP" \
+        "$URL"
+
+    EXPECTED_SHA512="$(
+        curl \
+            --fail \
+            --location \
+            --retry 3 \
+            --retry-all-errors \
+            "$URL.sha512" |
+        awk '{print $1}'
+    )"
+
+    ACTUAL_SHA512="$(sha512sum "$TMP" | awk '{print $1}')"
+
+    test "$ACTUAL_SHA512" = "$EXPECTED_SHA512"
+
+    mv "$TMP" "$ARCHIVE"
+    trap - EXIT
+fi
+
+if ! test -x "$DIST_DIR/bin/elasticsearch"; then
+    TMP="$DIST_DIR.tmp.$$"
+    trap 'rm -rf "$TMP"' EXIT
+
+    rm -rf "$TMP"
+    mkdir "$TMP"
+
+    tar \
+        -xzf "$ARCHIVE" \
+        -C "$TMP" \
+        --strip-components=1
+
+    mv "$TMP" "$DIST_DIR"
+    trap - EXIT
+fi
+
+flock -u 9
+exec 9>&-
+
+export ES_JAVA_OPTS="${ES_JAVA_OPTS:--Xms750m -Xmx750m}"
+
+exec "$DIST_DIR/bin/elasticsearch" \
+    -Ediscovery.type=single-node \
+    -Expack.security.enabled=false \
+    -Epath.data="$DATA_DIR" \
+    -Epath.logs="$LOGS_DIR" \
+    "$@"