omdev 0.0.42__tar.gz → 0.0.44__tar.gz

{omdev-0.0.42 → omdev-0.0.44}/LICENSE

@@ -1,3 +1,9 @@
+Except where otherwise indicated, original code in this repository is licensed under the BSD 3-Clause License.
+
+Third-party and adapted code retains the license identified in its source file and/or directory.
+
+====
+
 Copyright 2023- wrmsr
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the

{omdev-0.0.42/omdev.egg-info → omdev-0.0.44}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.42
+Version: 0.0.44
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.15
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omcore==0.0.42
+Requires-Dist: omcore==0.0.44
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.42; extra == "all"
-Requires-Dist: omllm==0.0.42; extra == "all"
+Requires-Dist: ominfra==0.0.44; extra == "all"
+Requires-Dist: omllm==0.0.44; extra == "all"
 Requires-Dist: black~=26.5; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -36,9 +36,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.42; extra == "ominfra"
+Requires-Dist: ominfra==0.0.44; extra == "ominfra"
 Provides-Extra: omllm
-Requires-Dist: omllm==0.0.42; extra == "omllm"
+Requires-Dist: omllm==0.0.44; extra == "omllm"
 Provides-Extra: black
 Requires-Dist: black~=26.5; extra == "black"
 Provides-Extra: c

{omdev-0.0.42 → omdev-0.0.44}/omdev/cache/compute/currents.py

@@ -25,7 +25,7 @@ _CURRENT_CACHE: Cache | None = None
 
 
 @contextlib.contextmanager
-def setting_current_cache(cache: CacheT) -> ta.Iterator[CacheT]:
+def setting_current_cache(cache: CacheT) -> ta.Generator[CacheT]:
     global _CURRENT_CACHE
     prev = _CURRENT_CACHE
 
@@ -53,7 +53,7 @@ def setting_current_context(
         obj: Object,
         key: CacheKey | None = None,
         **kwargs: ta.Any,
-) -> ta.Iterator[Context]:
+) -> ta.Generator[Context]:
     global _CURRENT_CONTEXT
     prev = _CURRENT_CONTEXT
 

{omdev-0.0.42 → omdev-0.0.44}/omdev/cexts/_distutils/build_ext.py

@@ -305,7 +305,7 @@ class BuildExt:
             return self._build_extension(ext)
 
     @contextlib.contextmanager
-    def _filter_build_errors(self, ext: extension.Extension) -> ta.Iterator[None]:
+    def _filter_build_errors(self, ext: extension.Extension) -> ta.Generator[None]:
         try:
             yield
         except (

{omdev-0.0.42 → omdev-0.0.44}/omdev/dockerdev/resources/fragments/om.sh

@@ -1,5 +1,6 @@
 curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.py' | bash --login -c 'python3 - $@' - \
   omcore-cext \
+  omcore-mypyc \
   omdev-cext \
   ominfra \
   omllm \
@@ -12,9 +13,9 @@ curl -LsSf 'https://raw.githubusercontent.com/wrmsr/om/master/omdev/cli/install.
   orjson \
   pyyaml \
   \
-  textual \
-  textual-speedups \
-  \
   pg8000 \
   pymysql \
+  \
+  textual \
+  textual-speedups \
 ;

{omdev-0.0.42 → omdev-0.0.44}/omdev/git/vendor/upstreams.py

@@ -15,7 +15,7 @@ def git_upstream_source(
         *,
         from_path: str | None = None,
         timeout: float = 15. * 60.,
-) -> ta.Iterator[GitRunner]:
+) -> ta.Generator[GitRunner]:
     """
     Yields a GitRunner for the upstream repo - either an existing local clone (used strictly read-only) or a temporary
     bare clone of `url` which is removed afterward.

{omdev-0.0.42 → omdev-0.0.44}/omdev/js/quickjs/_pyqjsng.c

@@ -10,7 +10,8 @@
 //     "-Wno-unreachable-code",
 //     "-Wno-unused-but-set-variable",
 //     "-Wno-unused-const-variable",
-//     "-Wno-unused-function"
+//     "-Wno-unused-function",
+//     "-fvisibility=hidden"
 //   ],
 //   "define_macros": {
 //     "_GNU_SOURCE": "1"

{omdev-0.0.42 → omdev-0.0.44}/omdev/pyproject/cli.py

@@ -22,6 +22,7 @@ See:
 import argparse
 import asyncio
 import concurrent.futures as cf
+import dataclasses as dc
 import functools
 import itertools
 import multiprocessing as mp
@@ -43,6 +44,7 @@ from omcore.logs.std.standard import configure_standard_logging
 
 from .configs import PyprojectConfig
 from .configs import PyprojectConfigPreparer
+from .configs import VenvConfig
 from .pkg import BasePyprojectPackageGenerator
 from .pkg import PyprojectPackageGenerator
 from .venvs import Venv
@@ -93,11 +95,46 @@ class Run:
 
     @cached_nullary
     def venvs(self) -> ta.Mapping[str, Venv]:
-        return {
-            n: Venv(n, c)
-            for n, c in self.cfg().venvs.items()
-            if not n.startswith('_')
-        }
+        real_cfgs: ta.Dict[str, VenvConfig] = {}
+        alias_set: ta.Set[str] = set()
+        alias_map: ta.Dict[str, ta.List[str]] = {}
+
+        for n, c in self.cfg().venvs.items():
+            if n.startswith('_'):
+                continue
+
+            check.not_in(n, real_cfgs)
+            check.not_in(n, alias_set)
+
+            if (af := c.alias_for):
+                alias_set.add(n)
+                alias_map.setdefault(af, []).append(n)
+                continue
+
+            for a in c.aliases or []:
+                check.not_in(a, real_cfgs)
+                check.not_in(a, alias_set)
+                alias_set.add(n)
+                alias_map.setdefault(a, []).append(n)
+
+            real_cfgs[n] = c
+
+        venvs: ta.Dict[str, Venv] = {}
+        for n, c in real_cfgs.items():
+            cal = [
+                *(c.aliases or []),
+                *alias_map.get(n, []),
+            ]
+            c = dc.replace(c, aliases=cal or None)
+
+            venvs[n] = Venv(n, c)
+
+        for n, afs in alias_map.items():
+            v = venvs[n]
+            for af in afs:
+                venvs[af] = v
+
+        return venvs
 
 
 ##
@@ -192,6 +229,7 @@ class PyprojectCli(ArgparseCli):
         argparse_arg('-b', '--build', action='store_true'),
         argparse_arg('-r', '--revision', action='store_true'),
         argparse_arg('-j', '--jobs', type=int),
+        argparse_arg('-S', '--suffix', action='append'),
         argparse_arg('cmd', nargs='?'),
         argparse_arg('args', nargs=argparse.REMAINDER),
     )
@@ -223,6 +261,8 @@ class PyprojectCli(ArgparseCli):
                 for dir_name in run.cfg().pkgs
             ]
             pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+            if self.args.suffix is not None:
+                pgs = [pg for pg in pgs if pg.pkg_suffix.lstrip('-') in self.args.suffix]
 
             num_threads = self.args.jobs or int(max(mp.cpu_count() // 1.5, 1))
             futs: ta.List[cf.Future]
@@ -245,6 +285,40 @@ class PyprojectCli(ArgparseCli):
                     for fut in futs:
                         fut.result()
 
+        elif cmd == 'build':
+            pkgs_root = os.path.join('.pkg')
+
+            build_output_dir = 'dist'
+            add_revision = bool(self.args.revision)
+
+            os.makedirs(build_output_dir, exist_ok=True)
+
+            pgs = [
+                PyprojectPackageGenerator(
+                    dir_name,
+                    pkgs_root,
+                )
+                for dir_name in run.cfg().pkgs
+            ]
+            pgs = list(itertools.chain.from_iterable([pg, *pg.children()] for pg in pgs))
+            if self.args.suffix is not None:
+                pgs = [pg for pg in pgs if pg.pkg_suffix.lstrip('-') in self.args.suffix]
+
+            num_threads = self.args.jobs or int(max(mp.cpu_count() // 1.5, 1))
+            with cf.ThreadPoolExecutor(num_threads) as ex:
+                futs = [
+                    ex.submit(functools.partial(
+                        pg.build,
+                        build_output_dir,
+                        BasePyprojectPackageGenerator.BuildOpts(
+                            add_revision=add_revision,
+                        ),
+                    ))
+                    for pg in pgs
+                ]
+                for fut in futs:
+                    fut.result()
+
         else:
             raise Exception(f'unknown subcommand: {cmd}')
 

{omdev-0.0.42 → omdev-0.0.44}/omdev/pyproject/configs.py

@@ -2,6 +2,8 @@
 import dataclasses as dc
 import typing as ta
 
+from omcore.lite.check import check
+from omcore.lite.dataclasses import dataclass_maybe_post_init
 from omcore.lite.marshal import unmarshal_obj
 
 from ..interp.venvs import InterpVenvConfig
@@ -12,10 +14,26 @@ from ..interp.venvs import InterpVenvConfig
 
 @dc.dataclass(frozen=True)
 class VenvConfig(InterpVenvConfig):
+    alias_for: ta.Optional[str] = None
+    aliases: ta.Optional[ta.List[str]] = None
+
     inherits: ta.Optional[ta.Sequence[str]] = None
     docker_service: ta.Optional[str] = None
     srcs: ta.Optional[ta.List[str]] = None
 
+    def __post_init__(self) -> None:
+        dataclass_maybe_post_init(super())
+
+        if self.alias_for is not None:
+            check.non_empty_str(self.alias_for)
+            for f in dc.fields(self):
+                if f.name != 'alias_for':
+                    if getattr(self, f.name) is not None:
+                        raise ValueError(f'Must not set {f.name} when alias_for is present.')
+
+        else:
+            check.not_isinstance(self.inherits, str)
+
 
 @dc.dataclass(frozen=True)
 class PyprojectConfig:
@@ -93,6 +111,8 @@ class PyprojectConfigPreparer:
 
         ivs = dict(self._inherit_venvs(pcfg.venvs or {}))
         for k, v in ivs.items():
+            if v.alias_for:
+                continue
             v = dc.replace(v, srcs=self._resolve_srcs(v.srcs or [], pcfg.srcs or {}))
             v = dc.replace(v, interp=self._fixup_interp(v.interp))
             ivs[k] = v

{omdev-0.0.42 → omdev-0.0.44}/omdev/pyproject/pkg.py

@@ -78,6 +78,10 @@ class BasePyprojectPackageGenerator(Abstract):
         self._pkgs_root = pkgs_root
         self._pkg_suffix = pkg_suffix
 
+    @property
+    def pkg_suffix(self) -> str:
+        return self._pkg_suffix
+
     #
 
     @cached_nullary
@@ -88,6 +92,10 @@ class BasePyprojectPackageGenerator(Abstract):
 
     @cached_nullary
     def _pkg_dir(self) -> str:
+        return os.path.join(self._pkgs_root, self._dir_name + self._pkg_suffix)
+
+    @cached_nullary
+    def _cleaned_pkg_dir(self) -> str:
         pkg_dir: str = os.path.join(self._pkgs_root, self._dir_name + self._pkg_suffix)
         if os.path.isdir(pkg_dir):
             shutil.rmtree(pkg_dir)
@@ -103,15 +111,15 @@ class BasePyprojectPackageGenerator(Abstract):
     ]
 
     def _write_git_ignore(self) -> None:
-        with open(os.path.join(self._pkg_dir(), '.gitignore'), 'w') as f:
+        with open(os.path.join(self._cleaned_pkg_dir(), '.gitignore'), 'w') as f:
             f.write('\n'.join([*self._GIT_IGNORE, '']))
 
     #
 
     def _symlink_source_dir(self) -> None:
         os.symlink(
-            os.path.relpath(self._dir_name, self._pkg_dir()),
-            os.path.join(self._pkg_dir(), self._dir_name),
+            os.path.relpath(self._dir_name, self._cleaned_pkg_dir()),
+            os.path.join(self._cleaned_pkg_dir(), self._dir_name),
         )
 
     #
@@ -240,12 +248,12 @@ class BasePyprojectPackageGenerator(Abstract):
     def _symlink_standard_files(self) -> None:
         for fn in self._STANDARD_FILES:
             for tp in [
-                [self._pkg_dir(), self._dir_name],
+                [self._cleaned_pkg_dir(), self._dir_name],
                 [],
             ]:
                 fp = os.path.join(*tp, fn)
                 if os.path.exists(fp):
-                    os.symlink(os.path.relpath(fp, self._pkg_dir()), os.path.join(self._pkg_dir(), fn))
+                    os.symlink(os.path.relpath(fp, self._cleaned_pkg_dir()), os.path.join(self._cleaned_pkg_dir(), fn))
                     break
 
     #
@@ -258,13 +266,13 @@ class BasePyprojectPackageGenerator(Abstract):
     def gen(self) -> str:
         log.info('Generating pyproject package: %s -> %s (%s)', self._dir_name, self._pkgs_root, self._pkg_suffix)
 
-        self._pkg_dir()
+        self._cleaned_pkg_dir()
         self._write_git_ignore()
         self._symlink_source_dir()
         self._write_file_contents()
         self._symlink_standard_files()
 
-        return self._pkg_dir()
+        return self._cleaned_pkg_dir()
 
     #
 
@@ -433,11 +441,11 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
     def _write_file_contents(self) -> None:
         fc = self.file_contents()
 
-        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+        with open(os.path.join(self._cleaned_pkg_dir(), 'pyproject.toml'), 'w') as f:
             TomlWriter(f).write_root(fc.pyproject_dct)
 
         if fc.manifest_in:
-            with open(os.path.join(self._pkg_dir(), 'MANIFEST.in'), 'w') as f:
+            with open(os.path.join(self._cleaned_pkg_dir(), 'MANIFEST.in'), 'w') as f:
                 f.write('\n'.join([*fc.manifest_in, '']))  # noqa
 
     #
@@ -530,14 +538,14 @@ class _PyprojectExtensionPackageGenerator(BasePyprojectPackageGenerator, Abstrac
     def _write_file_contents(self) -> None:
         fc = self.file_contents()
 
-        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+        with open(os.path.join(self._cleaned_pkg_dir(), 'pyproject.toml'), 'w') as f:
             TomlWriter(f).write_root(fc.pyproject_dct)
 
-        with open(os.path.join(self._pkg_dir(), 'setup.py'), 'w') as f:
+        with open(os.path.join(self._cleaned_pkg_dir(), 'setup.py'), 'w') as f:
             f.write(fc.setup_py)
 
         if fc.manifest_in:
-            with open(os.path.join(self._pkg_dir(), 'MANIFEST.in'), 'w') as f:
+            with open(os.path.join(self._cleaned_pkg_dir(), 'MANIFEST.in'), 'w') as f:
                 f.write('\n'.join([*fc.manifest_in, '']))  # noqa
 
 
@@ -1085,5 +1093,5 @@ class _PyprojectCliPackageGenerator(BasePyprojectPackageGenerator):
     def _write_file_contents(self) -> None:
         fc = self.file_contents()
 
-        with open(os.path.join(self._pkg_dir(), 'pyproject.toml'), 'w') as f:
+        with open(os.path.join(self._cleaned_pkg_dir(), 'pyproject.toml'), 'w') as f:
             TomlWriter(f).write_root(fc.pyproject_dct)

{omdev-0.0.42 → omdev-0.0.44}/omdev/pyproject/venvs.py

@@ -31,10 +31,17 @@ class Venv:
         self._name = name
         self._cfg = cfg
 
+    @property
+    def name(self) -> str:
+        return self._name
+
     @property
     def cfg(self) -> VenvConfig:
         return self._cfg
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}(name={self._name!r}, cfg={self._cfg!r})'
+
     DIR_NAME = '.venvs'
 
     @property
@@ -66,7 +73,17 @@ class Venv:
 
     @async_cached_nullary
     async def create(self) -> bool:
-        return await self._iv().create()
+        ret = await self._iv().create()
+
+        for a in self._cfg.aliases or []:
+            ap = os.path.join(self.DIR_NAME, a)
+            if os.path.exists(ap):
+                if not os.path.islink(ap):
+                    raise Exception(f'{ap} exists but is not a symlink!')
+            else:
+                os.symlink(self._name, ap)
+
+        return ret
 
     @staticmethod
     def _resolve_srcs(raw: ta.List[str]) -> ta.List[str]:

omdev-0.0.44/omdev/pyright/report.py

@@ -0,0 +1,120 @@
+"""
+TODO:
+ - baseline integration - report new-vs-baselined counts
+"""
+import argparse
+import collections
+import json
+import subprocess
+import sys
+import typing as ta
+
+
+##
+
+
+DEFAULT_TIMEOUT_S: float = 60. * 60.
+
+
+def run_basedpyright_json(
+        args: ta.Sequence[str],
+        *,
+        timeout_s: float = DEFAULT_TIMEOUT_S,
+) -> tuple[ta.Any, int]:
+    proc = subprocess.run(  # noqa
+        [sys.executable, '-m', 'basedpyright', '--outputjson', *args],
+        stdout=subprocess.PIPE,
+        text=True,
+        timeout=timeout_s,
+        check=False,
+    )
+
+    try:
+        output = json.loads(proc.stdout)
+    except json.JSONDecodeError:
+        sys.stdout.write(proc.stdout)
+        raise
+
+    return output, proc.returncode
+
+
+##
+
+
+_SEVERITIES: ta.Sequence[str] = ['error', 'warning', 'information']
+
+
+def _print_counter_table(counter: ta.Mapping[str, int]) -> None:
+    max_key_len = max(map(len, counter))
+    for key, count in sorted(counter.items(), key=lambda kv: -kv[1]):
+        print(f'{key.rjust(max_key_len)} : {count}')
+
+
+def report_output(
+        output: ta.Any,
+        *,
+        top_files: int = 0,
+) -> None:
+    diags: ta.Sequence[ta.Mapping[str, ta.Any]] = output.get('generalDiagnostics', [])
+
+    rules_by_severity: ta.Mapping[str, collections.Counter] = {
+        severity: collections.Counter(
+            d.get('rule', '(none)')
+            for d in diags
+            if d.get('severity') == severity
+        )
+        for severity in _SEVERITIES
+    }
+
+    for severity in _SEVERITIES:
+        if not (counter := rules_by_severity[severity]):
+            continue
+
+        print()
+        print(f'## {severity}s')
+        print()
+        _print_counter_table(counter)
+
+    if top_files and diags:
+        count_by_file = collections.Counter(d['file'] for d in diags if 'file' in d)
+
+        print()
+        print(f'## top {top_files} files')
+        print()
+        _print_counter_table(dict(count_by_file.most_common(top_files)))
+
+    summary: ta.Mapping[str, ta.Any] = output.get('summary', {})
+
+    print()
+    print(', '.join([
+        f'{summary.get("filesAnalyzed", "?")} files',
+        *[
+            f'{summary.get(f"{severity}Count", 0)} {severity}s'
+            for severity in _SEVERITIES
+        ],
+        f'{summary.get("timeInSec", "?")}s',
+    ]))
+    print()
+
+
+##
+
+
+def _main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--top-files', type=int, default=0)
+    parser.add_argument('args', nargs=argparse.REMAINDER)
+    ns = parser.parse_args()
+
+    output, rc = run_basedpyright_json(ns.args)
+
+    report_output(
+        output,
+        top_files=ns.top_files,
+    )
+
+    raise SystemExit(rc)
+
+
+if __name__ == '__main__':
+    _main()