omdev 0.0.0.dev291__tar.gz → 0.0.0.dev293__tar.gz

{omdev-0.0.0.dev291/omdev.egg-info → omdev-0.0.0.dev293}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev291
+Version: 0.0.0.dev293
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev291
+Requires-Dist: omlish==0.0.0.dev293
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 168,
+    "line": 173,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/ci/compose.py

@@ -155,7 +155,7 @@ class DockerComposeRun(AsyncExitStacked):
 
         async with contextlib.AsyncExitStack() as es:
             if not (self._cfg.no_dependencies or self._cfg.no_dependency_cleanup):
-                await es.enter_async_context(adefer(self._cleanup_dependencies))  # noqa
+                await es.enter_async_context(adefer(self._cleanup_dependencies()))  # noqa
 
             sh_cmd = ' '.join([
                 'docker',

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/cli/clicli.py

@@ -1,5 +1,6 @@
 import inspect
 import os
+import shlex
 import subprocess
 import sys
 import typing as ta
@@ -76,6 +77,7 @@ class CliCli(ap.Cli):
         ap.arg('--url', default=DEFAULT_REINSTALL_URL),
         ap.arg('--local', action='store_true'),
         ap.arg('--no-deps', action='store_true'),
+        ap.arg('--dry-run', action='store_true'),
         ap.arg('extra_deps', nargs='*'),
     )
     def reinstall(self) -> None:
@@ -147,7 +149,7 @@ class CliCli(ap.Cli):
 
             reco_cmd = ' '.join([
                 'curl -LsSf',
-                url,
+                f"'{url}'" if (qu := shlex.quote(url)) == url else qu,
                 '| python3 -',
                 *deps,
             ])
@@ -156,6 +158,9 @@ class CliCli(ap.Cli):
             with urllib.request.urlopen(urllib.request.Request(url)) as resp:  # noqa
                 install_src = resp.read().decode('utf-8')
 
+        if self.args.dry_run:
+            return
+
         os.execl(
             sys.executable,
             sys.executable,

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/base.py

@@ -2,6 +2,9 @@ import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish import lang
+from omlish.configs import all as cfgs
+
 
 PrecheckConfigT = ta.TypeVar('PrecheckConfigT', bound='Precheck.Config')
 
@@ -17,16 +20,11 @@ class PrecheckContext:
 ##
 
 
-class Precheck(abc.ABC, ta.Generic[PrecheckConfigT]):
+class Precheck(cfgs.Configurable[PrecheckConfigT], lang.Abstract):
     @dc.dataclass(frozen=True)
-    class Config:
+    class Config(cfgs.Configurable.Config):
         pass
 
-    def __init__(self, context: PrecheckContext, config: PrecheckConfigT) -> None:
-        super().__init__()
-        self._context = context
-        self._config = config
-
     @dc.dataclass(frozen=True)
     class Violation:
         pc: 'Precheck'

omdev-0.0.0.dev293/omdev/precheck/caches.py

@@ -0,0 +1,77 @@
+import ast
+import os
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish.text.filecache import TextFileCache
+
+from ..py.srcheaders import PyHeaderLine
+from ..py.srcheaders import get_py_header_lines
+from ..tokens import all as tks
+
+
+##
+
+
+class DirWalkCache:
+    @dc.dataclass(frozen=True)
+    class Entry:
+        root: str
+        dirs: ta.Sequence[str]
+        files: ta.Sequence[str]
+
+    @lang.cached_function
+    def list_dir(self, path: str) -> ta.Sequence[Entry]:
+        return [
+            self.Entry(root, list(dirs), list(files))
+            for root, dirs, files in os.walk(path)
+        ]
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class AstCache:
+    _tfc: TextFileCache = dc.field(repr=False)
+
+    @lang.cached_function
+    def get_file_ast(self, path: str) -> ast.AST | Exception:
+        try:
+            tfe = self._tfc.get_entry(path)
+            return ast.parse(tfe.text(), path)
+        except Exception as e:  # noqa
+            return e
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class TokensCache:
+    _tfc: TextFileCache = dc.field(repr=False)
+
+    @lang.cached_function
+    def get_file_tokens(self, path: str) -> tks.Tokens | Exception:
+        try:
+            tfe = self._tfc.get_entry(path)
+            return tks.src_to_tokens(tfe.text())
+        except Exception as e:  # noqa
+            return e
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class HeadersCache:
+    _tfc: TextFileCache = dc.field(repr=False)
+
+    @lang.cached_function
+    def get_file_headers(self, path: str) -> ta.Sequence[PyHeaderLine] | Exception:
+        try:
+            tfe = self._tfc.get_entry(path)
+            return get_py_header_lines(tfe.text())
+        except Exception as e:  # noqa
+            return e

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/git.py

@@ -3,7 +3,6 @@ import dataclasses as dc
 import typing as ta
 
 from .base import Precheck
-from .base import PrecheckContext
 
 
 ##
@@ -23,8 +22,8 @@ class GitBlacklistPrecheck(Precheck['GitBlacklistPrecheck.Config']):
             'secrets.yml',
         )
 
-    def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
-        super().__init__(context, config)
+    def __init__(self, config: Config = Config()) -> None:
+        super().__init__(config)
 
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
         for f in self._config.files:

omdev-0.0.0.dev293/omdev/precheck/imports.py

@@ -0,0 +1,76 @@
+import ast
+import dataclasses as dc
+import os.path
+import typing as ta
+
+from .base import Precheck
+from .base import PrecheckContext
+from .caches import AstCache
+from .caches import DirWalkCache
+from .caches import HeadersCache
+
+
+##
+
+
+class RootRelativeImportPrecheck(Precheck['RootRelativeImportPrecheck.Config']):
+    @dc.dataclass(frozen=True)
+    class Config(Precheck.Config):
+        pass
+
+    def __init__(
+            self,
+            context: PrecheckContext,
+            config: Config = Config(),
+            *,
+            dir_walk_cache: DirWalkCache,
+            headers_cache: HeadersCache,
+            ast_cache: AstCache,
+    ) -> None:
+        super().__init__(config)
+
+        self._context = context
+
+        self._dir_walk_cache = dir_walk_cache
+        self._headers_cache = headers_cache
+        self._ast_cache = ast_cache
+
+    async def _run_py_file(self, py_file: str, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        if isinstance(header_lines := self._headers_cache.get_file_headers(py_file), Exception):
+            return
+        if any(hl.src.strip() == '# ruff: noqa' for hl in header_lines):
+            return
+
+        py_file_ast = self._ast_cache.get_file_ast(py_file)
+        if not isinstance(py_file_ast, ast.Module):
+            return
+
+        for cur_node in py_file_ast.body:
+            if isinstance(cur_node, ast.Import):
+                imp_alias: ast.alias
+                for imp_alias in cur_node.names:
+                    if imp_alias.name.split('.')[0] == src_root:
+                        yield Precheck.Violation(self, f'Root relative import in file {py_file}: {imp_alias.name!r}')
+
+            elif isinstance(cur_node, ast.ImportFrom):
+                if cur_node.level == 0 and cur_node.module and cur_node.module.split('.')[0] == src_root:
+                    yield Precheck.Violation(self, f'Root relative import in file {py_file}: {cur_node.module!r}')
+
+        return
+
+    async def _run_src_root(self, src_root: str) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        py_files = [
+            os.path.join(e.root, f)
+            for e in self._dir_walk_cache.list_dir(src_root)
+            for f in e.files
+            if f.endswith('.py')
+        ]
+
+        for py_file in py_files:
+            async for v in self._run_py_file(py_file, src_root):
+                yield v
+
+    async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
+        for src_root in self._context.src_roots:
+            async for v in self._run_src_root(src_root):
+                yield v

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/lite.py

@@ -29,7 +29,9 @@ class LitePython8Precheck(Precheck['LitePython8Precheck.Config']):
         concurrency: int = 4
 
     def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
-        super().__init__(context, config)
+        super().__init__(config)
+
+        self._context = context
 
     #
 

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/main.py

@@ -25,11 +25,18 @@ import os.path
 import sys
 import typing as ta
 
+from omlish import inject as inj
 from omlish.logs import all as logs
 
 from .base import Precheck
 from .base import PrecheckContext
+from .caches import AstCache
+from .caches import DirWalkCache
+from .caches import HeadersCache
+from .caches import TextFileCache
+from .caches import TokensCache
 from .git import GitBlacklistPrecheck
+from .imports import RootRelativeImportPrecheck
 from .lite import LitePython8Precheck
 from .manifests import ManifestsPrecheck
 from .scripts import ScriptDepsPrecheck
@@ -41,6 +48,36 @@ log = logging.getLogger(__name__)
 ##
 
 
+def bind_main(
+        ctx: PrecheckContext,
+        pc_cfgs: ta.Iterable[Precheck.Config],
+) -> inj.Elements:
+    lst: list[inj.Elemental] = [
+        inj.bind(ctx),
+
+        inj.set_binder[Precheck](),
+
+        inj.bind(AstCache, singleton=True),
+        inj.bind(DirWalkCache, singleton=True),
+        inj.bind(HeadersCache, singleton=True),
+        inj.bind(TextFileCache, singleton=True),
+        inj.bind(TokensCache, singleton=True),
+    ]
+
+    #
+
+    for pc_cfg in pc_cfgs:
+        lst.extend([
+            inj.bind(pc_cfg),
+            inj.bind(pc_cfg.configurable_cls, eager=True, singleton=True),
+            inj.set_binder[Precheck]().bind(pc_cfg.configurable_cls),
+        ])
+
+    #
+
+    return inj.as_elements(*lst)
+
+
 def _check_cmd(args) -> None:
     if not os.path.isfile('pyproject.toml'):
         raise RuntimeError('must run in project root')
@@ -49,34 +86,44 @@ def _check_cmd(args) -> None:
         src_roots=args.roots,
     )
 
-    pcs: list[Precheck] = [
-        GitBlacklistPrecheck(ctx),
-        ScriptDepsPrecheck(ctx),
-        LitePython8Precheck(ctx),
-        ManifestsPrecheck(ctx),
+    pc_cfgs: list[Precheck.Config] = [
+        GitBlacklistPrecheck.Config(),
+        LitePython8Precheck.Config(),
+        ManifestsPrecheck.Config(),
+        RootRelativeImportPrecheck.Config(),
+        ScriptDepsPrecheck.Config(),
     ]
 
-    async def run() -> list[Precheck.Violation]:
-        vs: list[Precheck.Violation] = []
-
-        for pc in pcs:
-            log.info('Running precheck: %s', type(pc).__name__)
-            async for v in pc.run():
-                vs.append(v)
-                print('*** VIOLATION ***')
-                print(f'Seq: {len(vs)}')
-                print(f'Precheck: {v.pc}')
-                print(f'Message:')
-                print(v.msg.strip())
-                print()
-
-        return vs
-
-    vs = asyncio.run(run())
-
-    if vs:
-        print(f'{len(vs)} violations found')
-        sys.exit(1)
+    with inj.create_managed_injector(bind_main(
+        ctx,
+        pc_cfgs,
+    )) as injector:
+        async def run() -> list[Precheck.Violation]:
+            vs: list[Precheck.Violation] = []
+
+            pcs = sorted(
+                injector[ta.AbstractSet[Precheck]],
+                key=lambda pc: type(pc).__name__,
+            )
+
+            for pc in pcs:
+                log.info('Running precheck: %s', type(pc).__name__)
+                async for v in pc.run():
+                    vs.append(v)
+                    print('*** VIOLATION ***')
+                    print(f'Seq: {len(vs)}')
+                    print(f'Precheck: {v.pc}')
+                    print(f'Message:')
+                    print(v.msg.strip())
+                    print()
+
+            return vs
+
+        vs = asyncio.run(run())
+
+        if vs:
+            print(f'{len(vs)} violations found')
+            sys.exit(1)
 
 
 ##

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/manifests.py

@@ -16,7 +16,9 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
         pass
 
     def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
-        super().__init__(context, config)
+        super().__init__(config)
+
+        self._context = context
 
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
         for src_root in self._context.src_roots:

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/precheck/scripts.py

@@ -17,8 +17,14 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
     class Config(Precheck.Config):
         pass
 
-    def __init__(self, context: PrecheckContext, config: Config = Config()) -> None:
-        super().__init__(context, config)
+    def __init__(
+            self,
+            context: PrecheckContext,
+            config: Config = Config(),
+    ) -> None:
+        super().__init__(config)
+
+        self._context = context
 
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation, None]:
         for fp in magic.find_magic_files(

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/ptk/__init__.py

@@ -2,6 +2,7 @@
 # flake8: noqa: F401
 
 from prompt_toolkit import Application
+from prompt_toolkit import prompt
 from prompt_toolkit.application import get_app
 from prompt_toolkit.application import get_app_session
 from prompt_toolkit.application import run_in_terminal
@@ -21,6 +22,7 @@ from prompt_toolkit.filters import is_searching
 from prompt_toolkit.filters import to_filter
 from prompt_toolkit.filters import vi_insert_mode
 from prompt_toolkit.filters import vi_navigation_mode
+from prompt_toolkit.formatted_text import ANSI
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.formatted_text import AnyFormattedText
 from prompt_toolkit.formatted_text import FormattedText

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev/scripts/ci.py

@@ -3331,7 +3331,9 @@ class AsyncExitStacked:
 
 
 @contextlib.contextmanager
-def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
+def defer(fn: ta.Callable, *args: ta.Any, **kwargs: ta.Any) -> ta.Generator[ta.Callable, None, None]:
+    if args or kwargs:
+        fn = functools.partial(fn, *args, **kwargs)
     try:
         yield fn
     finally:
@@ -3339,11 +3341,11 @@ def defer(fn: ta.Callable) -> ta.Generator[ta.Callable, None, None]:
 
 
 @contextlib.asynccontextmanager
-async def adefer(fn: ta.Callable) -> ta.AsyncGenerator[ta.Callable, None]:
+async def adefer(fn: ta.Awaitable) -> ta.AsyncGenerator[ta.Awaitable, None]:
     try:
         yield fn
     finally:
-        await fn()
+        await fn
 
 
 ##
@@ -11702,7 +11704,7 @@ class DockerComposeRun(AsyncExitStacked):
 
         async with contextlib.AsyncExitStack() as es:
             if not (self._cfg.no_dependencies or self._cfg.no_dependency_cleanup):
-                await es.enter_async_context(adefer(self._cleanup_dependencies))  # noqa
+                await es.enter_async_context(adefer(self._cleanup_dependencies()))  # noqa
 
             sh_cmd = ' '.join([
                 'docker',

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev291
+Version: 0.0.0.dev293
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev291
+Requires-Dist: omlish==0.0.0.dev293
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev.egg-info/SOURCES.txt

@@ -202,7 +202,9 @@ omdev/packaging/wheelfile.py
 omdev/precheck/__init__.py
 omdev/precheck/__main__.py
 omdev/precheck/base.py
+omdev/precheck/caches.py
 omdev/precheck/git.py
+omdev/precheck/imports.py
 omdev/precheck/lite.py
 omdev/precheck/main.py
 omdev/precheck/manifests.py

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev291
+omlish==0.0.0.dev293
 
 [all]
 black~=25.1

{omdev-0.0.0.dev291 → omdev-0.0.0.dev293}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev291'
+version = '0.0.0.dev293'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev291',
+    'omlish == 0.0.0.dev293',
 ]
 
 [project.optional-dependencies]