omdev 0.0.0.dev51__py3-none-any.whl → 0.0.0.dev52__py3-none-any.whl

omdev/manifests/build.py

@@ -13,9 +13,13 @@ See (entry_points):
 # ruff: noqa: UP006 UP007
 import argparse
 import collections
+import concurrent.futures as cf
 import dataclasses as dc
+import functools
 import inspect
+import itertools
 import json
+import multiprocessing as mp
 import os.path
 import re
 import shlex
@@ -195,6 +199,7 @@ def build_module_manifests(
 
 
 def build_package_manifests(
+        ex: cf.Executor,
         name: str,
         base: str,
         *,
@@ -204,14 +209,20 @@ def build_package_manifests(
     if not os.path.isdir(pkg_dir) or not os.path.isfile(os.path.join(pkg_dir, '__init__.py')):
         raise Exception(pkg_dir)
 
-    manifests: ta.List[Manifest] = []
-
-    for file in sorted(findmagic.find_magic(
-            [pkg_dir],
-            [MANIFEST_MAGIC],
-            ['py'],
-    )):
-        manifests.extend(build_module_manifests(os.path.relpath(file, base), base))
+    files = sorted(findmagic.find_magic(
+        [pkg_dir],
+        [MANIFEST_MAGIC],
+        ['py'],
+    ))
+    futs = [
+        ex.submit(functools.partial(
+            build_module_manifests,
+            os.path.relpath(file, base),
+            base,
+        ))
+        for file in files
+    ]
+    manifests: ta.List[Manifest] = list(itertools.chain.from_iterable(fut.result() for fut in futs))
 
     if write:
         with open(os.path.join(pkg_dir, '.manifests.json'), 'w') as f:
@@ -266,14 +277,22 @@ if __name__ == '__main__':
     def _gen_cmd(args) -> None:
         base = _get_base(args)
 
-        for pkg in args.package:
-            ms = build_package_manifests(
-                pkg,
-                base,
-                write=args.write or False,
-            )
+        num_threads = args.jobs or max(mp.cpu_count() // 2, 1)
+        with cf.ThreadPoolExecutor(num_threads) as ex:
+            futs = [
+                ex.submit(functools.partial(
+                    build_package_manifests,
+                    ex,
+                    pkg,
+                    base,
+                    write=args.write or False,
+                ))
+                for pkg in args.package
+            ]
+            mss = [fut.result() for fut in futs]
             if not args.quiet:
-                print(json_dumps_pretty([dc.asdict(m) for m in ms]))
+                for ms in mss:
+                    print(json_dumps_pretty([dc.asdict(m) for m in ms]))
 
     def _check_cmd(args) -> None:
         base = _get_base(args)
@@ -294,6 +313,7 @@ if __name__ == '__main__':
         parser_gen.add_argument('-b', '--base')
         parser_gen.add_argument('-w', '--write', action='store_true')
         parser_gen.add_argument('-q', '--quiet', action='store_true')
+        parser_gen.add_argument('-j', '--jobs', type=int)
         parser_gen.add_argument('package', nargs='*')
         parser_gen.set_defaults(func=_gen_cmd)
 

omdev/secrets.py

@@ -1,12 +1,17 @@
 import os.path
-import typing as ta
 
 import yaml
 
+from omlish import secrets as sec
+
 
 SECRETS_PATH = os.getenv('SECRETS_PATH', os.path.expanduser('~/Dropbox/.dotfiles/secrets.yml'))
 
 
-def load_secrets() -> dict[str, ta.Any]:
+def load_secrets() -> sec.Secrets:
+    dct: dict[str, sec.Secret] = {}
     with open(SECRETS_PATH) as f:
-        return yaml.safe_load(f)
+        for k, v in yaml.safe_load(f).items():
+            if isinstance(v, str):
+                dct[k] = sec.Secret(key=k, value=v)
+    return sec.MappingSecrets(dct)

{omdev-0.0.0.dev51.dist-info → omdev-0.0.0.dev52.dist-info}/METADATA

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

{omdev-0.0.0.dev51.dist-info → omdev-0.0.0.dev52.dist-info}/RECORD

@@ -8,7 +8,7 @@ omdev/findimports.py,sha256=P8v4I1tm6g-PEWJiNwAKxErvWwL-Nop83vAuwq1kR5A,2246
 omdev/findmagic.py,sha256=DhBYHHP_dzwM5pIh21xnQPnkZ2YmAXCjithsr7X0ScU,2357
 omdev/git.py,sha256=riM2KqSpQPC3N89uipd7Vm3kVgv4EYYDBU9tV1Z8juM,2208
 omdev/revisions.py,sha256=U657hf4zeEN32y3g4CzqCAodx_HlfkHj2cIIKALNFDo,5009
-omdev/secrets.py,sha256=ja0VsCB01MHxYwn5OHjFeXV9cRah9AQl-0uJzZELpic,256
+omdev/secrets.py,sha256=Or0Dw-D1FY1uaZulcTWLmHCGI9bs8UWbyaPIJSSstQ4,437
 omdev/tokens.py,sha256=GusxQ1Cd_eiScuR8XTTtc9QFhOgYviYGBZmFnn3Hj7s,756
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -71,7 +71,7 @@ omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,77
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
 omdev/interp/types.py,sha256=EMN3StEMkFoQAMUIZd7JYL4uUWqzFGY-2hTL8EBznYM,2437
 omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=_anZfhIAwUQo0J4BfKvDsvivrST2U5VigJaFKbJKXMQ,9067
+omdev/manifests/build.py,sha256=UxmuJhnWG16nwyFU9bTsv_FRzQ3lw1nZvAFI_XI3wuY,9727
 omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
 omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -114,9 +114,9 @@ omdev/tools/piptools.py,sha256=-jR5q3w4sHqntxCLExFCBNIARB788FUsAbJ62PK2sBU,2774
 omdev/tools/proftools.py,sha256=xKSm_yPoCnfsvS3iT9MblDqFMuZmGfI3_koGj8amMyU,145
 omdev/tools/rst.py,sha256=6dWk8QZHoGiLSuBw3TKsXZjjFK6wWBEtPi9krdCLKKg,977
 omdev/tools/sqlrepl.py,sha256=tmFZh80-xsGM62dyQ7_UGLebChrj7IHbIPYBWDJMgVk,5741
-omdev-0.0.0.dev51.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev51.dist-info/METADATA,sha256=bye62BhCshzoGHXvt3-Sq5KrSI2PusmaAym3CnvT0M8,1252
-omdev-0.0.0.dev51.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omdev-0.0.0.dev51.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev51.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev51.dist-info/RECORD,,
+omdev-0.0.0.dev52.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev52.dist-info/METADATA,sha256=i-4H3TQh4h9ahk0VXKuSobql_G4gPEjzk_PVRfqjF3A,1252
+omdev-0.0.0.dev52.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omdev-0.0.0.dev52.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev52.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev52.dist-info/RECORD,,