omdev 0.0.0.dev238__tar.gz → 0.0.0.dev239__tar.gz

{omdev-0.0.0.dev238/omdev.egg-info → omdev-0.0.0.dev239}/PKG-INFO

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

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/home/paths.py

@@ -1,3 +1,5 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
 """
 TODO:
  - XDG cache root
@@ -5,16 +7,42 @@ TODO:
 import os.path
 
 
+##
+
+
 HOME_DIR_ENV_VAR = 'OMLISH_HOME'
 DEFAULT_HOME_DIR = '~/.omlish'
 
-CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
-DEFAULT_CACHE_DIR = '~/.cache/omlish'
-
 
 def get_home_dir() -> str:
     return os.path.expanduser(os.getenv(HOME_DIR_ENV_VAR, DEFAULT_HOME_DIR))
 
 
+#
+
+
+def get_config_dir() -> str:
+    return os.path.join(get_home_dir(), 'config')
+
+
+def get_run_dir() -> str:
+    return os.path.join(get_home_dir(), 'run')
+
+
+def get_shadow_dir() -> str:
+    return os.path.join(get_home_dir(), 'shadow')
+
+
+def get_state_dir() -> str:
+    return os.path.join(get_home_dir(), 'state')
+
+
+##
+
+
+CACHE_DIR_ENV_VAR = 'OMLISH_CACHE'
+DEFAULT_CACHE_DIR = '~/.cache/omlish'
+
+
 def get_cache_dir() -> str:
     return os.path.expanduser(os.getenv(DEFAULT_CACHE_DIR, DEFAULT_CACHE_DIR))

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/home/secrets.py

@@ -4,7 +4,7 @@ import typing as ta
 from omlish import lang
 from omlish.secrets import all as sec
 
-from .paths import get_home_dir
+from .paths import get_config_dir
 
 
 if ta.TYPE_CHECKING:
@@ -13,12 +13,20 @@ else:
     yaml = lang.proxy_import('yaml')
 
 
+##
+
+
 SECRETS_FILE_ENV_VAR = 'OMLISH_SECRETS'
 DEFAULT_SECRETS_FILE_NAME = 'secrets.yml'
 
 
 def get_secrets_file() -> str:
-    return os.path.expanduser(os.getenv(SECRETS_FILE_ENV_VAR, os.path.join(get_home_dir(), DEFAULT_SECRETS_FILE_NAME)))
+    return os.path.expanduser(
+        os.getenv(
+            SECRETS_FILE_ENV_VAR,
+            os.path.join(get_config_dir(), DEFAULT_SECRETS_FILE_NAME),
+        ),
+    )
 
 
 def load_secrets() -> sec.Secrets:

omdev-0.0.0.dev238/omdev/home/configs.py → omdev-0.0.0.dev239/omdev/home/shadow.py

@@ -1,13 +1,14 @@
-import os.path
-
 from omlish.configs.shadow import MangledFilesShadowConfigs
 from omlish.configs.shadow import ShadowConfigs
 
-from .paths import get_home_dir
+from .paths import get_shadow_dir
+
+
+##
 
 
 def get_shadow_configs() -> ShadowConfigs:
     return MangledFilesShadowConfigs(
-        os.path.join(get_home_dir(), 'shadow'),
+        get_shadow_dir(),
         create=True,
     )

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/magic/find.py

@@ -99,7 +99,11 @@ def find_magic(
         *,
         file: ta.Optional[str] = None,
         preparer: ta.Callable[[str], ta.Any] = py_compile_magic_preparer,
+        keys: ta.Optional[ta.Container[str]] = None,
 ) -> ta.List[Magic]:
+    if keys is not None and isinstance(keys, str):
+        raise TypeError(keys)
+
     out: ta.List[Magic] = []
 
     start = 0
@@ -163,7 +167,9 @@ def find_magic(
         if magic is None:
             raise Exception(f'Failed to find magic block terminator : {file=} {start=} {end=}')
 
-        out.append(magic)
+        if keys is None or key in keys:
+            out.append(magic)
+
         start = end + 1
 
     return out

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/manifests/build.py

@@ -27,13 +27,17 @@ import time
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check
+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.load import MANIFEST_LOADER
 from omlish.manifests.types import Manifest
 from omlish.manifests.types import ManifestOrigin
 
 from .. import magic
+from .dumping import _ModuleManifestDumper
 
 
 T = ta.TypeVar('T')
@@ -44,6 +48,7 @@ T = ta.TypeVar('T')
 
 MANIFEST_MAGIC_KEY = '@omlish-manifest'
 
+
 _MANIFEST_GLOBAL_PATS = tuple(re.compile(p) for p in [
     # _FOO_MANIFEST = FooManifest(...
     r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*=.*',
@@ -53,59 +58,22 @@ _MANIFEST_GLOBAL_PATS = tuple(re.compile(p) for p in [
 ])
 
 
-def _dump_module_manifests(spec: str, *attrs: str) -> None:
-    import collections.abc
-    import dataclasses as dc  # noqa
-    import importlib
-    import json
-
-    mod = importlib.import_module(spec)
-
-    out = {}
-    for attr in attrs:
-        manifest = getattr(mod, attr)
-
-        if dc.is_dataclass(manifest):
-            # Support static dataclasses
-            if isinstance(manifest, type):
-                manifest = manifest()
-
-            cls = type(manifest)
-            manifest_json = json.dumps(dc.asdict(manifest))
-            manifest_dct = json.loads(manifest_json)
-
-            rt_manifest = cls(**manifest_dct)
-            if rt_manifest != manifest:
-                raise Exception(f'Manifest failed to roundtrip: {manifest} => {manifest_dct} != {rt_manifest}')
+def extract_manifest_target_name(line: str) -> str:
+    for pat in _MANIFEST_GLOBAL_PATS:
+        if (m := pat.match(line)) is not None:
+            return m.groupdict()['name']
+    raise Exception(line)
 
-            key = f'${cls.__module__}.{cls.__qualname__}'
-            out[attr] = {key: manifest_dct}
 
-        elif isinstance(manifest, collections.abc.Mapping):
-            [(key, manifest_dct)] = manifest.items()
-            if not key.startswith('$'):  # noqa
-                raise Exception(f'Bad key: {key}')
+_INLINE_MANIFEST_CLS_NAME_PAT = re.compile(r'^(?P<cls_name>[_a-zA-Z][_a-zA-Z0-9.]*)\s*(?P<cls_args>\()?')
 
-            if not isinstance(manifest_dct, collections.abc.Mapping):
-                raise Exception(f'Bad value: {manifest_dct}')
 
-            manifest_json = json.dumps(manifest_dct)
-            rt_manifest_dct = json.loads(manifest_json)
-            if manifest_dct != rt_manifest_dct:
-                raise Exception(f'Manifest failed to roundtrip: {manifest_dct} != {rt_manifest_dct}')
-
-            out[attr] = {key: manifest_dct}
-
-        else:
-            raise TypeError(f'Manifest must be dataclass or mapping: {manifest!r}')
-
-    out_json = json.dumps(out, indent=None, separators=(',', ':'))
-    print(out_json)
+##
 
 
 @cached_nullary
 def _payload_src() -> str:
-    return inspect.getsource(_dump_module_manifests)
+    return inspect.getsource(_ModuleManifestDumper)
 
 
 class ManifestBuilder:
@@ -153,24 +121,83 @@ class ManifestBuilder:
         with open(os.path.join(self._base, file)) as f:  # noqa
             src = f.read()
 
-        origins: ta.List[ManifestOrigin] = []
         lines = src.splitlines(keepends=True)
-        for i, l in enumerate(lines):
-            if l.startswith('# ' + MANIFEST_MAGIC_KEY):
-                nl = lines[i + 1]
-                for pat in _MANIFEST_GLOBAL_PATS:
-                    if (m := pat.match(nl)) is not None:
-                        break
+
+        magics = magic.find_magic(
+            magic.PY_MAGIC_STYLE,
+            lines,
+            file=file,
+            keys={MANIFEST_MAGIC_KEY},
+        )
+
+        origins: ta.List[ManifestOrigin] = []
+        targets: ta.List[dict] = []
+        for m in magics:
+            if m.body:
+                pat_match = check.not_none(_INLINE_MANIFEST_CLS_NAME_PAT.match(m.body))
+                cls_name = check.non_empty_str(pat_match.groupdict()['cls_name'])
+                has_cls_args = bool(pat_match.groupdict().get('cls_args'))
+
+                cls = check.isinstance(import_attr(cls_name), type)
+                check.state(dc.is_dataclass(cls))
+
+                cls_mod_name = cls.__module__
+                cls_qualname = cls.__qualname__
+                cls_reload = sys.modules[cls_mod_name]
+                for p in cls_qualname.split('.'):
+                    cls_reload = getattr(cls_reload, p)
+                check.is_(cls_reload, cls)
+
+                if has_cls_args:
+                    inl_init_src = m.body[len(cls_name):]
                 else:
-                    raise Exception(nl)
+                    inl_init_src = '()'
 
-                origins.append(ManifestOrigin(
+                inl_kw: dict = {}
+
+                if issubclass(cls, ModAttrManifest):
+                    attr_name = extract_manifest_target_name(lines[m.end_line])
+                    inl_kw.update({
+                        'mod_name': mod_name,
+                        'attr_name': attr_name,
+                    })
+
+                origin = ManifestOrigin(
                     module='.'.join(['', *mod_name.split('.')[1:]]),
-                    attr=m.groupdict()['name'],
+                    attr=None,
 
                     file=file,
-                    line=i + 1,
-                ))
+                    line=m.start_line,
+                )
+
+                origins.append(origin)
+                targets.append({
+                    'origin': dc.asdict(origin),  # noqa
+                    'kind': 'inline',
+                    'cls_mod_name': cls_mod_name,
+                    'cls_qualname': cls_qualname,
+                    'init_src': inl_init_src,
+                    'kwargs': inl_kw,
+                })
+
+            else:
+                nl = lines[m.end_line]
+                attr_name = extract_manifest_target_name(nl)
+
+                origin = ManifestOrigin(
+                    module='.'.join(['', *mod_name.split('.')[1:]]),
+                    attr=attr_name,
+
+                    file=file,
+                    line=m.start_line,
+                )
+
+                origins.append(origin)
+                targets.append({
+                    'origin': dc.asdict(origin),  # noqa
+                    'kind': 'attr',
+                    'attr': attr_name,
+                })
 
         if not origins:
             raise Exception('no manifests found')
@@ -178,11 +205,9 @@ class ManifestBuilder:
         if (dups := [k for k, v in collections.Counter(o.attr for o in origins).items() if v > 1]):
             raise Exception(f'Duplicate attrs: {dups}')
 
-        attrs = [o.attr for o in origins]
-
         subproc_src = '\n\n'.join([
             _payload_src(),
-            f'_dump_module_manifests({mod_name!r}, {", ".join(repr(a) for a in attrs)})\n',
+            f'_ModuleManifestDumper({mod_name!r})({", ".join(repr(tgt) for tgt in targets)})\n',
         ])
 
         args = [
@@ -210,21 +235,21 @@ class ManifestBuilder:
         if len(sp_lines) != 1:
             raise Exception('Unexpected subprocess output')
 
-        dct = json.loads(sp_lines[0])
-        if set(dct) != set(attrs):
-            raise Exception('Unexpected subprocess output keys')
+        sp_outs = json.loads(sp_lines[0])
+        # FIXME:
+        # if set(dct) != set(attrs):
+        #     raise Exception('Unexpected subprocess output keys')
 
         out: ta.List[Manifest] = []
-
-        for o in origins:
-            value = dct[o.attr]
+        for sp_out in sp_outs:
+            value = sp_out['value']
 
             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)
             ):
-                raise TypeError(f'Manifests 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
@@ -232,10 +257,10 @@ class ManifestBuilder:
                 key = f'$.{kr}'
                 value = {key: value_dct}
 
-            out.append(Manifest(
-                **dc.asdict(o),
-                value=value,
-            ))
+            out.append(Manifest(**{
+                **sp_out,
+                **dict(value=value),
+            }))
 
         return out
 

omdev-0.0.0.dev239/omdev/manifests/dumping.py

@@ -0,0 +1,94 @@
+# ruff: noqa: UP006 UP007
+import typing as ta
+
+
+class _ModuleManifestDumper:
+    def __init__(self, spec: str) -> None:
+        super().__init__()
+
+        self._spec = spec
+
+    def __call__(self, *targets: dict) -> None:
+        import collections.abc
+        import dataclasses as dc  # noqa
+        import functools
+        import importlib
+        import json
+
+        mod = importlib.import_module(self._spec)
+
+        cls: ta.Any
+
+        out = []
+        for target in targets:
+            origin = target['origin']
+
+            if target['kind'] == 'attr':
+                attr = target['attr']
+                manifest = getattr(mod, attr)
+
+                if dc.is_dataclass(manifest):
+                    # Support static dataclasses
+                    if isinstance(manifest, type):
+                        manifest = manifest()
+
+                    cls = type(manifest)
+                    manifest_json = json.dumps(dc.asdict(manifest))
+                    manifest_dct = json.loads(manifest_json)
+
+                    rt_manifest = cls(**manifest_dct)
+                    if rt_manifest != manifest:
+                        raise Exception(f'Manifest failed to roundtrip: {manifest} => {manifest_dct} != {rt_manifest}')
+
+                    key = f'${cls.__module__}.{cls.__qualname__}'
+                    out_value = {key: manifest_dct}
+
+                elif isinstance(manifest, collections.abc.Mapping):
+                    [(key, manifest_dct)] = manifest.items()
+                    if not key.startswith('$'):  # noqa
+                        raise Exception(f'Bad key: {key}')
+
+                    if not isinstance(manifest_dct, collections.abc.Mapping):
+                        raise Exception(f'Bad value: {manifest_dct}')
+
+                    manifest_json = json.dumps(manifest_dct)
+                    rt_manifest_dct = json.loads(manifest_json)
+                    if manifest_dct != rt_manifest_dct:
+                        raise Exception(f'Manifest failed to roundtrip: {manifest_dct} != {rt_manifest_dct}')
+
+                    out_value = {key: manifest_dct}
+
+                else:
+                    raise TypeError(f'Manifest must be dataclass or mapping: {manifest!r}')
+
+            elif target['kind'] == 'inline':
+                cls = importlib.import_module(target['cls_mod_name'])
+                for p in target['cls_qualname'].split('.'):
+                    cls = getattr(cls, p)
+                if not isinstance(cls, type) or not dc.is_dataclass(cls):
+                    raise TypeError(cls)
+
+                cls_fac = functools.partial(cls, **target['kwargs'])
+                eval_attr_name = '__manifest_factory__'
+                inl_glo = {
+                    **mod.__dict__,
+                    eval_attr_name: cls_fac,
+                }
+                inl_src = eval_attr_name + target['init_src']
+                inl_code = compile(inl_src, '<magic>', 'eval')
+                manifest = eval(inl_code, inl_glo)  # noqa
+                manifest_json = json.dumps(dc.asdict(manifest))
+                manifest_dct = json.loads(manifest_json)
+                key = f'${cls.__module__}.{cls.__qualname__}'
+                out_value = {key: manifest_dct}
+
+            else:
+                raise ValueError(target)
+
+            out.append({
+                **origin,
+                'value': out_value,
+            })
+
+        out_json = json.dumps(out, indent=None, separators=(',', ':'))
+        print(out_json)

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/scripts/pyproject.py

@@ -3059,7 +3059,11 @@ def find_magic(
         *,
         file: ta.Optional[str] = None,
         preparer: ta.Callable[[str], ta.Any] = py_compile_magic_preparer,
+        keys: ta.Optional[ta.Container[str]] = None,
 ) -> ta.List[Magic]:
+    if keys is not None and isinstance(keys, str):
+        raise TypeError(keys)
+
     out: ta.List[Magic] = []
 
     start = 0
@@ -3123,7 +3127,9 @@ def find_magic(
         if magic is None:
             raise Exception(f'Failed to find magic block terminator : {file=} {start=} {end=}')
 
-        out.append(magic)
+        if keys is None or key in keys:
+            out.append(magic)
+
         start = end + 1
 
     return out

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/tools/git/cli.py

@@ -21,8 +21,8 @@ from omlish.subprocesses.sync import subprocesses
 
 from ...git.status import GitStatusItem
 from ...git.status import get_git_status
-from ...home.configs import get_shadow_configs
-from ...home.paths import get_home_dir
+from ...home.paths import get_config_dir
+from ...home.shadow import get_shadow_configs
 from . import consts
 from .messages import GitMessageGenerator
 from .messages import TimestampGitMessageGenerator
@@ -74,7 +74,7 @@ class Cli(ap.Cli):
         if (arg := self._config_file_path_arg) is not None:
             return os.path.expanduser(arg)
         else:
-            return os.path.join(get_home_dir(), 'tools', 'git.yml')
+            return os.path.join(get_config_dir(), 'tools', 'git.yml')
 
     @cached.function
     def load_home_config_content(self) -> ta.Any:

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev/tools/shadow.py

@@ -14,7 +14,7 @@ from omlish.argparse import all as ap
 from omlish.configs.shadow import FileShadowConfigs
 
 from ..cli.types import CliModule
-from ..home.configs import get_shadow_configs
+from ..home.shadow import get_shadow_configs
 
 
 ##

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239/omdev.egg-info}/PKG-INFO

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

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev.egg-info/SOURCES.txt

@@ -129,9 +129,9 @@ omdev/git/revisions.py
 omdev/git/shallow.py
 omdev/git/status.py
 omdev/home/__init__.py
-omdev/home/configs.py
 omdev/home/paths.py
 omdev/home/secrets.py
+omdev/home/shadow.py
 omdev/interp/__init__.py
 omdev/interp/__main__.py
 omdev/interp/cli.py
@@ -166,6 +166,7 @@ omdev/magic/styles.py
 omdev/manifests/__init__.py
 omdev/manifests/__main__.py
 omdev/manifests/build.py
+omdev/manifests/dumping.py
 omdev/manifests/main.py
 omdev/mypy/__init__.py
 omdev/mypy/debug.py

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/omdev.egg-info/requires.txt

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

{omdev-0.0.0.dev238 → omdev-0.0.0.dev239}/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.dev238'
+version = '0.0.0.dev239'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev238',
+    'omlish == 0.0.0.dev239',
 ]
 
 [project.optional-dependencies]