omdev 0.0.58__tar.gz → 0.0.59__tar.gz

{omdev-0.0.58/omdev.egg-info → omdev-0.0.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.58
+Version: 0.0.59
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,11 +14,11 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.58
+Requires-Dist: omcore==0.0.59
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.58; extra == "ominfra"
+Requires-Dist: ominfra==0.0.59; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.58; extra == "omllm"
+Requires-Dist: omllm==0.0.59; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c
@@ -59,14 +59,14 @@ 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.58; extra == "cext"
+Requires-Dist: omdev-cext==0.0.59; extra == "cext"
 Provides-Extra: rs
-Requires-Dist: omdev-rs==0.0.58; extra == "rs"
+Requires-Dist: omdev-rs==0.0.59; extra == "rs"
 Provides-Extra: cli
-Requires-Dist: omdev-cli==0.0.58; extra == "cli"
+Requires-Dist: omdev-cli==0.0.59; extra == "cli"
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.58; extra == "all"
-Requires-Dist: omllm==0.0.58; extra == "all"
+Requires-Dist: ominfra==0.0.59; extra == "all"
+Requires-Dist: omllm==0.0.59; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -95,9 +95,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.58; extra == "all"
-Requires-Dist: omdev-rs==0.0.58; extra == "all"
-Requires-Dist: omdev-cli==0.0.58; extra == "all"
+Requires-Dist: omdev-cext==0.0.59; extra == "all"
+Requires-Dist: omdev-rs==0.0.59; extra == "all"
+Requires-Dist: omdev-cli==0.0.59; extra == "all"
 Dynamic: license-file
 
 # Overview

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/build.py

@@ -1,4 +1,7 @@
-import json
+"""
+TODO:
+ - docker buildx imagetools inspect --format '{{.Manifest.Digest}}' ubuntu:24.04
+"""
 import os.path
 import re
 import subprocess
@@ -23,31 +26,28 @@ def build_image(
         offline: bool = False,
         verbose: bool = False,
 ) -> str:
-    bim = cfg.base_image
-    for sep in ':@':
-        bim = bim.split(sep, maxsplit=1)[0]
-
-    def run_insp() -> str:
-        return subprocess.check_output(  # type: ignore
-            ['docker', 'image', 'inspect', cfg.base_image],
-            **(dict(stderr=subprocess.DEVNULL) if not verbose else {}),
-        ).decode()
-
-    try:
-        insp_out = run_insp()
-    except subprocess.CalledProcessError:
-        if offline:
-            raise
-        subprocess.check_output(['docker', 'pull', '-q', cfg.base_image])
-        insp_out = run_insp()
-
-    insp_out_obj = json.loads(insp_out)
-    insp_out_dct = check.not_empty(insp_out_obj)[0]
-
-    # TODO: really want to rewrite Dockerfile on the fly to directly use this local image as a base to avoid any
-    #       network hit, but docker is *really hostile* to that idea
-    #  cfg = dc.replace(cfg, base_image=tag)
-    obi = check.non_empty_str(insp_out_dct['Id'])  # noqa
+    # TODO: resurrect? lol
+    # def run_insp() -> str:
+    #     return subprocess.check_output(  # type: ignore
+    #         ['docker', 'image', 'inspect', cfg.base_image],
+    #         **(dict(stderr=subprocess.DEVNULL) if not verbose else {}),
+    #     ).decode()
+    #
+    # try:
+    #     insp_out = run_insp()
+    # except subprocess.CalledProcessError:
+    #     if offline:
+    #         raise
+    #     subprocess.check_output(['docker', 'pull', '-q', cfg.base_image])
+    #     insp_out = run_insp()
+    #
+    # insp_out_obj = json.loads(insp_out)
+    # insp_out_dct = check.not_empty(insp_out_obj)[0]
+    #
+    # # TODO: really want to rewrite Dockerfile on the fly to directly use this local image as a base to avoid any
+    # #       network hit, but docker is *really hostile* to that idea
+    # #  cfg = dc.replace(cfg, base_image=tag)
+    # obi = check.non_empty_str(insp_out_dct['Id'])  # noqa
 
     src = gen_src(cfg)
 

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/cli.py

@@ -14,6 +14,7 @@ TODO:
  - `run --pull=never`, `build --pull=false`
  - !! shadow config !!
    - default autoexec, default env vars
+ - --runtime=nvidia --gpus=all
 
 ====
 
@@ -34,6 +35,7 @@ import os
 import subprocess
 import sys
 import tomllib
+import typing as ta
 
 from omcore import check
 from omcore import lang
@@ -43,7 +45,7 @@ from omcore.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 ID_LABEL
 from .run import RunArgs
 from .run import run_image
 
@@ -65,6 +67,28 @@ class Cli(ap.Cli):
 
     #
 
+    _SHIFT_UID_ARGS: ta.ClassVar = (
+        ap.arg('--shift-uid'),
+        ap.arg('-U', '--auto-shift-uid', action='store_true'),
+    )
+
+    class _ShiftUid(ta.NamedTuple):
+        uid: int
+        gid: int
+
+    def _get_args_shift_uid(self) -> _ShiftUid | None:
+        if (su := self.args.shift_uid) is not None:
+            check.arg(not self.args.auto_shift_uid)
+            return Cli._ShiftUid(*map(int, su.split(':')))
+
+        if self.args.auto_shift_uid:
+            if sys.platform == 'linux':
+                return Cli._ShiftUid(os.getuid(), os.getgid())
+
+        return None
+
+    #
+
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
 
@@ -102,21 +126,14 @@ class Cli(ap.Cli):
 
         ap.arg('--inject-secrets', action='append'),
 
-        ap.arg('--shift-uid'),
-        ap.arg('-U', '--auto-shift-uid', action='store_true'),
+        *_SHIFT_UID_ARGS,
+
+        ap.arg('--db', action='store_true'),
 
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
     def run(self) -> None:
-        shift_uid: tuple[int, int] | None = None
-        if (su := self.args.shift_uid) is not None:
-            check.arg(not self.args.auto_shift_uid)
-            shift_uid = tuple(map(int, su.split(':')))  # type: ignore[assignment]
-        elif self.args.auto_shift_uid:
-            if getattr(sys, 'platform') == 'linux':
-                shift_uid = (os.getuid(), os.getgid())
-
         run_image(
             self._load_config(),
 
@@ -141,11 +158,13 @@ class Cli(ap.Cli):
 
                 inject_secrets_pats=self.args.inject_secrets,
 
-                shift_uid=shift_uid,
+                shift_uid=self._get_args_shift_uid(),
 
                 unknown_args=self.unknown_args,
                 extra_args=self.args.args,
             ),
+
+            write_to_db=bool(self.args.db),
         )
 
     #
@@ -161,7 +180,7 @@ class Cli(ap.Cli):
             'docker',
             'ps',
             *(self.unknown_args or []),
-            f'--filter=label={LABEL_PREFIX}',
+            f'--filter=label={ID_LABEL}',
             *(['--format=json'] if self.args.json else []),
             *(self.args.args or []),
         ])
@@ -175,19 +194,9 @@ class Cli(ap.Cli):
         ap.arg('secret', nargs='+'),
         ap.arg('-f', '--secrets-file'),
 
-        ap.arg('--shift-uid'),
-        ap.arg('-U', '--auto-shift-uid', action='store_true'),
-
+        *_SHIFT_UID_ARGS,
     )
     def inject_secret(self) -> None:
-        shift_uid: tuple[int, int] | None = None
-        if (su := self.args.shift_uid) is not None:
-            check.arg(not self.args.auto_shift_uid)
-            shift_uid = tuple(map(int, su.split(':')))  # type: ignore[assignment]
-        elif self.args.auto_shift_uid:
-            if getattr(sys, 'platform') == 'linux':
-                shift_uid = (os.getuid(), os.getgid())
-
         secrets: list[str | tuple[str, str]] = []
         for s in self.args.secret:
             if '=' in s:
@@ -204,7 +213,7 @@ class Cli(ap.Cli):
             self.args.container_id,
             secrets,
             secrets_file=self.args.secrets_file,
-            shift_uid=shift_uid,
+            shift_uid=self._get_args_shift_uid(),
         )
 
 

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/config.py

@@ -1,5 +1,6 @@
 import typing as ta
 
+from omcore import check
 from omcore import dataclasses as dc
 
 
@@ -13,6 +14,7 @@ DEFAULT_GID = DEFAULT_UID
 @dc.dataclass(frozen=True)
 class Config:
     base_image: str
+    base_image_id: str | None = None
 
     user: str | None = None
     uid: int = DEFAULT_UID
@@ -35,3 +37,6 @@ class Config:
     pyenv_version_keys: ta.Sequence[str] | None = None
 
     cache_mounts: ta.Mapping[str, str] | None = None
+
+    def __post_int__(self) -> None:
+        check.not_in('@', self.base_image)

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/config.toml

@@ -1,4 +1,5 @@
 base_image = 'ubuntu:24.04'
+base_image_id = 'sha256:008173c23f95b170204355c12626cb5a965d779a7e1283b09e9cffbb1bf33ca3'
 
 user = 'om'
 

omdev-0.0.59/omdev/dockerdev/db.py

@@ -0,0 +1,146 @@
+import datetime
+import os.path
+import typing as ta
+import uuid
+
+from omcore import dataclasses as dc
+from omcore import lang
+from omcore import orm
+from omcore import sql
+
+from ..home.paths import get_home_paths
+from .config import Config
+from .run import RunArgs
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Run:
+    id: uuid.UUID
+
+    container_id: str | None = None
+
+    #
+
+    cfg: Config | None = None
+    sha: str | None = None
+    args: RunArgs | None = None
+
+
+##
+
+
+@dc.dataclass(kw_only=True)
+@dc.extra_class_params(install_class_field_attrs='instance')
+class OrmRun:
+    id: orm.Key[uuid.UUID] = dc.field()
+
+    created_at: datetime.datetime = orm.auto_value[datetime.datetime]()
+    updated_at: datetime.datetime = orm.auto_value[datetime.datetime]()
+
+    #
+
+    container_id: str | None = None
+
+    json: Run
+
+
+def orm_mappers() -> ta.Sequence[orm.Mapper]:
+    return [
+
+        orm.dataclass_mapper(
+            OrmRun,
+            store_name='run',
+
+            field_options=dict(
+                created_at=[orm.CreatedAt()],
+                updated_at=[orm.UpdatedAt()],
+
+                json=[
+                    orm.FieldCodec(orm.CompositeCodec(
+                        orm.MarshalCodec(),
+                        orm.JsonCodec(),
+                    )),
+                    orm.FieldSqlType(sql.td.Json()),
+                ],
+            ),
+
+            indexes=[
+                orm.index(
+                    'container_id',
+                    options=[
+                        orm.UniqueIndexOption(),
+                    ],
+                ),
+
+                orm.index(
+                    'created_at',
+                    options=[
+                        orm.SortedIndexOption(),
+                    ],
+                ),
+            ],
+        ),
+
+    ]
+
+
+##
+
+
+DEFAULT_DB_FILE_NAME: ta.Final = 'runs.db'
+
+
+def write_run_to_db(
+        *,
+        id: uuid.UUID,  # noqa
+
+        cfg: Config | None = None,
+        sha: str | None = None,
+        args: RunArgs | None = None,
+
+        db_file: str | None = None,
+) -> None:
+    run = Run(
+        id=id,
+
+        cfg=cfg,
+        sha=sha,
+        args=args,
+    )
+
+    #
+
+    if db_file is None:
+        db_file = os.path.join(
+            get_home_paths().config_dir,
+            'dockerdev',
+            DEFAULT_DB_FILE_NAME,
+        )
+
+    db = sql.be.sqlite.connecting.sqlite_db(sql.be.sqlite.connecting.SqliteDbConfig(
+        file_path=db_file,
+    ))
+
+    backend = sql.be.sqlite.backend.SqliteBackend()
+
+    registry = orm.registry(*orm_mappers())
+
+    store = orm.SqlStore(
+        registry,
+        sql.api.SyncToAsyncDb(sql.api.ImmediateSyncToAsyncRunner, db),
+        tabledef_renderer=backend.tabledef_renderer,
+        dtype_codec=backend.dtype_codec,
+    )
+
+    async def do_write() -> None:
+        async with orm.session(registry, store):
+            await orm.add_one(OrmRun(
+                id=orm.key(id),
+
+                json=run,
+            ))
+
+    lang.sync_await(do_write())

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/discovery.py

@@ -5,7 +5,7 @@ higher-level "run command X in dev container Y and stream it" API (in omllm) wil
 
 from omcore.docker import cli as docker_cli
 
-from .run import LABEL_PREFIX
+from .run import ID_LABEL
 
 
 ##
@@ -17,7 +17,7 @@ def find_dev_containers() -> list[docker_cli.PsItem]:
     return [
         pi
         for pi in docker_cli.cli_ps()
-        if LABEL_PREFIX in (pi.labels or '')
+        if ID_LABEL in (pi.labels or '')
     ]
 
 

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/gen.py

@@ -36,7 +36,10 @@ from .rendering import render_op
 
 def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ops: list[Op] = [
-        From(cfg.base_image),
+        From(''.join([
+            cfg.base_image,
+            *([f'@{cfg.base_image_id}'] if cfg.base_image_id is not None else []),
+        ])),
     ]
 
     # ops.append(Section('timestamp', [
@@ -86,6 +89,11 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
+    ops.append(fragment_section(
+        'cmake',
+        cache_mounts=APT_CACHE_MOUNTS,
+    ))
+
     ops.append(fragment_section(
         'docker',
         cache_mounts=APT_CACHE_MOUNTS,
@@ -97,8 +105,6 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
         cache_mounts=APT_CACHE_MOUNTS,
     ))
 
-    ops.append(fragment_section('man'))
-
     ##
     # langs
 

{omdev-0.0.58 → omdev-0.0.59}/omdev/dockerdev/resources/depsets/system.toml

@@ -41,11 +41,13 @@ deps = [
   'gcc-14',
   'llvm',
   'make',
+  'nasm',
   'pkg-config',
 
   # dev libs
   'libdebuginfod-dev',
   'libncurses5-dev',
+  'libpsl-dev',
   'libreadline6-dev',
   'libssl-dev',
 
@@ -117,6 +119,15 @@ deps = [
   'gnupg',
   'gnupg-agent',
 
+  # multimedia
+  'ffmpeg',
+  'imagemagick',
+  'libavcodec-dev',
+  'libavformat-dev',
+  'libavutil-dev',
+  'libmagick++-dev',
+  'libswscale-dev',
+
   # documentation & introspection
   'file',
   'graphviz',

omdev-0.0.59/omdev/dockerdev/resources/fragments/apt.sh

@@ -0,0 +1,22 @@
+rm -f /etc/apt/apt.conf.d/docker-clean ;
+rm -f /etc/dpkg/dpkg.cfg.d/excludes ;
+
+export DEBIAN_FRONTEND=noninteractive ;
+apt-get update ;
+
+apt-get install -y locales ;
+locale-gen en_US.UTF-8 ;
+
+apt-get upgrade -y ;
+
+if [ "$(dpkg-divert --truename /usr/bin/man)" = '/usr/bin/man.REAL' ]; then
+  rm -f /usr/bin/man ;
+  dpkg-divert --quiet --remove --rename /usr/bin/man ;
+fi ;
+
+apt-get install -y --reinstall $(dpkg-query -W -f='${binary:Package} ${db:Status-Status}\n' | awk '$2=="installed"{print $1}') ;
+
+apt-get install -y man-db manpages manpages-dev ;
+rm -f /etc/update-motd.d/60-unminimize ;
+
+apt-get install -y apt-utils ;

omdev-0.0.59/omdev/dockerdev/resources/fragments/chgrp.sh

@@ -0,0 +1,7 @@
+find ${CHGRP_ROOTS} ! -group "$(id -g)" -exec chgrp -h "$(id -g)" {} + ;
+
+find ${CHGRP_ROOTS} ! -type l \( \
+  \( -perm -u=r ! -perm -g=r \) -o \( ! -perm -u=r -perm -g=r \) -o \
+  \( -perm -u=w ! -perm -g=w \) -o \( ! -perm -u=w -perm -g=w \) -o \
+  \( -perm -u=x ! -perm -g=x \) -o \( ! -perm -u=x -perm -g=x \) \
+\) -exec chmod g=u {} + ;

omdev-0.0.59/omdev/dockerdev/resources/fragments/cmake.sh

@@ -0,0 +1,15 @@
+sudo apt install -y ca-certificates gpg wget ;
+
+test -f /usr/share/doc/kitware-archive-keyring/copyright || \
+  wget -O - 'https://apt.kitware.com/keys/kitware-archive-latest.asc' 2>/dev/null | \
+  gpg --dearmor - | \
+  sudo tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null ;
+
+echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ noble main' | \
+  sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null ;
+
+sudo apt update ;
+sudo apt install -y kitware-archive-keyring ;
+
+sudo apt update ;
+sudo apt install -y cmake ;

omdev-0.0.59/omdev/dockerdev/resources/fragments/firefox.sh

@@ -0,0 +1,29 @@
+sudo mkdir -p /etc/apt/keyrings ;
+
+curl -fsSL \
+  'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x738BEB9321D1AAEC13EA9391AEBDF4819BE21867' |
+  sudo tee /etc/apt/keyrings/mozillateam.asc >/dev/null ;
+
+echo "
+Types: deb\n
+URIs: https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/\n
+Suites: noble\n
+Components: main\n
+Signed-By: /etc/apt/keyrings/mozillateam.asc\n
+" | sudo tee /etc/apt/sources.list.d/mozillateam.sources >/dev/null ;
+
+echo "
+Package: *\n
+Pin: release o=LP-PPA-mozillateam\n
+Pin-Priority: 1001\n
+\n
+Package: firefox\n
+Pin: version 1:1snap1-0ubuntu2\n
+Pin-Priority: -1\n
+" | sudo tee /etc/apt/preferences.d/mozilla-firefox ;
+
+sudo apt-get update ;
+sudo apt-get install -y firefox ;
+
+echo 'Unattended-Upgrade::Allowed-Origins:: "LP-PPA-mozillateam:${distro_codename}";' |
+  sudo tee /etc/apt/apt.conf.d/51unattended-upgrades-firefox ;