omdev 0.0.0.dev405__py3-none-any.whl → 0.0.0.dev407__py3-none-any.whl

omdev/cli/main.py

@@ -61,20 +61,20 @@ class CliCmdSet:
     def _make_entry(self, cmd: CliCmd) -> Entry:
         help_path: StrTuple | None
 
-        if isinstance(cmd.cmd_name, str):
-            ns = [cmd.cmd_name]
+        if isinstance(cmd.name, str):
+            ns = [cmd.name]
         else:
-            ns = list(cmd.cmd_name)
+            ns = list(cmd.name)
         exec_paths = [tuple(n.split('/')) for n in ns]
 
-        if isinstance(cmd.cmd_name, str) and cmd.cmd_name[0] == '_':
+        if isinstance(cmd.name, str) and cmd.name[0] == '_':
             help_path = None
 
         elif isinstance(cmd, CliFunc):
             help_path = ('-', *exec_paths[0])
 
         elif isinstance(cmd, CliModule):
-            help_path = (cmd.mod_name.partition('.')[0], *exec_paths[0])
+            help_path = (cmd.module.partition('.')[0], *exec_paths[0])
 
         else:
             raise TypeError(cmd)
@@ -128,10 +128,10 @@ class CliCmdSet:
             if h in c:
                 raise NameError(e)
 
-            if isinstance(e.cmd.cmd_name, str):
-                l = [e.cmd.cmd_name]
+            if isinstance(e.cmd.name, str):
+                l = [e.cmd.name]
             else:
-                l = list(e.cmd.cmd_name)
+                l = list(e.cmd.name)
 
             s = (
                 f'{l[0].split("/")[-1]}'
@@ -256,7 +256,7 @@ def _main() -> ta.Any:
         cmd = sel.cmd
         if isinstance(cmd, CliModule):
             sys.argv = [args.cmd, *(sel.args or ())]
-            runpy._run_module_as_main(cmd.mod_name)  # type: ignore  # noqa
+            runpy._run_module_as_main(cmd.module)  # type: ignore  # noqa
             return 0
 
         elif isinstance(cmd, CliFunc):

omdev/cli/types.py

@@ -9,19 +9,19 @@ import typing as ta
 
 @dc.dataclass(frozen=True)
 class CliCmd:
-    cmd_name: ta.Union[str, ta.Sequence[str]]
+    name: ta.Union[str, ta.Sequence[str]]
 
     @property
     def primary_name(self) -> str:
-        if isinstance(self.cmd_name, str):
-            return self.cmd_name
+        if isinstance(self.name, str):
+            return self.name
         else:
-            return self.cmd_name[0]
+            return self.name[0]
 
 
 @dc.dataclass(frozen=True)
 class CliModule(CliCmd):
-    mod_name: str
+    module: str
 
 
 @dc.dataclass(frozen=True)

omdev/dataclasses/codegen.py

@@ -91,5 +91,5 @@ class DataclassCodeGen:
 
         config_trie = self.build_config_trie(root_dirs)
 
-        for pkg_parts, pkg_config in config_trie.iter_items(sort_children=True):
+        for pkg_parts, pkg_config in config_trie.iteritems(sort_children=True):
             self.run_package_config('.'.join(pkg_parts), pkg_config)

omdev/interp/providers/base.py

@@ -24,6 +24,7 @@ class InterpProvider(abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         if abc.ABC not in cls.__bases__ and 'name' not in cls.__dict__:
             sfx = 'InterpProvider'
             if not cls.__name__.endswith(sfx):

omdev/manifests/_dumping.py

@@ -60,6 +60,7 @@ CheckArgsRenderer = ta.Callable[..., ta.Optional[str]]  # ta.TypeAlias
 class _AbstractCachedNullary:
     def __init__(self, fn):
         super().__init__()
+
         self._fn = fn
         self._value = self._missing = object()
         functools.update_wrapper(self, fn)
@@ -1515,13 +1516,13 @@ class _ModuleManifestDumper:
             manifest_dct = self._build_manifest_dct(manifest)
 
             cls = type(manifest)
-            key = f'${cls.__module__}.{cls.__qualname__}'
+            key = f'!{cls.__module__}.{cls.__qualname__}'
 
             return {key: manifest_dct}
 
         elif isinstance(manifest, collections.abc.Mapping):
             [(key, manifest_dct)] = manifest.items()
-            if not key.startswith('$'):  # noqa
+            if not key.startswith('!'):  # noqa
                 raise Exception(f'Bad key: {key}')
 
             if not isinstance(manifest_dct, collections.abc.Mapping):
@@ -1571,7 +1572,7 @@ class _ModuleManifestDumper:
 
         manifest_dct = self._build_manifest_dct(manifest)
 
-        key = f'${cls.__module__}.{cls.__qualname__}'
+        key = f'!{cls.__module__}.{cls.__qualname__}'
         return {key: manifest_dct}
 
     #

omdev/manifests/building.py

@@ -172,6 +172,9 @@ class ManifestBuilder:
         def prepare(s: str) -> ta.Any:
             if s.startswith('$.'):
                 s = f'{fm.mod_base}.{s[2:]}'
+            elif s.startswith('.'):
+                # s = f'{fm.mod_base}.{s[2:]}'
+                raise NotImplementedError
             return magic.py_compile_magic_preparer(s)
 
         magics = magic.find_magic(
@@ -189,6 +192,9 @@ class ManifestBuilder:
                 body = m.body
                 if body.startswith('$.'):
                     body = f'{fm.mod_base}.{body[2:]}'
+                elif body.startswith('.'):
+                    # body = f'{fm.mod_base}.{body[2:]}'
+                    raise NotImplementedError
 
                 pat_match = check.not_none(_INLINE_MANIFEST_CLS_NAME_PAT.match(body))
                 cls_name = check.non_empty_str(pat_match.groupdict()['cls_name'])
@@ -214,8 +220,8 @@ class ManifestBuilder:
                 if issubclass(cls, ModAttrManifest):
                     attr_name = extract_manifest_target_name(lines, m.end_line)
                     inl_kw.update({
-                        'mod_name': fm.mod_name,
-                        'attr_name': attr_name,
+                        'module': fm.mod_name,
+                        'attr': attr_name,
                     })
 
                 origin = ManifestOrigin(
@@ -328,14 +334,14 @@ class ManifestBuilder:
             if not (
                     isinstance(value, ta.Mapping) and
                     len(value) == 1 and
-                    all(isinstance(k, str) and k.startswith('$') and len(k) > 1 for k in value)
+                    all(isinstance(k, str) and k.startswith('!') and len(k) > 1 for k in value)
             ):
-                raise TypeError(f'Manifest values must be mappings of strings starting with $: {value!r}')
+                raise TypeError(f'Manifest values must be mappings of strings starting with !: {value!r}')
 
             [(key, value_dct)] = value.items()
             kb, _, kr = key[1:].partition('.')  # noqa
             if kb == fm.mod_base:  # noqa
-                key = f'$.{kr}'
+                key = f'!.{kr}'
                 value = {key: value_dct}
 
             out.append(Manifest(**{
@@ -429,7 +435,7 @@ def check_package_manifests(
     for entry in manifests_json:
         manifest = Manifest(**entry)
         [(key, value_dct)] = manifest.value.items()
-        if key.startswith('$.'):
-            key = f'${name}{key[1:]}'
+        if key.startswith('!.'):
+            key = f'!{name}{key[1:]}'
         cls = GlobalManifestLoader.instance()._load_class(key)  # noqa
         value = GlobalManifestLoader.instance()._instantiate_value(cls, **value_dct)  # noqa

omdev/manifests/dumping.py

@@ -67,13 +67,13 @@ class _ModuleManifestDumper:
             manifest_dct = self._build_manifest_dct(manifest)
 
             cls = type(manifest)
-            key = f'${cls.__module__}.{cls.__qualname__}'
+            key = f'!{cls.__module__}.{cls.__qualname__}'
 
             return {key: manifest_dct}
 
         elif isinstance(manifest, collections.abc.Mapping):
             [(key, manifest_dct)] = manifest.items()
-            if not key.startswith('$'):  # noqa
+            if not key.startswith('!'):  # noqa
                 raise Exception(f'Bad key: {key}')
 
             if not isinstance(manifest_dct, collections.abc.Mapping):
@@ -123,7 +123,7 @@ class _ModuleManifestDumper:
 
         manifest_dct = self._build_manifest_dct(manifest)
 
-        key = f'${cls.__module__}.{cls.__qualname__}'
+        key = f'!{cls.__module__}.{cls.__qualname__}'
         return {key: manifest_dct}
 
     #

omdev/oci/media.py

@@ -40,6 +40,7 @@ class OciMediaDataclass(abc.ABC):  # noqa
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         for a in OCI_MEDIA_FIELDS:
             check.in_(a, cls.__dict__)
 

omdev/packaging/requires.py

@@ -121,6 +121,7 @@ class RequiresTokenizer:
         rules: ta.Dict[str, ta.Union[str, ta.Pattern[str]]],
     ) -> None:
         super().__init__()
+
         self.source = source
         self.rules: ta.Dict[str, ta.Pattern[str]] = {name: re.compile(pattern) for name, pattern in rules.items()}
         self.next_token: ta.Optional[RequiresToken] = None

omdev/packaging/revisions.py

@@ -31,6 +31,7 @@ class GitRevisionAdder:
             output_suffix: ta.Optional[str] = None,
     ) -> None:
         super().__init__()
+
         self._given_revision = revision
         self._output_suffix = output_suffix
 

omdev/py/attrdocs.py

@@ -158,9 +158,9 @@ def extract_attr_docs(src: str) -> ta.Mapping[str, AttrDoc]:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/attrdocs',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/attrdocs',
+    'module': __name__,
 }}
 
 

omdev/py/bracepy.py

@@ -92,9 +92,9 @@ def translate_brace_python(
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'bracepy',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'bracepy',
+    'module': __name__,
 }}
 
 

omdev/py/classdot.py

@@ -61,9 +61,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/classdot',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/classdot',
+    'module': __name__,
 }}
 
 

omdev/py/findimports.py

@@ -134,9 +134,9 @@ class ImportFinder:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/findimports',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/findimports',
+    'module': __name__,
 }}
 
 

omdev/py/scripts/execstat.py

@@ -87,9 +87,9 @@ def _run(
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/execstat',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/execstat',
+    'module': __name__,
 }}
 
 
@@ -140,7 +140,7 @@ def _main() -> None:
         if i == 0:
             run_kw.update(
                 rss=bool(args.rss),
-                modules=bool(args.modules) or bool(args.modules),
+                modules=bool(args.modules) or bool(args.modules_ordered),
             )
 
         payload = '\n'.join([

omdev/py/scripts/importtrace.py

@@ -489,9 +489,9 @@ class SqliteWriter:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/importtrace',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/importtrace',
+    'module': __name__,
 }}
 
 

omdev/py/srcheaders.py

@@ -63,9 +63,9 @@ def get_py_header_lines(src: str) -> list[PyHeaderLine]:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'py/srcheaders',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'py/srcheaders',
+    'module': __name__,
 }}
 
 

omdev/pyproject/pkg.py

@@ -57,6 +57,7 @@ class BasePyprojectPackageGenerator(abc.ABC):
             pkg_suffix: str = '',
     ) -> None:
         super().__init__()
+
         self._dir_name = dir_name
         self._pkgs_root = pkgs_root
         self._pkg_suffix = pkg_suffix

omdev/pyproject/reqs.py

@@ -20,6 +20,7 @@ class RequirementsRewriter:
             venv: ta.Optional[str] = None,
     ) -> None:
         super().__init__()
+
         self._venv = venv
 
     @cached_nullary

omdev/pyproject/venvs.py

@@ -23,6 +23,7 @@ class Venv:
             cfg: VenvConfig,
     ) -> None:
         super().__init__()
+
         self._name = name
         self._cfg = cfg
 

omdev/scripts/ci.py

@@ -489,6 +489,7 @@ class HttpProtocolVersions:
 class _AbstractCachedNullary:
     def __init__(self, fn):
         super().__init__()
+
         self._fn = fn
         self._value = self._missing = object()
         functools.update_wrapper(self, fn)
@@ -4264,6 +4265,7 @@ class ContextvarInjectorScope(InjectorScope, abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         check.not_in(abc.ABC, cls.__bases__)
         check.state(not hasattr(cls, '_cv'))
         cls._cv = contextvars.ContextVar(f'{cls.__name__}_cv')
@@ -4538,6 +4540,7 @@ class _Injector(Injector):
     class _Request:
         def __init__(self, injector: '_Injector') -> None:
             super().__init__()
+
             self._injector = injector
             self._provisions: ta.Dict[InjectorKey, Maybe] = {}
             self._seen_keys: ta.Set[InjectorKey] = set()
@@ -8959,6 +8962,7 @@ class OciMediaDataclass(abc.ABC):  # noqa
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         for a in OCI_MEDIA_FIELDS:
             check.in_(a, cls.__dict__)
 

omdev/scripts/interp.py

@@ -516,6 +516,7 @@ def canonicalize_version(
 class _AbstractCachedNullary:
     def __init__(self, fn):
         super().__init__()
+
         self._fn = fn
         self._value = self._missing = object()
         functools.update_wrapper(self, fn)
@@ -3024,6 +3025,7 @@ class ContextvarInjectorScope(InjectorScope, abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         check.not_in(abc.ABC, cls.__bases__)
         check.state(not hasattr(cls, '_cv'))
         cls._cv = contextvars.ContextVar(f'{cls.__name__}_cv')
@@ -3298,6 +3300,7 @@ class _Injector(Injector):
     class _Request:
         def __init__(self, injector: '_Injector') -> None:
             super().__init__()
+
             self._injector = injector
             self._provisions: ta.Dict[InjectorKey, Maybe] = {}
             self._seen_keys: ta.Set[InjectorKey] = set()
@@ -4227,6 +4230,7 @@ class InterpProvider(abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         if abc.ABC not in cls.__bases__ and 'name' not in cls.__dict__:
             sfx = 'InterpProvider'
             if not cls.__name__.endswith(sfx):

omdev/scripts/pyproject.py

@@ -1817,6 +1817,7 @@ class TomlWriter:
 
     def __init__(self, out: ta.TextIO) -> None:
         super().__init__()
+
         self._out = out
 
         self._indent = 0
@@ -1939,6 +1940,7 @@ class TomlWriter:
 class _AbstractCachedNullary:
     def __init__(self, fn):
         super().__init__()
+
         self._fn = fn
         self._value = self._missing = object()
         functools.update_wrapper(self, fn)
@@ -4070,6 +4072,7 @@ class RequirementsRewriter:
             venv: ta.Optional[str] = None,
     ) -> None:
         super().__init__()
+
         self._venv = venv
 
     @cached_nullary
@@ -4826,6 +4829,7 @@ class ContextvarInjectorScope(InjectorScope, abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         check.not_in(abc.ABC, cls.__bases__)
         check.state(not hasattr(cls, '_cv'))
         cls._cv = contextvars.ContextVar(f'{cls.__name__}_cv')
@@ -5100,6 +5104,7 @@ class _Injector(Injector):
     class _Request:
         def __init__(self, injector: '_Injector') -> None:
             super().__init__()
+
             self._injector = injector
             self._provisions: ta.Dict[InjectorKey, Maybe] = {}
             self._seen_keys: ta.Set[InjectorKey] = set()
@@ -6687,6 +6692,7 @@ class InterpProvider(abc.ABC):
 
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
+
         if abc.ABC not in cls.__bases__ and 'name' not in cls.__dict__:
             sfx = 'InterpProvider'
             if not cls.__name__.endswith(sfx):
@@ -7771,6 +7777,7 @@ class GitRevisionAdder:
             output_suffix: ta.Optional[str] = None,
     ) -> None:
         super().__init__()
+
         self._given_revision = revision
         self._output_suffix = output_suffix
 
@@ -8361,6 +8368,7 @@ class BasePyprojectPackageGenerator(abc.ABC):
             pkg_suffix: str = '',
     ) -> None:
         super().__init__()
+
         self._dir_name = dir_name
         self._pkgs_root = pkgs_root
         self._pkg_suffix = pkg_suffix
@@ -9342,6 +9350,7 @@ class Venv:
             cfg: VenvConfig,
     ) -> None:
         super().__init__()
+
         self._name = name
         self._cfg = cfg
 

omdev/scripts/slowcat.py

@@ -115,9 +115,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'slowcat',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'slowcat',
+    'module': __name__,
 }}
 
 

omdev/scripts/tmpexec.py

@@ -48,9 +48,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': 'tmpexec',
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': 'tmpexec',
+    'module': __name__,
 }}
 
 

omdev/tools/git/messages.py

@@ -80,6 +80,6 @@ class TimestampGitMessageGenerator(GitMessageGenerator):
 
 # @omlish-manifest
 class _TIMESTAMP_GIT_MESSAGE_GENERATOR_MANIFEST(StaticGitMessageGeneratorManifest):  # noqa
-    attr_name = 'TimestampGitMessageGenerator'
+    attr = 'TimestampGitMessageGenerator'
     name = 'timestamp'
     aliases = ['ts']  # noqa

omdev/tools/json/rendering.py

@@ -37,6 +37,7 @@ def make_render_kwargs(opts: RenderingOptions) -> ta.Mapping[str, ta.Any]:
 class Renderer(lang.Abstract):
     def __init__(self, opts: RenderingOptions) -> None:
         super().__init__()
+
         self._opts = opts
         self._kw = make_render_kwargs(opts)
 

omdev/tools/mkenv.py

@@ -121,9 +121,9 @@ def _main() -> None:
 
 
 # @omlish-manifest
-_CLI_MODULE = {'$omdev.cli.types.CliModule': {
-    'cmd_name': ['mkenv'],
-    'mod_name': __name__,
+_CLI_MODULE = {'!.cli.types.CliModule': {
+    'name': ['mkenv'],
+    'module': __name__,
 }}
 
 

omdev/tools/prof.py

@@ -71,6 +71,7 @@ class Cli(ap.Cli):
         ap.arg('-p', '--pdf', action='store_true'),
         ap.arg('-o', '--open', action='store_true'),
         ap.arg('-O', '--overwrite', action='store_true'),
+        ap.arg('-x', '--exe'),
     )
     def pstats_exec(self) -> None:
         if self.args.out_file is not None:
@@ -85,10 +86,13 @@ class Cli(ap.Cli):
 
         pstats_file = os.path.join(tmp_dir, 'prof.pstats')
 
+        if (exe := self.args.exe) is None:
+            exe = sys.executable
+
         # TODO: --python - and handle env vars, unset venv and pythonpath stuff - helper for this, scrub env
         #  - share with execstat, -x
         subprocess.check_call([
-            sys.executable,
+            exe,
             '-m', 'cProfile',
             '-o', pstats_file,
             os.path.abspath(src_file),
@@ -118,8 +122,8 @@ class Cli(ap.Cli):
             else:
                 # Alt: python -i <setup.py> where setup.py is 'import pstats; stats = pstats.Stats(<out_file>)'
                 os.execl(
-                    sys.executable,
-                    sys.executable,
+                    exe,
+                    exe,
                     '-m', 'pstats',
                     out_file,
                 )

{omdev-0.0.0.dev405.dist-info → omdev-0.0.0.dev407.dist-info}/METADATA

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