omdev 0.0.0.dev30__tar.gz → 0.0.0.dev31__tar.gz

{omdev-0.0.0.dev30/omdev.egg-info → omdev-0.0.0.dev31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev30
+Version: 0.0.0.dev31
 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.dev30
+Requires-Dist: omlish==0.0.0.dev31
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev/interp/pyenv.py

@@ -3,7 +3,14 @@ TODO:
  - custom tags
  - 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
 # ruff: noqa: UP006 UP007
 import abc
 import dataclasses as dc

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev/manifests.py

@@ -1,20 +1,15 @@
 """
-!!! manifests! get-manifest, .manifest.json
- - dumb dicts, root keys are 'types'
- - get put in _manifest.py, root level dict or smth
-  - IMPORT files w comment
-  - comment must immediately precede a global val setter
-  - val is grabbed from imported module dict by name
-  - value is repr'd somehow (roundtrip checked) (naw, json lol)
-  - dumped in _manifest.py
- - # @omlish-manifest \n _CACHE_MANIFEST = {'cache': {'name': 'llm', …
- - also can do prechecks!
+TODO:
+ - split, cli.py / types.py
+ - opt to load only specified types
+ - prechecks
 """
 # ruff: noqa: UP006 UP007
 # @omlish-lite
 import argparse
 import collections
 import dataclasses as dc
+import importlib
 import inspect
 import json
 import os.path
@@ -50,12 +45,50 @@ class Manifest(ManifestOrigin):
     value: ta.Any
 
 
+def load_manifest_entry(
+        entry: ta.Mapping[str, ta.Any],
+        *,
+        raw_values: bool = False,
+) -> Manifest:
+    manifest = Manifest(**entry)
+
+    [(key, value_dct)] = manifest.value.items()
+    if not key.startswith('$'):
+        raise Exception(f'Bad key: {key}')
+
+    if not raw_values:
+        parts = key[1:].split('.')
+        pos = next(i for i, p in enumerate(parts) if p[0].isupper())
+        mod_name = '.'.join(parts[:pos])
+        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)
+
+        if not dc.is_dataclass(cls):
+            raise TypeError(cls)
+        obj = cls(**value_dct)  # noqa
+
+        manifest = dc.replace(manifest, value=obj)
+
+    return manifest
+
+
+##
+
+
 MANIFEST_MAGIC = '# @omlish-manifest'
 
 _MANIFEST_GLOBAL_PAT = re.compile(r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*=.*')
 
 
 def _dump_module_manifests(spec: str, *attrs: str) -> None:
+    import collections.abc
+    import dataclasses as dc  # noqa
     import importlib
     import json
 
@@ -65,13 +98,35 @@ def _dump_module_manifests(spec: str, *attrs: str) -> None:
     for attr in attrs:
         manifest = getattr(mod, attr)
 
-        manifest_json = json.dumps(manifest)
-        rt_manifest = json.loads(manifest_json)
+        if dc.is_dataclass(manifest):
+            cls = type(manifest)
+            manifest_json = json.dumps(dc.asdict(manifest))  # type: ignore
+            manifest_dct = json.loads(manifest_json)
+
+            rt_manifest = cls(**manifest_dct)  # type: ignore
+            if rt_manifest != manifest:
+                raise Exception(f'Manifest failed to roundtrip: {manifest} -> {manifest_dct} != {rt_manifest}')
+
+            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}')
+
+            if not isinstance(manifest_dct, collections.abc.Mapping):
+                raise Exception(f'Bad value: {manifest_dct}')
 
-        if rt_manifest != manifest:
-            raise Exception(f'Manifest failed to roundtrip: {manifest} != {rt_manifest}')
+            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] = rt_manifest
+            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)
@@ -205,8 +260,30 @@ def build_package_manifests(
 ##
 
 
+def check_package_manifests(
+        name: str,
+        base: str,
+) -> None:
+    pkg_dir = os.path.join(base, name)
+    if not os.path.isdir(pkg_dir) or not os.path.isfile(os.path.join(pkg_dir, '__init__.py')):
+        raise Exception(pkg_dir)
+
+    manifests_file = os.path.join(pkg_dir, '.manifests.json')
+    if not os.path.isfile(manifests_file):
+        raise Exception(f'No manifests file: {manifests_file}')
+
+    with open(manifests_file) as f:
+        manifests_json = json.load(f)
+
+    for entry in manifests_json:
+        load_manifest_entry(entry)
+
+
+##
+
+
 if __name__ == '__main__':
-    def _gen_cmd(args) -> None:
+    def _get_base(args) -> str:
         if args.base is not None:
             base = args.base
         else:
@@ -214,6 +291,10 @@ if __name__ == '__main__':
         base = os.path.abspath(base)
         if not os.path.isdir(base):
             raise RuntimeError(base)
+        return base
+
+    def _gen_cmd(args) -> None:
+        base = _get_base(args)
 
         for pkg in args.package:
             ms = build_package_manifests(
@@ -224,6 +305,15 @@ if __name__ == '__main__':
             if not args.quiet:
                 print(json_dumps_pretty([dc.asdict(m) for m in ms]))
 
+    def _check_cmd(args) -> None:
+        base = _get_base(args)
+
+        for pkg in args.package:
+            check_package_manifests(
+                pkg,
+                base,
+            )
+
     def _main(argv=None) -> None:
         configure_standard_logging('INFO')
 
@@ -235,9 +325,13 @@ if __name__ == '__main__':
         parser_gen.add_argument('-w', '--write', action='store_true')
         parser_gen.add_argument('-q', '--quiet', action='store_true')
         parser_gen.add_argument('package', nargs='*')
-
         parser_gen.set_defaults(func=_gen_cmd)
 
+        parser_check = subparsers.add_parser('check')
+        parser_check.add_argument('-b', '--base')
+        parser_check.add_argument('package', nargs='*')
+        parser_check.set_defaults(func=_check_cmd)
+
         args = parser.parse_args(argv)
         if not getattr(args, 'func', None):
             parser.print_help()

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev/pyproject/cli.py

@@ -9,7 +9,7 @@ TODO:
   - {pkg_name: [src_dirs]}, default excludes, generate MANIFST.in, ...
  - env vars - PYTHONPATH
 
-lookit:
+See:
  - https://pdm-project.org/en/latest/
  - https://rye.astral.sh/philosophy/
  - https://github.com/indygreg/python-build-standalone/blob/main/pythonbuild/cpython.py

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev/scripts/interp.py

@@ -1798,7 +1798,14 @@ TODO:
  - custom tags
  - 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
 
 
 ##

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev/scripts/pyproject.py

@@ -12,7 +12,7 @@ TODO:
   - {pkg_name: [src_dirs]}, default excludes, generate MANIFST.in, ...
  - env vars - PYTHONPATH
 
-lookit:
+See:
  - https://pdm-project.org/en/latest/
  - https://rye.astral.sh/philosophy/
  - https://github.com/indygreg/python-build-standalone/blob/main/pythonbuild/cpython.py
@@ -4235,7 +4235,14 @@ TODO:
  - custom tags
  - 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
 
 
 ##

omdev-0.0.0.dev31/omdev/secrets.py

@@ -0,0 +1,12 @@
+import os.path
+import typing as ta
+
+import yaml
+
+
+SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
+
+
+def load_secrets() -> dict[str, ta.Any]:
+    with open(SECRETS_PATH) as f:
+        return yaml.safe_load(f)

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev30
+Version: 0.0.0.dev31
 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.dev30
+Requires-Dist: omlish==0.0.0.dev31
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ omdev/findmagic.py
 omdev/git.py
 omdev/manifests.py
 omdev/revisions.py
+omdev/secrets.py
 omdev/tokens.py
 omdev/wheelfile.py
 omdev.egg-info/PKG-INFO

{omdev-0.0.0.dev30 → omdev-0.0.0.dev31}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev30
+omlish==0.0.0.dev31
 
 [all]
 pycparser~=2.22

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