omdev 0.0.0.dev31__py3-none-any.whl → 0.0.0.dev32__py3-none-any.whl

omdev/manifests/load.py

@@ -0,0 +1,149 @@
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+import importlib.machinery
+import importlib.metadata
+import importlib.resources
+import json
+import typing as ta
+
+from .types import Manifest
+
+
+##
+
+
+class ManifestLoader:
+    def __init__(
+            self,
+            *,
+            module_remap: ta.Optional[ta.Mapping[str, str]] = None,
+    ) -> None:
+        super().__init__()
+
+        self._module_remap = module_remap or {}
+        self._module_reverse_remap = {v: k for k, v in self._module_remap.items()}
+
+        self._cls_cache: ta.Dict[str, type] = {}
+        self._raw_cache: ta.Dict[str, ta.Optional[ta.Sequence[Manifest]]] = {}
+
+    @classmethod
+    def from_entry_point(
+            cls,
+            globals: ta.Mapping[str, ta.Any],  # noqa
+            *,
+            module_remap: ta.Optional[ta.Mapping[str, str]] = None,
+            **kwargs: ta.Any,
+    ) -> 'ManifestLoader':
+        rm: ta.Dict[str, str] = {}
+
+        if module_remap:
+            rm.update(module_remap)
+
+        if '__name__' in globals and '__spec__' in globals:
+            name: str = globals['__name__']
+            spec: importlib.machinery.ModuleSpec = globals['__spec__']
+            if '__main__' not in rm and name == '__main__':
+                rm[spec.name] = '__main__'
+
+        return cls(module_remap=rm, **kwargs)
+
+    def load_cls(self, key: str) -> type:
+        try:
+            return self._cls_cache[key]
+        except KeyError:
+            pass
+
+        if not key.startswith('$'):
+            raise Exception(f'Bad key: {key}')
+
+        parts = key[1:].split('.')
+        pos = next(i for i, p in enumerate(parts) if p[0].isupper())
+
+        mod_name = '.'.join(parts[:pos])
+        mod_name = self._module_remap.get(mod_name, mod_name)
+        mod = importlib.import_module(mod_name)
+
+        obj: ta.Any = mod
+        for ca in parts[pos:]:
+            obj = getattr(obj, ca)
+
+        cls = obj
+        if not isinstance(cls, type):
+            raise TypeError(cls)
+
+        self._cls_cache[key] = cls
+        return cls
+
+    def load_raw(self, pkg_name: str) -> ta.Optional[ta.Sequence[Manifest]]:
+        try:
+            return self._raw_cache[pkg_name]
+        except KeyError:
+            pass
+
+        t = importlib.resources.files(pkg_name).joinpath('.manifests.json')
+        if not t.is_file():
+            self._raw_cache[pkg_name] = None
+            return None
+
+        src = t.read_text('utf-8')
+        obj = json.loads(src)
+        if not isinstance(obj, (list, tuple)):
+            raise TypeError(obj)
+
+        lst: ta.List[Manifest] = []
+        for e in obj:
+            m = Manifest(**e)
+
+            m = dc.replace(m, module=pkg_name + m.module)
+
+            [(key, value_dct)] = m.value.items()
+            if not key.startswith('$'):
+                raise Exception(f'Bad key: {key}')
+            if key.startswith('$.'):
+                key = f'${pkg_name}{key[1:]}'
+                m = dc.replace(m, value={key: value_dct})
+
+            lst.append(m)
+
+        self._raw_cache[pkg_name] = lst
+        return lst
+
+    def load(
+            self,
+            *pkg_names: str,
+            only: ta.Optional[ta.Iterable[type]] = None,
+    ) -> ta.Sequence[Manifest]:
+        only_keys: ta.Optional[ta.Set]
+        if only is not None:
+            only_keys = set()
+            for cls in only:
+                if not (isinstance(cls, type) and dc.is_dataclass(cls)):
+                    raise TypeError(cls)
+                mod_name = cls.__module__
+                mod_name = self._module_reverse_remap.get(mod_name, mod_name)
+                only_keys.add(f'${mod_name}.{cls.__qualname__}')
+        else:
+            only_keys = None
+
+        lst: ta.List[Manifest] = []
+        for pn in pkg_names:
+            for manifest in (self.load_raw(pn) or []):
+                [(key, value_dct)] = manifest.value.items()
+                if only_keys is not None and key not in only_keys:
+                    continue
+
+                cls = self.load_cls(key)
+                value = cls(**value_dct)
+
+                manifest = dc.replace(manifest, value=value)
+                lst.append(manifest)
+
+        return lst
+
+    ENTRY_POINT_GROUP = 'omlish.manifests'
+
+    def discover(self) -> ta.Sequence[str]:
+        return [
+            ep.value
+            for ep in importlib.metadata.entry_points(group=self.ENTRY_POINT_GROUP)
+        ]

omdev/manifests/types.py

@@ -0,0 +1,16 @@
+import dataclasses as dc
+import typing as ta
+
+
+@dc.dataclass(frozen=True)
+class ManifestOrigin:
+    module: str
+    attr: str
+
+    file: str
+    line: int
+
+
+@dc.dataclass(frozen=True)
+class Manifest(ManifestOrigin):
+    value: ta.Any

omdev/precheck/precheck.py

@@ -2,6 +2,7 @@
 Tiny pre-commit
 
 TODO:
+ - ! manifests
  - global config
  - global analyses - FilesWithShebang
  - shebang files have no relative imports
@@ -26,6 +27,7 @@ import typing as ta
 
 from omlish import logs
 
+from ..cli import CliModule
 from .base import Precheck
 from .base import PrecheckContext
 from .git import GitBlacklistPrecheck
@@ -85,6 +87,10 @@ def _build_parser() -> argparse.ArgumentParser:
     return parser
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('precheck', __name__)
+
+
 def _main(argv: ta.Sequence[str] | None = None) -> None:
     logs.configure_standard_logging('INFO')
 

omdev/pyproject/__main__.py

@@ -1,3 +1,10 @@
+from ..cli import CliModule
+
+
+# @omlish-manifest
+_CLI_MODULE = CliModule('pyproject', __name__)
+
+
 if __name__ == '__main__':
     from .cli import _main
 

omdev/pyproject/cli.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# @omdev-amalg ../scripts/pyproject.py
+# @omlish-amalg ../scripts/pyproject.py
 # ruff: noqa: UP006 UP007
 """
 TODO:

omdev/pyproject/pkg.py

@@ -295,7 +295,13 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 **extras,
             }
 
-        #
+        if (eps := prj.pop('entry_points', None)):
+            pyp_dct['project.entry-points'] = {TomlWriter.Literal(f"'{k}'"): v for k, v in eps.items()}  # type: ignore  # noqa
+
+        if (scs := prj.pop('scripts', None)):
+            pyp_dct['project.scripts'] = scs
+
+        ##
 
         st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
@@ -420,7 +426,12 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
         prj = specs.pyproject
         prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
         prj['name'] += self._pkg_suffix
-        prj.pop('optional_dependencies', None)
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+        ]:
+            prj.pop(k, None)
 
         pyp_dct['project'] = prj
 

omdev/pyproject/reqs.py

@@ -22,7 +22,7 @@ class RequirementsRewriter:
     def _tmp_dir(self) -> str:
         return tempfile.mkdtemp('-omlish-reqs')
 
-    VENV_MAGIC = '# @omdev-venv'
+    VENV_MAGIC = '# @omlish-venv'
 
     def rewrite_file(self, in_file: str) -> str:
         with open(in_file) as f:

omdev/scripts/interp.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omdev-amalg-output ../interp/cli.py
+# @omlish-amalg-output ../interp/cli.py
 # ruff: noqa: N802 UP006 UP007 UP036
 """
 TODO:
@@ -1796,16 +1796,14 @@ class RunningInterpProvider(InterpProvider):
 """
 TODO:
  - custom tags
+  - 'aliases'
+  - https://github.com/pyenv/pyenv/pull/2966
+  - https://github.com/pyenv/pyenv/issues/218 (lol)
+  - probably need custom (temp?) definition file
+  - *or* python-build directly just into the versions dir?
  - optionally install / upgrade pyenv itself
  - new vers dont need these custom mac opts, only run on old vers
-
-TODO opts:
- - --enable-loadable-sqlite-extensions LDFLAGS="-L/opt/homebrew/opt/sqlite/lib" CPPFLAGS="-I/opt/homebrew/opt/sqlite/include"
- - --enable-shared
- - --enable-optimizations
- - --enable-profiling ?
- - --enable-ipv6 ?
-"""  # noqa
+"""
 
 
 ##
@@ -1899,8 +1897,33 @@ class PyenvInstallOpts:
         )
 
 
-DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-s', '-v'])
+# TODO: https://github.com/pyenv/pyenv/blob/master/plugins/python-build/README.md#building-for-maximum-performance
+DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
+    opts=[
+        '-s',
+        '-v',
+        '-k',
+    ],
+    conf_opts=[
+        '--enable-loadable-sqlite-extensions',
+
+        # '--enable-shared',
+
+        '--enable-optimizations',
+        '--with-lto',
+
+        # '--enable-profiling', # ?
+
+        # '--enable-ipv6', # ?
+    ],
+    cflags=[
+        # '-march=native',
+        # '-mtune=native',
+    ],
+)
+
 DEBUG_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-g'])
+
 THREADED_PYENV_INSTALL_OPTS = PyenvInstallOpts(conf_opts=['--disable-gil'])
 
 
@@ -1999,6 +2022,7 @@ class PyenvVersionInstaller:
             opts: ta.Optional[PyenvInstallOpts] = None,
             interp_opts: InterpOpts = InterpOpts(),
             *,
+            install_name: ta.Optional[str] = None,
             no_default_opts: bool = False,
             pyenv: Pyenv = Pyenv(),
     ) -> None:
@@ -2019,6 +2043,7 @@ class PyenvVersionInstaller:
         self._version = version
         self._opts = opts
         self._interp_opts = interp_opts
+        self._given_install_name = install_name
 
         self._no_default_opts = no_default_opts
         self._pyenv = pyenv
@@ -2033,6 +2058,8 @@ class PyenvVersionInstaller:
 
     @cached_nullary
     def install_name(self) -> str:
+        if self._given_install_name is not None:
+            return self._given_install_name
         return self._version + ('-debug' if self._interp_opts.debug else '')
 
     @cached_nullary
@@ -2052,11 +2079,26 @@ class PyenvVersionInstaller:
                 v += ' ' + os.environ[k]
             env[k] = v
 
-        subprocess_check_call(
-            self._pyenv.exe(),
-            'install',
+        conf_args = [
             *self._opts.opts,
             self._version,
+        ]
+
+        if self._given_install_name is not None:
+            full_args = [
+                os.path.join(check_not_none(self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),
+                *conf_args,
+                self.install_dir(),
+            ]
+        else:
+            full_args = [
+                self._pyenv.exe(),
+                'install',
+                *conf_args,
+            ]
+
+        subprocess_check_call(
+            *full_args,
             env=env,
         )
 
@@ -2414,9 +2456,13 @@ def _list_cmd(args) -> None:
 
 
 def _resolve_cmd(args) -> None:
-    r = DEFAULT_INTERP_RESOLVER
+    if args.provider:
+        p = INTERP_PROVIDER_TYPES_BY_NAME[args.provider]()
+        r = InterpResolver([(p.name, p)])
+    else:
+        r = DEFAULT_INTERP_RESOLVER
     s = InterpSpecifier.parse(args.version)
-    print(check_not_none(r.resolve(s)).exe)
+    print(check_not_none(r.resolve(s, install=bool(args.install))).exe)
 
 
 def _build_parser() -> argparse.ArgumentParser:
@@ -2426,12 +2472,14 @@ def _build_parser() -> argparse.ArgumentParser:
 
     parser_list = subparsers.add_parser('list')
     parser_list.add_argument('version')
-    parser_list.add_argument('--debug', action='store_true')
+    parser_list.add_argument('-d', '--debug', action='store_true')
     parser_list.set_defaults(func=_list_cmd)
 
     parser_resolve = subparsers.add_parser('resolve')
     parser_resolve.add_argument('version')
-    parser_resolve.add_argument('--debug', action='store_true')
+    parser_resolve.add_argument('-p', '--provider')
+    parser_resolve.add_argument('-d', '--debug', action='store_true')
+    parser_resolve.add_argument('-i', '--install', action='store_true')
     parser_resolve.set_defaults(func=_resolve_cmd)
 
     return parser

omdev/scripts/pyproject.py

@@ -2,7 +2,7 @@
 # noinspection DuplicatedCode
 # @omlish-lite
 # @omlish-script
-# @omdev-amalg-output ../pyproject/cli.py
+# @omlish-amalg-output ../pyproject/cli.py
 # ruff: noqa: N802 TCH003 UP006 UP007 UP036
 """
 TODO:
@@ -104,7 +104,7 @@ CallableVersionOperator = ta.Callable[['Version', str], bool]
 
 
 class CextMagic:
-    MAGIC = '@omdev-cext'
+    MAGIC = '@omlish-cext'
     MAGIC_COMMENT = f'// {MAGIC}'
 
     FILE_EXTENSIONS = ('c', 'cc', 'cpp')
@@ -1089,6 +1089,10 @@ def toml_make_safe_parse_float(parse_float: TomlParseFloat) -> TomlParseFloat:
 
 
 class TomlWriter:
+    @dc.dataclass(frozen=True)
+    class Literal:
+        s: str
+
     def __init__(self, out: ta.TextIO) -> None:
         super().__init__()
         self._out = out
@@ -1170,7 +1174,9 @@ class TomlWriter:
         self._w(']')
 
     def write_key(self, obj: ta.Any) -> None:
-        if isinstance(obj, str):
+        if isinstance(obj, TomlWriter.Literal):
+            self._w(obj.s)
+        elif isinstance(obj, str):
             self._w(self._maybe_quote(obj.replace('_', '-')))
         elif isinstance(obj, int):
             self._w(repr(str(obj)))
@@ -2022,7 +2028,7 @@ class RequirementsRewriter:
     def _tmp_dir(self) -> str:
         return tempfile.mkdtemp('-omlish-reqs')
 
-    VENV_MAGIC = '# @omdev-venv'
+    VENV_MAGIC = '# @omlish-venv'
 
     def rewrite_file(self, in_file: str) -> str:
         with open(in_file) as f:
@@ -3977,7 +3983,13 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
                 **extras,
             }
 
-        #
+        if (eps := prj.pop('entry_points', None)):
+            pyp_dct['project.entry-points'] = {TomlWriter.Literal(f"'{k}'"): v for k, v in eps.items()}  # type: ignore  # noqa
+
+        if (scs := prj.pop('scripts', None)):
+            pyp_dct['project.scripts'] = scs
+
+        ##
 
         st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
@@ -4102,7 +4114,12 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
         prj = specs.pyproject
         prj['dependencies'] = [f'{prj["name"]} == {prj["version"]}']
         prj['name'] += self._pkg_suffix
-        prj.pop('optional_dependencies', None)
+        for k in [
+            'optional_dependencies',
+            'entry_points',
+            'scripts',
+        ]:
+            prj.pop(k, None)
 
         pyp_dct['project'] = prj
 
@@ -4233,16 +4250,14 @@ class RunningInterpProvider(InterpProvider):
 """
 TODO:
  - custom tags
+  - 'aliases'
+  - https://github.com/pyenv/pyenv/pull/2966
+  - https://github.com/pyenv/pyenv/issues/218 (lol)
+  - probably need custom (temp?) definition file
+  - *or* python-build directly just into the versions dir?
  - optionally install / upgrade pyenv itself
  - new vers dont need these custom mac opts, only run on old vers
-
-TODO opts:
- - --enable-loadable-sqlite-extensions LDFLAGS="-L/opt/homebrew/opt/sqlite/lib" CPPFLAGS="-I/opt/homebrew/opt/sqlite/include"
- - --enable-shared
- - --enable-optimizations
- - --enable-profiling ?
- - --enable-ipv6 ?
-"""  # noqa
+"""
 
 
 ##
@@ -4336,8 +4351,33 @@ class PyenvInstallOpts:
         )
 
 
-DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-s', '-v'])
+# TODO: https://github.com/pyenv/pyenv/blob/master/plugins/python-build/README.md#building-for-maximum-performance
+DEFAULT_PYENV_INSTALL_OPTS = PyenvInstallOpts(
+    opts=[
+        '-s',
+        '-v',
+        '-k',
+    ],
+    conf_opts=[
+        '--enable-loadable-sqlite-extensions',
+
+        # '--enable-shared',
+
+        '--enable-optimizations',
+        '--with-lto',
+
+        # '--enable-profiling', # ?
+
+        # '--enable-ipv6', # ?
+    ],
+    cflags=[
+        # '-march=native',
+        # '-mtune=native',
+    ],
+)
+
 DEBUG_PYENV_INSTALL_OPTS = PyenvInstallOpts(opts=['-g'])
+
 THREADED_PYENV_INSTALL_OPTS = PyenvInstallOpts(conf_opts=['--disable-gil'])
 
 
@@ -4436,6 +4476,7 @@ class PyenvVersionInstaller:
             opts: ta.Optional[PyenvInstallOpts] = None,
             interp_opts: InterpOpts = InterpOpts(),
             *,
+            install_name: ta.Optional[str] = None,
             no_default_opts: bool = False,
             pyenv: Pyenv = Pyenv(),
     ) -> None:
@@ -4456,6 +4497,7 @@ class PyenvVersionInstaller:
         self._version = version
         self._opts = opts
         self._interp_opts = interp_opts
+        self._given_install_name = install_name
 
         self._no_default_opts = no_default_opts
         self._pyenv = pyenv
@@ -4470,6 +4512,8 @@ class PyenvVersionInstaller:
 
     @cached_nullary
     def install_name(self) -> str:
+        if self._given_install_name is not None:
+            return self._given_install_name
         return self._version + ('-debug' if self._interp_opts.debug else '')
 
     @cached_nullary
@@ -4489,11 +4533,26 @@ class PyenvVersionInstaller:
                 v += ' ' + os.environ[k]
             env[k] = v
 
-        subprocess_check_call(
-            self._pyenv.exe(),
-            'install',
+        conf_args = [
             *self._opts.opts,
             self._version,
+        ]
+
+        if self._given_install_name is not None:
+            full_args = [
+                os.path.join(check_not_none(self._pyenv.root()), 'plugins', 'python-build', 'bin', 'python-build'),
+                *conf_args,
+                self.install_dir(),
+            ]
+        else:
+            full_args = [
+                self._pyenv.exe(),
+                'install',
+                *conf_args,
+            ]
+
+        subprocess_check_call(
+            *full_args,
             env=env,
         )
 

omdev/toml/writer.py

@@ -1,8 +1,13 @@
+import dataclasses as dc
 import string
 import typing as ta
 
 
 class TomlWriter:
+    @dc.dataclass(frozen=True)
+    class Literal:
+        s: str
+
     def __init__(self, out: ta.TextIO) -> None:
         super().__init__()
         self._out = out
@@ -84,7 +89,9 @@ class TomlWriter:
         self._w(']')
 
     def write_key(self, obj: ta.Any) -> None:
-        if isinstance(obj, str):
+        if isinstance(obj, TomlWriter.Literal):
+            self._w(obj.s)
+        elif isinstance(obj, str):
             self._w(self._maybe_quote(obj.replace('_', '-')))
         elif isinstance(obj, int):
             self._w(repr(str(obj)))

omdev/tools/dockertools.py

@@ -14,6 +14,8 @@ from omlish import lang
 from omlish import logs
 from omlish.formats import yaml
 
+from ..cli import CliModule
+
 
 @lang.cached_function
 def docker_exe() -> str:
@@ -178,6 +180,10 @@ class Cli(ap.Cli):
                 f.write(new_src)
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('docker', __name__)
+
+
 if __name__ == '__main__':
     logs.configure_standard_logging('INFO')
     Cli()()

omdev/tools/gittools.py

@@ -3,6 +3,8 @@ import subprocess
 from omlish import argparse as ap
 from omlish import logs
 
+from ..cli import CliModule
+
 
 class Cli(ap.Cli):
     @ap.command()
@@ -17,6 +19,10 @@ class Cli(ap.Cli):
         )
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('git', __name__)
+
+
 if __name__ == '__main__':
     logs.configure_standard_logging('INFO')
     Cli()()

omdev/tools/piptools.py

@@ -5,6 +5,8 @@ import xml.etree.ElementTree as ET  # noqa
 from omlish import argparse as ap
 from omlish import check
 
+from ..cli import CliModule
+
 
 PYPI_URL = 'https://pypi.org/'
 
@@ -46,5 +48,9 @@ class Cli(ap.Cli):
                 f.write(new_src)
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('pip', __name__)
+
+
 if __name__ == '__main__':
     Cli()()

omdev/tools/sqlrepl.py

@@ -13,6 +13,8 @@ from omlish import check
 from omlish import lang
 from omlish import logs
 
+from ..cli import CliModule
+
 
 @dc.dataclass(frozen=True)
 class ServerSpec:
@@ -188,6 +190,10 @@ class Cli(ap.Cli):
             raise Exception(f'unhandled dialect: {dialect=}')
 
 
+# @omlish-manifest
+_CLI_MODULE = CliModule('sqlrepl', __name__)
+
+
 if __name__ == '__main__':
     logs.configure_standard_logging('INFO')
     Cli()()