omdev 0.0.0.dev539__tar.gz → 0.0.0.dev540__tar.gz

{omdev-0.0.0.dev539/omdev.egg-info → omdev-0.0.0.dev540}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev539
+Version: 0.0.0.dev540
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev539
+Requires-Dist: omlish==0.0.0.dev540
 Provides-Extra: all
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"

{omdev-0.0.0.dev539 → omdev-0.0.0.dev540}/omdev/dockerdev/cli.py

@@ -2,6 +2,8 @@
 TODO:
  - default run bash
  - all of the below stuff
+ - launch / manage compose services
+ - more cache dirs
 
 ====
 
@@ -54,8 +56,10 @@ from omlish import check
 from omlish import lang
 from omlish import marshal as msh
 from omlish.argparse import all as ap
+from omlish.os.paths import is_path_in_dir
 
-from .gen import Config
+from ..home.paths import get_cache_dir
+from .config import Config
 from .gen import gen_src
 
 
@@ -145,29 +149,49 @@ class Cli(ap.Cli):
 
     @ap.cmd(
         ap.arg('-v', '--verbose', action='store_true'),
+        ap.arg('-C', '--mount-caches', action='store_true'),
         ap.arg('args', nargs=ap.REMAINDER),
         accepts_unknown=True,
     )
     def run(self) -> None:
-        check.not_empty(self.args.args)
-
         sha = self._build(
             verbose=self.args.verbose,
         )
 
+        #
+
+        run_args: list[str] = ['run']
+
+        if self.unknown_args:
+            run_args.extend(self.unknown_args)
+        else:
+            run_args.extend([
+                '--rm',
+                '-it',
+            ])
+
+        if self.args.mount_caches:
+            cache_dir = os.path.join(get_cache_dir(), 'dockerdev')
+            cfg = self._load_config()
+            for cl, cr in (cfg.cache_mounts or {}).items():
+                cld = os.path.join(cache_dir, cl)
+                check.state(is_path_in_dir(cache_dir, cld))
+                os.makedirs(cld, exist_ok=True)
+                run_args.append(f'--mount=type=bind,src={cld},dst={cr}')
+
+        run_args.append(sha)
+
+        if self.args.args:
+            check.not_empty(self.args.args)
+        else:
+            run_args.append('bash')
+
+        #
+
         os.execl(
             docker := check.not_none(shutil.which('docker')),
             docker,
-            'run',
-            *(
-                self.unknown_args or
-                [
-                    '--rm',
-                    '-it',
-                ]
-            ),
-            sha,
-            *self.args.args,
+            *run_args,
         )
 
 

omdev-0.0.0.dev540/omdev/dockerdev/config.py

@@ -0,0 +1,33 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Config:
+    base_image: str
+
+    workdir: str | None = None
+
+    _: dc.KW_ONLY
+
+    dep_sets: ta.Sequence[str] | None = None
+
+    jdks: ta.Sequence[str] | None = None
+
+    go_version: str | None = None
+
+    zig_version: str | None = None
+
+    nvm_versions: ta.Sequence[str] | None = None
+
+    uv_python_versions: ta.Sequence[str] | None = None
+
+    pyenv_version_keys: ta.Sequence[str] | None = None
+
+    config_files: ta.Sequence[str] | None = None
+
+    cache_mounts: ta.Mapping[str, str] | None = None

{omdev-0.0.0.dev539 → omdev-0.0.0.dev540}/omdev/dockerdev/config.toml

@@ -21,6 +21,11 @@ nvm_versions = [
     '25',
 ]
 
+uv_python_versions = [
+    '3.13',
+    '3.14',
+]
+
 pyenv_version_keys = [
     '8',
     '13',
@@ -34,3 +39,7 @@ config_files = [
 ]
 
 workdir = '/omlish'
+
+[cache_mounts]
+'pip' = '/root/.cache/pip'
+'uv' = '/root/.cache/uv'

{omdev-0.0.0.dev539 → omdev-0.0.0.dev540}/omdev/dockerdev/gen.py

@@ -1,12 +1,12 @@
 """
 TODO:
  - per-feature config, obv
+ - install pnpm
 """
 import io
 import typing as ta
 
-from omlish import dataclasses as dc
-
+from .config import Config
 from .content import LazyContent
 from .content import Resource
 from .helpers import APT_CACHE_MOUNTS
@@ -28,32 +28,6 @@ from .rendering import render_op
 ##
 
 
-@dc.dataclass(frozen=True)
-class Config:
-    base_image: str
-
-    workdir: str | None = None
-
-    _: dc.KW_ONLY
-
-    dep_sets: ta.Sequence[str] | None = None
-
-    jdks: ta.Sequence[str] | None = None
-
-    go_version: str | None = None
-
-    zig_version: str | None = None
-
-    nvm_versions: ta.Sequence[str] | None = None
-
-    pyenv_version_keys: ta.Sequence[str] | None = None
-
-    config_files: ta.Sequence[str] | None = None
-
-
-##
-
-
 def gen_ops(cfg: Config) -> ta.Sequence[Op]:
     ops: list[Op] = [
         From(cfg.base_image),
@@ -120,7 +94,10 @@ def gen_ops(cfg: Config) -> ta.Sequence[Op]:
             static_env={'NVM_VERSIONS': cfg.nvm_versions},
         ))
 
-    ops.append(fragment_section('uv'))
+    ops.append(fragment_section(
+        'uv',
+        static_env={'UV_PYTHON_VERSIONS': cfg.uv_python_versions or []},
+    ))
 
     if cfg.pyenv_version_keys:
         ops.append(fragment_section(

omdev-0.0.0.dev540/omdev/dockerdev/resources/fragments/uv.sh

@@ -0,0 +1,7 @@
+set -ex ;
+
+curl -LsSf 'https://astral.sh/uv/install.sh' | sh ;
+
+for PV in ${UV_PYTHON_VERSIONS} ; do
+  bash --login -c "uv python install $PV" ;
+done ;

{omdev-0.0.0.dev539 → omdev-0.0.0.dev540}/omdev/scripts/lib/io/pipelines.py

@@ -43,7 +43,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../lite/namespaces.py', sha1='27b12b6592403c010fb8b2a0af7c24238490d3a1'),
             dict(path='../../logs/levels.py', sha1='91405563d082a5eba874da82aac89d83ce7b6152'),
             dict(path='../../logs/warnings.py', sha1='c4eb694b24773351107fcc058f3620f1dbfb6799'),
-            dict(path='core.py', sha1='d9c24e9b85536086a93fc6f00ae02cdba2824e55'),
+            dict(path='core.py', sha1='3dabd48ce0e19fd974a89ea7b4dd2b6c4118d36b'),
             dict(path='../streams/types.py', sha1='8959d244de95eaf9f118cc3fd2d713d85e55ff36'),
             dict(path='../../logs/infos.py', sha1='4dd104bd468a8c438601dd0bbda619b47d2f1620'),
             dict(path='../../logs/metrics/base.py', sha1='95120732c745ceec5333f81553761ab6ff4bb3fb'),
@@ -1394,7 +1394,7 @@ class IoPipelineMessages(NamespaceClass):
     #
 
     class Completable(Abstract, ta.Generic[T]):
-        # Management of completable state is implemented as a 'hidden' / dynamic attributes to allow mixing in with
+        # Management of completable state is implemented as 'hidden' / dynamic attributes to allow mixing in with
         # otherwise frozen dataclasses.
 
         # _completion_state: ta.Literal['pending', 'succeeded', 'failed'] = 'pending'
@@ -1529,12 +1529,12 @@ class IoPipelineHandlerNotifications(NamespaceClass):
     @ta.final
     @dc.dataclass(frozen=True)
     class Added(IoPipelineHandlerNotification):
-        pass
+        ctx: 'IoPipelineHandlerContext'
 
     @ta.final
     @dc.dataclass(frozen=True)
     class Removed(IoPipelineHandlerNotification):
-        pass
+        ctx: 'IoPipelineHandlerContext'
 
 
 ##
@@ -1591,7 +1591,7 @@ IoPipelineHandlerRef_ = IoPipelineHandlerRef['IoPipelineHandler']  # ta.TypeAlia
 class IoPipelineHandlerContext:
     """
     The embodiment of an instance of a handler at a position in a pipeline. Passed to IoPipelineHandler methods,
-    providing handler-specific access to the pipeline and. As instances of `ShareableIoPipelineHandler` may validly be
+    providing handler-specific access to the pipeline. As instances of `ShareableIoPipelineHandler` may validly be
     simultaneously present at multiple positions in a pipeline, a single handler may have multiple active context
     instances associated with it in any given pipeline.
 
@@ -2343,9 +2343,8 @@ class IoPipeline:
 
         # _: dc.KW_ONLY
 
+        # Metadata and ervices are fixed for the lifetime of the pipeline.
         metadata: ta.Union[ta.Sequence[IoPipelineMetadata], IoPipelineMetadatas] = ()
-
-        # Services are fixed for the lifetime of the pipeline.
         services: ta.Union[ta.Sequence[IoPipelineService], IoPipelineServices] = ()
 
         #
@@ -2787,7 +2786,7 @@ class IoPipeline:
         self._handler_update(ctx, 'added')  # noqa
 
         # FIXME: exceptions?
-        self._notify(ctx, IoPipelineHandlerNotifications.Added())  # noqa
+        self._notify(ctx, IoPipelineHandlerNotifications.Added(ctx))
 
         return ctx._ref  # noqa
 
@@ -2879,7 +2878,7 @@ class IoPipeline:
         self._handler_update(ctx, 'removed')  # noqa
 
         # FIXME: exceptions? defer?
-        self._notify(ctx, IoPipelineHandlerNotifications.Removed())  # noqa
+        self._notify(ctx, IoPipelineHandlerNotifications.Removed(ctx))
 
     def remove(self, handler_ref: IoPipelineHandlerRef) -> None:
         self._remove(handler_ref)

{omdev-0.0.0.dev539 → omdev-0.0.0.dev540}/omdev/tui/rich/markdown2.py

@@ -31,8 +31,8 @@ def configure_markdown_parser(parser: ta.Optional['md.MarkdownIt'] = None) -> 'm
     )
 
 
-def markdown_from_tokens(tokens: ta.Sequence['md.token.Token']) -> 'rich.markdown.Markdown':
-    rmd = rich.markdown.Markdown('')
+def markdown_from_tokens(tokens: ta.Sequence['md.token.Token'], **kwargs: ta.Any) -> 'rich.markdown.Markdown':
+    rmd = rich.markdown.Markdown('', **kwargs)
     rmd.parsed = tokens  # type: ignore[assignment]
     return rmd
 
@@ -57,6 +57,8 @@ class MarkdownLiveStream(lang.ExitStacked, lang.Abstract):
             *,
             parser: ta.Optional['md.MarkdownIt'] = None,
             console: ta.Optional['rich.console.Console'] = None,
+            render_console_kwargs: ta.Mapping[str, ta.Any] | None = None,
+            markdown_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__()
 
@@ -68,8 +70,14 @@ class MarkdownLiveStream(lang.ExitStacked, lang.Abstract):
             parser = configure_markdown_parser()
         self._parser = parser
 
+        self._render_console_kwargs = render_console_kwargs
+        self._markdown_kwargs = markdown_kwargs
+
         self._lines_printed_to_scrollback = 0
 
+    def _markdown_from_tokens(self, tokens: ta.Sequence['md.token.Token']) -> 'rich.markdown.Markdown':
+        return markdown_from_tokens(tokens, **(self._markdown_kwargs or {}))
+
     _live: 'rich.live.Live'  # noqa
 
     def _enter_contexts(self) -> None:
@@ -86,10 +94,11 @@ class MarkdownLiveStream(lang.ExitStacked, lang.Abstract):
             obj,
             force_terminal=True,
             width=self._console.width,
+            **(self._render_console_kwargs or {}),
         ).splitlines()
 
     def _console_render_markdown(self, src: str) -> list[str]:
-        return self._console_render(markdown_from_tokens(self._parser.parse(src)))
+        return self._console_render(self._markdown_from_tokens(self._parser.parse(src)))
 
     @abc.abstractmethod
     def feed(self, s: str) -> None:
@@ -137,10 +146,14 @@ class IncrementalMarkdownLiveStream(MarkdownLiveStream):
             *,
             parser: ta.Optional['md.MarkdownIt'] = None,
             console: ta.Optional['rich.console.Console'] = None,
+            render_console_kwargs: ta.Mapping[str, ta.Any] | None = None,
+            markdown_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__(
             parser=parser,
             console=console,
+            render_console_kwargs=render_console_kwargs,
+            markdown_kwargs=markdown_kwargs,
         )
 
         self._inc_parser = IncrementalMarkdownParser(parser=self._parser)
@@ -150,7 +163,7 @@ class IncrementalMarkdownLiveStream(MarkdownLiveStream):
 
         if ip_out.new_stable:
             # Render the stable lines
-            stable_lines = self._console_render(markdown_from_tokens(ip_out.new_stable))
+            stable_lines = self._console_render(self._markdown_from_tokens(ip_out.new_stable))
 
             # Overlap Detection
             already_printed_count = min(self._lines_printed_to_scrollback, len(stable_lines))
@@ -163,7 +176,7 @@ class IncrementalMarkdownLiveStream(MarkdownLiveStream):
             # Adjust counter
             self._lines_printed_to_scrollback = max(0, self._lines_printed_to_scrollback - len(stable_lines))
 
-        unstable_lines = self._console_render(markdown_from_tokens(ip_out.unstable))
+        unstable_lines = self._console_render(self._markdown_from_tokens(ip_out.unstable))
 
         available_height = self._console.height - 2
         total_lines = len(unstable_lines)
@@ -199,11 +212,15 @@ class SteppedIncrementalMarkdownLiveStream(MarkdownLiveStream):
             *,
             parser: ta.Optional['md.MarkdownIt'] = None,
             console: ta.Optional['rich.console.Console'] = None,
+            render_console_kwargs: ta.Mapping[str, ta.Any] | None = None,
+            markdown_kwargs: ta.Mapping[str, ta.Any] | None = None,
             scroll_step: int | None = None,
     ) -> None:
         super().__init__(
             parser=parser,
             console=console,
+            render_console_kwargs=render_console_kwargs,
+            markdown_kwargs=markdown_kwargs,
         )
 
         self._inc_parser = IncrementalMarkdownParser(parser=self._parser)
@@ -216,7 +233,7 @@ class SteppedIncrementalMarkdownLiveStream(MarkdownLiveStream):
         # Handle stable content
 
         if ip_out.new_stable:
-            stable_lines = self._console_render(markdown_from_tokens(ip_out.new_stable))
+            stable_lines = self._console_render(self._markdown_from_tokens(ip_out.new_stable))
 
             # Overlap Detection: Determine how many lines of this now-stable block were already pushed to scrollback
             # while they were in the "unstable" phase.
@@ -234,7 +251,7 @@ class SteppedIncrementalMarkdownLiveStream(MarkdownLiveStream):
         ##
         # Handle unstable content
 
-        unstable_lines = self._console_render(markdown_from_tokens(ip_out.unstable))
+        unstable_lines = self._console_render(self._markdown_from_tokens(ip_out.unstable))
         total_lines = len(unstable_lines)
         available_height = self._console.height - 2
 
@@ -279,10 +296,14 @@ class ClaudeIncrementalMarkdownLiveStream(MarkdownLiveStream):
             *,
             parser: ta.Optional['md.MarkdownIt'] = None,
             console: ta.Optional['rich.console.Console'] = None,
+            render_console_kwargs: ta.Mapping[str, ta.Any] | None = None,
+            markdown_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__(
             parser=parser,
             console=console,
+            render_console_kwargs=render_console_kwargs,
+            markdown_kwargs=markdown_kwargs,
         )
 
         from ...markdown.incparse import ClaudeIncrementalMarkdownParser  # noqa
@@ -308,7 +329,7 @@ class ClaudeIncrementalMarkdownLiveStream(MarkdownLiveStream):
             self._live.stop()
 
             # Render and print stable content to true scrollback
-            stable_lines = self._console_render(markdown_from_tokens(ip_out.new_stable))
+            stable_lines = self._console_render(self._markdown_from_tokens(ip_out.new_stable))
             for line in stable_lines:
                 self._console.print(rich.text.Text.from_ansi(line), highlight=False)
 
@@ -320,7 +341,7 @@ class ClaudeIncrementalMarkdownLiveStream(MarkdownLiveStream):
             self._live.start()
 
         # Render current unstable content
-        unstable_lines = self._console_render(markdown_from_tokens(ip_out.unstable))
+        unstable_lines = self._console_render(self._markdown_from_tokens(ip_out.unstable))
         current_line_count = len(unstable_lines)
 
         # Calculate available display height
@@ -361,10 +382,14 @@ class GptIncrementalMarkdownLiveStream(MarkdownLiveStream):
             *,
             parser: ta.Optional['md.MarkdownIt'] = None,
             console: ta.Optional['rich.console.Console'] = None,
+            render_console_kwargs: ta.Mapping[str, ta.Any] | None = None,
+            markdown_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__(
             parser=parser,
             console=console,
+            render_console_kwargs=render_console_kwargs,
+            markdown_kwargs=markdown_kwargs,
         )
 
         from ...markdown.incparse import GptIncrementalMarkdownParser  # noqa
@@ -379,9 +404,9 @@ class GptIncrementalMarkdownLiveStream(MarkdownLiveStream):
         if ip_out.new_stable:
             # Print stable renderables directly through Rich (avoid ANSI round-tripping / splitlines). Use end="" so we
             # don't inject extra blank lines beyond what the markdown renderable produces.
-            self._live.console.print(markdown_from_tokens(ip_out.new_stable), end='')
+            self._live.console.print(self._markdown_from_tokens(ip_out.new_stable), end='')
 
         # Show the remaining (unstable) tail in the live region. We intentionally do *not* try to "spill overflow of
         # unstable to scrollback", since those lines are not provably stable and may retroactively change; printing them
         # would violate correctness.
-        self._live.update(markdown_from_tokens(ip_out.unstable))
+        self._live.update(self._markdown_from_tokens(ip_out.unstable))

omdev-0.0.0.dev540/omdev/tui/rich/textual/__init__.py

@@ -0,0 +1,12 @@
+from omlish import lang as _lang
+
+
+with _lang.auto_proxy_init(globals()):
+    from .dark import TEXTUAL_DARK  # noqa
+
+    from .themes import (  # noqa
+        DumpedTextualTheme,
+
+        build_pygments_theme,
+        build_theme,
+    )

omdev-0.0.0.dev540/omdev/tui/rich/textual/dark.py

@@ -0,0 +1,108 @@
+# flake8: noqa: E241
+# @omlish-llm-author "opus-4.6"
+from .themes import DumpedTextualTheme
+
+
+##
+
+
+##
+# Pre-computed color values for textual-dark (v8.1.1).
+#
+# These are the *resolved* hex values that Textual's ColorSystem.generate() produces for the default "textual-dark"
+# theme. Only the subset that matters for markdown rendering is kept here.
+#
+
+
+TEXTUAL_DARK = DumpedTextualTheme(
+    'textual-dark',
+
+    colors={
+        # Core palette
+        'primary':           '#0178D4',
+        'secondary':         '#004578',
+        'foreground':        '#E0E0E0',
+        'background':        '#121212',
+        'warning':           '#FEA62B',
+        'error':             '#B93C5B',
+        'surface':           '#1E1E1E',
+
+        # Derived text-on-background tints
+        'text-primary':      '#57A5E2',
+        'text-secondary':    '#5684A5',
+        'text-warning':      '#FFC473',
+        'text-error':        '#D17E92',
+
+        # Foreground variants
+        'foreground-muted':  '#E0E0E099',  # 60 % alpha
+
+        # Markdown header variables (straight from design.py defaults)
+        'markdown-h1-color':      '#0178D4',
+        'markdown-h1-text-style': 'bold',
+        'markdown-h2-color':      '#0178D4',
+        'markdown-h2-text-style': 'underline',
+        'markdown-h3-color':      '#0178D4',
+        'markdown-h3-text-style': 'bold',
+        'markdown-h4-color':      '#E0E0E0',
+        'markdown-h4-text-style': 'bold underline',
+        'markdown-h5-color':      '#E0E0E0',
+        'markdown-h5-text-style': 'bold',
+        'markdown-h6-color':      '#E0E0E099',
+        'markdown-h6-text-style': 'bold',
+    },
+
+    blended={
+        # Pre-blended colors for elements that use alpha/percentage notation in Textual CSS. Computed against
+        # background #121212.
+
+        # MarkdownBlock &:dark > .code_inline  ->  bg: $warning 10%, color: $text-warning 95%
+        'code_inline_bg':     '#292014',
+        'code_inline_fg':     '#F3BB6E',
+        # MarkdownFence  ->  bg: black 10%  (over #121212)
+        'code_block_bg':      '#101010',
+        'code_block_fg':      '#D2D2D2',   # rgb(210,210,210) literal in textual CSS
+        # MarkdownBlockQuote  ->  bg: $boost (white 4 %)
+        'block_quote_bg':     '#1B1B1B',
+        # MarkdownBlockQuote  ->  border-left: outer $text-primary 50%
+        'block_quote_border': '#345B7A',
+        # foreground-muted blended (for H6 -- 60 % alpha white-ish on #121212)
+        'h6_color':           '#8D8D8D',
+    },
+
+    pygments_styles={
+        # Resolved from textual.highlight.HighlightTheme.STYLES.
+        # Alpha-blended against fence bg #101010. Base text from highlight()'s stylize_before("$text").
+        'Token':                         '#DFDFDF',
+        'Token.Comment':                 '#9F9F9F',
+        'Token.Error':                   '#D17E92 bg:#441E27',
+        'Token.Generic.Emph':            'italic',
+        'Token.Generic.Error':           '#D17E92 bg:#441E27',
+        'Token.Generic.Heading':         'underline #57A5E2',
+        'Token.Generic.Strong':          'bold',
+        'Token.Generic.Subheading':      '#57A5E2',
+        'Token.Keyword':                 '#FFC473',
+        'Token.Keyword.Constant':        'bold #71AC84',
+        'Token.Keyword.Namespace':       '#D17E92',
+        'Token.Keyword.Type':            'bold',
+        'Token.Literal.Number':          '#FFC473',
+        'Token.Literal.String':          '#8AD4A1',
+        'Token.Literal.String.Backtick': '#9F9F9F',
+        'Token.Literal.String.Doc':      'italic #71AC84',
+        'Token.Literal.String.Double':   '#7DC092',
+        'Token.Name':                    '#57A5E2',
+        'Token.Name.Attribute':          '#FFC473',
+        'Token.Name.Builtin':            '#FFC473',
+        'Token.Name.Builtin.Pseudo':     'italic',
+        'Token.Name.Class':              'bold #FFC473',
+        'Token.Name.Constant':           '#D17E92',
+        'Token.Name.Decorator':          'bold #57A5E2',
+        'Token.Name.Function':           'underline #FFC473',
+        'Token.Name.Function.Magic':     'underline #FFC473',
+        'Token.Name.Tag':                'bold #57A5E2',
+        'Token.Name.Variable':           '#5684A5',
+        # Note: Token.Number IS Token.Literal.Number in Pygments (alias), so only the Literal.Number entry is needed.
+        'Token.Operator':                'bold',
+        'Token.Operator.Word':           'bold #D17E92',
+        'Token.Whitespace':              '',
+    },
+)