omdev 0.0.0.dev399__tar.gz → 0.0.0.dev401__tar.gz

{omdev-0.0.0.dev399/omdev.egg-info → omdev-0.0.0.dev401}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev399
+Version: 0.0.0.dev401
 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.dev399
+Requires-Dist: omlish==0.0.0.dev401
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/.manifests.json

@@ -224,7 +224,7 @@
     "module": ".py.findimports",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/findimports.py",
-    "line": 89,
+    "line": 136,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/findimports",
@@ -236,7 +236,7 @@
     "module": ".py.scripts.execstat",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/execstat.py",
-    "line": 82,
+    "line": 84,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/execstat",
@@ -248,7 +248,7 @@
     "module": ".py.scripts.importtrace",
     "attr": "_CLI_MODULE",
     "file": "omdev/py/scripts/importtrace.py",
-    "line": 490,
+    "line": 491,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "py/importtrace",

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/ci/utils.py

@@ -7,7 +7,7 @@ import typing as ta
 
 
 def read_yaml_file(yaml_file: str) -> ta.Any:
-    yaml = __import__('yaml')
+    import yaml  # noqa
 
     with open(yaml_file) as f:
         return yaml.safe_load(f)

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/cli/main.py

@@ -13,7 +13,8 @@ import typing as ta
 
 from omlish import check
 from omlish.lite.cached import cached_nullary
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
+from omlish.manifests.loading import ManifestLoader
 
 from .types import CliCmd
 from .types import CliFunc
@@ -183,16 +184,18 @@ def _build_arg_parser() -> argparse.ArgumentParser:
 
 
 def _build_cmd_set(args: ta.Any) -> CliCmdSet:
-    ldr = MANIFEST_LOADER.from_entry_point(
-        globals(),
-        cls_instantiator=MANIFEST_LOADER.instantiate_cls,
+    ldr = ManifestLoader(
+        **ManifestLoader.kwargs_from_entry_point(
+            globals(),
+            **GlobalManifestLoader.default_kwargs(),
+        ),
     )
 
     #
 
-    pkgs = ldr.scan_or_discover_pkgs(
-        specified_roots=args.cli_pkg_root,
-        fallback_root=os.getcwd(),
+    pkgs = ldr.scan_or_discover_packages(
+        specified_root_dirs=args.cli_pkg_root,
+        fallback_root_dir=os.getcwd(),
     )
 
     #
@@ -200,7 +203,7 @@ def _build_cmd_set(args: ta.Any) -> CliCmdSet:
     lst: list[CliCmd] = []
 
     for m in ldr.load(*pkgs, only=[CliModule]):
-        lst.append(check.isinstance(m.value, CliModule))
+        lst.append(check.isinstance(m.value(), CliModule))
 
     lst.extend(_CLI_FUNCS)
 

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/dataclasses/codegen.py

@@ -7,6 +7,7 @@ TODO:
  - !! manifests for dataclass config?
   - more sparse / diffuse intent, not package-level
 """
+import importlib
 import logging
 import os.path
 import typing as ta
@@ -46,7 +47,6 @@ class DataclassCodeGen:
         sub_pkgs = sorted(lang.yield_importable(
             pkg_root,
             recursive=True,
-            include_special=True,
         ))
 
         for sub_pkg in sub_pkgs:
@@ -62,7 +62,7 @@ class DataclassCodeGen:
             with processing_options_context(CodegenProcessingOption(callback)):
                 print(f'{sub_pkg=}')
                 try:
-                    __import__(sub_pkg)
+                    importlib.import_module(sub_pkg)
                 except ImportError as e:
                     print(repr(e))
 

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/manifests/building.py

@@ -9,6 +9,10 @@ TODO:
  - is this lite? or not?
  - can this run externally? or not? what does it have to import?
   - has to import manifest classes, but not modules with manifest magics
+ - !! can make lite / amalg / embeddable with 'manifest base class markers':
+  - rather than issubclass(cls, ModAttrManifest), can do if cls.__omlish_manifest_class__ == 'mod_attr'
+   - reject unknowns
+   - can analyze statically
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -37,7 +41,7 @@ from omlish.lite.imports import import_attr
 from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import log
 from omlish.manifests.base import ModAttrManifest
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 from omlish.manifests.types import Manifest
 from omlish.manifests.types import ManifestOrigin
 
@@ -427,5 +431,5 @@ def check_package_manifests(
         [(key, value_dct)] = manifest.value.items()
         if key.startswith('$.'):
             key = f'${name}{key[1:]}'
-        cls = MANIFEST_LOADER.load_cls(key)
-        value = MANIFEST_LOADER.instantiate_cls(cls, **value_dct)  # noqa
+        cls = GlobalManifestLoader.instance()._load_class(key)  # noqa
+        value = GlobalManifestLoader.instance()._instantiate_value(cls, **value_dct)  # noqa

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/oci/tars.py

@@ -92,10 +92,12 @@ class OciDataTarWriter(ExitStacked):
             )
 
         elif self._compression is OciCompression.ZSTD:
-            zc = __import__('zstandard').ZstdCompressor(
+            import zstandard  # noqa
+
+            zc = zstandard.ZstdCompressor(
                 level=self._zstd_level,
             )
-            self._cf = self._enter_context(zc.stream_writer(self._cw))
+            self._cf = self._enter_context(zc.stream_writer(self._cw))  # type: ignore
 
         elif self._compression is None:
             self._cf = self._cw  # type: ignore

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/precheck/manifests.py

@@ -1,7 +1,7 @@
 import dataclasses as dc
 import typing as ta
 
-from omlish.manifests.globals import MANIFEST_LOADER
+from omlish.manifests.globals import GlobalManifestLoader
 
 from .base import Precheck
 from .base import PrecheckContext
@@ -23,6 +23,6 @@ class ManifestsPrecheck(Precheck['ManifestsPrecheck.Config']):
     async def run(self) -> ta.AsyncGenerator[Precheck.Violation]:
         for src_root in sorted(self._context.src_roots):
             try:
-                MANIFEST_LOADER.load(src_root)
+                GlobalManifestLoader.load(src_root)
             except Exception as e:  # noqa
                 yield Precheck.Violation(self, f'Error loading manifest for {src_root}: {e!r}')

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/precheck/scripts.py

@@ -41,7 +41,19 @@ class ScriptDepsPrecheck(Precheck['ScriptDepsPrecheck.Config']):
             if not src.startswith('#!/usr/bin/env python3\n'):
                 yield Precheck.Violation(self, f'script {fp} lacks correct shebang')
 
-            imps = findimports.find_imports(fp)
-            deps = findimports.get_import_deps(imps)
+            deps: set[str] = set()
+
+            imp_finder = findimports.ImportFinder()
+            for imp in imp_finder.yield_file_imports(fp):
+                # FIXME: lame
+                if imp.line and 'noqa' in [p.strip() for p in imp.line.split('#')]:
+                    continue
+
+                if (imp_tgts := imp_finder.get_import_node_targets(imp.node)) is None:
+                    continue
+
+                imp_deps = imp_finder.get_import_deps(imp_tgts)
+                deps.update(imp_deps)
+
             if deps:
                 yield Precheck.Violation(self, f'script {fp} has deps: {deps}')

omdev-0.0.0.dev401/omdev/py/findimports.py

@@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+# @omlish-script
+"""
+Note: Not lite as supporting old ast grammars is annoying and a non-goal.
+
+TODO:
+ - !! FIX: from omlish import lang - try lang as a subpackage
+ - multiple commands:
+  - dumb cmp (a = set(sys.modules); import ...; print(set(sys.modules) - a)
+ - graphviz
+"""
+import ast
+import dataclasses as dc
+import importlib.machinery
+import importlib.util
+import os.path
+import sys
+import typing as ta
+
+
+##
+
+
+class ImportFinder:
+    def __init__(
+            self,
+            *,
+            builtin_module_names: ta.AbstractSet[str] | None = None,
+    ) -> None:
+        super().__init__()
+
+        if builtin_module_names is None:
+            builtin_module_names = self.DEFAULT_BUILTIN_MODULE_NAMES
+        self._builtin_module_names = builtin_module_names
+
+        self._whichmod_cache: dict[str, ta.Any] = {}
+
+    #
+
+    @dc.dataclass(frozen=True)
+    class Import:
+        fp: str
+        node: ast.AST
+        line: str | None
+
+    def yield_file_imports(self, fp: str) -> ta.Iterator[Import]:
+        # if not os.path.isfile(os.path.join(os.path.dirname(fp), '__init__.py')):
+        #     return
+
+        with open(fp) as f:
+            buf = f.read()
+
+        lines = buf.splitlines(keepends=True)
+
+        for node in ast.walk(ast.parse(buf)):
+            if isinstance(node, (ast.Import, ast.ImportFrom)):
+                yield ImportFinder.Import(
+                    fp,
+                    node,
+                    lines[node.lineno - 1] if node.lineno is not None else None,
+                )
+
+    def yield_imports(self, *rootps: str) -> ta.Iterator[Import]:
+        for rootp in rootps:
+            if os.path.isfile(rootp):
+                if rootp.endswith('.py'):
+                    yield from self.yield_file_imports(os.path.join(os.path.dirname(rootp), os.path.basename(rootp)))
+
+            else:
+                for dp, dns, fns in os.walk(os.path.expanduser(rootp)):  # noqa
+                    for fn in fns:
+                        if fn.endswith('.py'):
+                            yield from self.yield_file_imports(os.path.join(dp, fn))
+
+    #
+
+    def get_import_node_targets(self, node: ast.AST) -> set[str] | None:
+        if isinstance(node, ast.Import):
+            return {na.name for na in node.names}
+
+        elif isinstance(node, ast.ImportFrom):
+            return {node.module} if node.module and not node.level else set()
+
+        else:
+            return None
+
+    def find_import_targets(self, *rootps: str) -> set[str]:
+        ret: set[str] = set()
+        for imp in self.yield_imports(*rootps):
+            if (imp_tgts := self.get_import_node_targets(imp.node)):
+                ret.update(imp_tgts)
+        return ret
+
+    #
+
+    DEFAULT_BUILTIN_MODULE_NAMES: ta.ClassVar[ta.AbstractSet[str]] = frozenset([
+        *sys.builtin_module_names,
+        *sys.stdlib_module_names,
+    ])
+
+    def _whichmod(self, i: str) -> ta.Literal['bad', 'builtin', 'dep']:
+        try:
+            l = importlib.util.find_spec(i)
+        except (ImportError, ValueError):
+            return 'bad'
+
+        if not isinstance(l, importlib.machinery.ModuleSpec) or not l.origin:
+            return 'bad'
+
+        # if l.origin.startswith(sys.base_prefix) or l.origin == 'frozen':
+        #     return 'builtin'
+
+        if i in self._builtin_module_names:
+            return 'builtin'
+
+        return 'dep'
+
+    def whichmod(self, i: str) -> ta.Literal['bad', 'builtin', 'dep']:
+        try:
+            return self._whichmod_cache[i]
+        except KeyError:
+            pass
+
+        ret = self._whichmod(i)
+        self._whichmod_cache[i] = ret
+        return ret
+
+    def get_import_deps(self, imps: set[str]) -> set[str]:
+        eimps = {n for n in imps for n in [n.split('.')[0]] if n not in sys.builtin_module_names}
+        return {i for i in eimps if self.whichmod(i) != 'builtin'}
+
+
+##
+
+
+# @omlish-manifest
+_CLI_MODULE = {'$omdev.cli.types.CliModule': {
+    'cmd_name': 'py/findimports',
+    'mod_name': __name__,
+}}
+
+
+if __name__ == '__main__':
+    def _main() -> None:
+        imp_finder = ImportFinder()
+        imps = imp_finder.find_import_targets(*sys.argv[1:])
+        deps = imp_finder.get_import_deps(imps)
+        print(chr(10).join(sorted(deps)))
+
+    _main()

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/py/scripts/execstat.py

@@ -36,8 +36,10 @@ def _run(
 
     #
 
+    ns: dict = {}
+
     if setup:
-        exec(setup)
+        exec(setup, globals(), ns)
 
     code = compile(src, '', 'exec')
 
@@ -54,7 +56,7 @@ def _run(
 
     #
 
-    exec(code)
+    exec(code, globals(), ns)
 
     #
 

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/py/scripts/importtrace.py

@@ -3,6 +3,7 @@
 # ruff: noqa: UP006 UP007 UP045
 """
 TODO:
+ - !! amalg !!
  - hoist first stacktrace file to a full field
  - no psutil on lin / togglable on mac
  - create table paths(path varchar(1024); - norm, dedupe, index, etc (bonus points for 32bit key)

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/scripts/ci.py

@@ -237,7 +237,7 @@ class ShellCmd:
 
 
 def read_yaml_file(yaml_file: str) -> ta.Any:
-    yaml = __import__('yaml')
+    import yaml  # noqa
 
     with open(yaml_file) as f:
         return yaml.safe_load(f)
@@ -7793,10 +7793,12 @@ class OciDataTarWriter(ExitStacked):
             )
 
         elif self._compression is OciCompression.ZSTD:
-            zc = __import__('zstandard').ZstdCompressor(
+            import zstandard  # noqa
+
+            zc = zstandard.ZstdCompressor(
                 level=self._zstd_level,
             )
-            self._cf = self._enter_context(zc.stream_writer(self._cw))
+            self._cf = self._enter_context(zc.stream_writer(self._cw))  # type: ignore
 
         elif self._compression is None:
             self._cf = self._cw  # type: ignore

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev/tools/git/messages.py

@@ -54,10 +54,10 @@ class StaticGitMessageGeneratorManifest(StaticModAttrManifest, GitMessageGenerat
 
 @cached.function
 def load_message_generator_manifests() -> ta.Sequence[GitMessageGeneratorManifest]:
-    ldr = manifest_globals.MANIFEST_LOADER
-    pkgs = ldr.scan_or_discover_pkgs(fallback_root=os.getcwd())
+    ldr = manifest_globals.GlobalManifestLoader.instance()
+    pkgs = ldr.scan_or_discover_packages(fallback_root_dir=os.getcwd())
     mfs = ldr.load(*pkgs, only=[GitMessageGeneratorManifest])
-    return [mf.value for mf in mfs]
+    return [mf.value() for mf in mfs]
 
 
 @cached.function

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev399
+Version: 0.0.0.dev401
 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.dev399
+Requires-Dist: omlish==0.0.0.dev401
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev399 → omdev-0.0.0.dev401}/pyproject.toml

@@ -13,7 +13,7 @@ urls = {source = 'https://github.com/wrmsr/omlish'}
 license = 'BSD-3-Clause'
 readme = 'README.md'
 requires-python = '>=3.13'
-version = '0.0.0.dev399'
+version = '0.0.0.dev401'
 classifiers = [
     'Development Status :: 2 - Pre-Alpha',
     'Intended Audience :: Developers',
@@ -24,7 +24,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev399',
+    'omlish == 0.0.0.dev401',
 ]
 
 [project.optional-dependencies]

omdev-0.0.0.dev399/omdev/py/findimports.py

@@ -1,102 +0,0 @@
-#!/usr/bin/env python3
-# @omlish-script
-"""
-TODO:
- - !! FIX: from omlish import lang - try lang as a subpackage
- - multiple commands:
-  - dumb cmp (a = set(sys.modules); import ...; print(set(sys.modules) - a)
- - graphviz
-"""
-import ast
-import importlib.machinery
-import importlib.util
-import os.path
-import sys
-import typing as ta
-
-
-##
-
-
-_BUILTIN_MODULE_NAMES = frozenset([*sys.builtin_module_names, *sys.stdlib_module_names])
-
-
-def whichmod(i: str) -> ta.Literal['bad', 'builtin', 'dep']:
-    try:
-        l = importlib.util.find_spec(i)
-    except (ImportError, ValueError):
-        return 'bad'
-
-    if not isinstance(l, importlib.machinery.ModuleSpec) or not l.origin:
-        return 'bad'
-
-    # if l.origin.startswith(sys.base_prefix) or l.origin == 'frozen':
-    #     return 'builtin'
-
-    if i in _BUILTIN_MODULE_NAMES:
-        return 'builtin'
-
-    return 'dep'
-
-
-def yield_imports(fp: str) -> set[str]:
-    # if not os.path.isfile(os.path.join(os.path.dirname(fp), '__init__.py')):
-    #     return
-
-    with open(fp) as f:
-        buf = f.read()
-
-    nodes: list[ast.AST] = []
-
-    def rec(n):
-        nodes.append(n)
-        for c in ast.iter_child_nodes(n):
-            rec(c)
-
-    rec(ast.parse(buf))
-
-    return {
-        *(na.name for i in nodes if isinstance(i, ast.Import) for na in i.names),
-        *(i.module for i in nodes if isinstance(i, ast.ImportFrom) if i.module and not i.level),
-    }
-
-
-def find_imports(*rootps: str) -> set[str]:
-    imps: set[str] = set()
-
-    for rootp in rootps:
-        if os.path.isfile(rootp):
-            if rootp.endswith('.py'):
-                imps.update(yield_imports(os.path.join(os.path.dirname(rootp), os.path.basename(rootp))))
-
-        else:
-            for dp, dns, fns in os.walk(os.path.expanduser(rootp)):  # noqa
-                for fn in fns:
-                    if fn.endswith('.py'):
-                        imps.update(yield_imports(os.path.join(dp, fn)))
-
-    return imps
-
-
-def get_import_deps(imps: set[str]) -> set[str]:
-    eimps = {n for n in imps for n in [n.split('.')[0]] if n not in sys.builtin_module_names}
-    return {i for i in eimps if whichmod(i) != 'builtin'}
-
-
-##
-
-
-# @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/findimports',
-    'mod_name': __name__,
-}}
-
-
-if __name__ == '__main__':
-    def _main() -> None:
-        imps = find_imports(*sys.argv[1:])
-        deps = get_import_deps(imps)
-        print(chr(10).join(sorted(deps)))
-
-    _main()