omdev 0.0.0.dev144__py3-none-any.whl → 0.0.0.dev146__py3-none-any.whl

omdev/.manifests.json

@@ -243,7 +243,7 @@
     "module": ".tools.docker",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/docker.py",
-    "line": 236,
+    "line": 249,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "docker",
@@ -255,7 +255,7 @@
     "module": ".tools.git",
     "attr": "_CLI_MODULE",
     "file": "omdev/tools/git.py",
-    "line": 211,
+    "line": 215,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "git",

omdev/amalg/amalg.py

@@ -25,8 +25,10 @@ Targets:
 """
 import argparse
 import ast
+import base64
 import dataclasses as dc
 import io
+import itertools
 import logging
 import os.path
 import re
@@ -286,6 +288,37 @@ def is_root_level_if_type_checking_block(lts: Tokens) -> bool:
 ##
 
 
+class RootLevelResourcesRead(ta.NamedTuple):
+    variable: str
+    kind: ta.Literal['binary', 'text']
+    resource: str
+
+
+def is_root_level_resources_read(lts: Tokens) -> RootLevelResourcesRead | None:
+    wts = list(tks.ignore_ws(lts, keep=['INDENT']))
+
+    if not tks.match_toks(wts, [
+        ('NAME', None),
+        ('OP', '='),
+        ('NAME', ('read_package_resource_binary', 'read_package_resource_text')),
+        ('OP', '('),
+        ('NAME', '__package__'),
+        ('OP', ','),
+        ('STRING', None),
+        ('OP', ')'),
+    ]):
+        return None
+
+    return RootLevelResourcesRead(
+        wts[0].src,
+        'binary' if wts[2].src == 'read_package_resource_binary' else 'text',
+        ast.literal_eval(wts[6].src),
+    )
+
+
+##
+
+
 @dc.dataclass(frozen=True, kw_only=True)
 class SrcFile:
     path: str
@@ -301,6 +334,8 @@ class SrcFile:
 
     ruff_noqa: ta.AbstractSet[str] = dc.field(repr=False)
 
+    has_binary_resources: bool = False
+
 
 def make_src_file(
         path: str,
@@ -322,6 +357,8 @@ def make_src_file(
     tys: list[Typing] = []
     ctls: list[Tokens] = []
 
+    has_binary_resources = False
+
     i = 0
     while i < len(cls):
         line = cls[i]
@@ -383,6 +420,57 @@ def make_src_file(
                 i += 1
                 skip_block()
 
+        elif (rsrc := is_root_level_resources_read(line)) is not None:
+            rf = os.path.join(os.path.dirname(path), rsrc.resource)
+
+            if rsrc.kind == 'binary':
+                with open(rf, 'rb') as bf:
+                    rb = bf.read()  # noqa
+
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='NAME', src='base64'),
+                    trt.Token(name='OP', src='.'),
+                    trt.Token(name='NAME', src='b64decode'),
+                    trt.Token(name='OP', src='('),
+                    trt.Token(name='NL', src='\n'),
+                ])
+
+                rb64 = base64.b64encode(rb).decode('ascii')
+                for chunk in itertools.batched(rb64, 96):
+                    ctls.append([
+                        trt.Token(name='UNIMPORTANT_WS', src='    '),
+                        trt.Token(name='STRING', src=f"'{''.join(chunk)}'"),
+                        trt.Token(name='NL', src='\n'),
+                    ])
+
+                ctls.append([
+                    trt.Token(name='OP', src=')'),
+                    trt.Token(name='NEWLINE', src='\n'),
+                ])
+
+                has_binary_resources = True
+
+            elif rsrc.kind == 'text':
+                with open(rf) as tf:
+                    rt = tf.read()  # noqa
+                rt = rt.replace('\\', '\\\\')  # Escape backslashes
+                rt = rt.replace('"""', r'\"\"\"')
+                ctls.append([
+                    trt.Token(name='NAME', src=rsrc.variable),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='OP', src='='),
+                    trt.Token(name='UNIMPORTANT_WS', src=' '),
+                    trt.Token(name='STRING', src=f'"""\\\n{rt}"""\n'),
+                    trt.Token(name='NEWLINE', src=''),
+                ])
+
+            else:
+                raise ValueError(rsrc.kind)
+
         else:
             ctls.append(line)
 
@@ -399,6 +487,8 @@ def make_src_file(
         content_lines=ctls,
 
         ruff_noqa=set(lang.flatten(tks.join_toks(l).strip().split()[3:] for l in rnls)),  # noqa
+
+        has_binary_resources=has_binary_resources,
     )
 
 
@@ -488,6 +578,8 @@ def gen_amalg(
     dct: dict = {
         ('sys', None, None): ['import sys\n'],
     }
+    if any(sf.has_binary_resources for sf in src_files.values()):
+        dct[('base64', None, None)] = ['import base64\n']
     for imp in gl_imps:
         dct.setdefault((imp.mod, imp.item, imp.as_), []).append(imp)
     for _, l in sorted(dct.items()):

omdev/cli/main.py

@@ -13,8 +13,8 @@ import typing as ta
 
 from omlish import check
 from omlish.lite.cached import cached_nullary
+from omlish.manifests.load import ManifestLoader
 
-from ..manifests.load import ManifestLoader
 from .types import CliCmd
 from .types import CliFunc
 from .types import CliModule

omdev/interp/resolvers.py

@@ -35,7 +35,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/manifests/__init__.py

@@ -1,2 +1 @@
 # @omlish-lite
-from .types import Manifest  # noqa

omdev/manifests/build.py

@@ -1,3 +1,4 @@
+# ruff: noqa: UP006 UP007
 """
 TODO:
  - separate build from cli
@@ -10,7 +11,6 @@ See (entry_points):
  - https://packaging.python.org/en/latest/guides/creating-and-discovering-plugins/
  - [project.entry-points.omlish-manifests] \n omdev = omdev
 """
-# ruff: noqa: UP006 UP007
 import argparse
 import asyncio
 import collections
@@ -31,11 +31,11 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.json import json_dumps_pretty
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
+from omlish.manifests.load import ManifestLoader
+from omlish.manifests.types import Manifest
+from omlish.manifests.types import ManifestOrigin
 
 from .. import magic
-from .load import ManifestLoader
-from .types import Manifest
-from .types import ManifestOrigin
 
 
 T = ta.TypeVar('T')

omdev/precheck/manifests.py

@@ -1,7 +1,8 @@
 import dataclasses as dc
 import typing as ta
 
-from ..manifests.load import ManifestLoader
+from omlish.manifests.load import ManifestLoader
+
 from .base import Precheck
 from .base import PrecheckContext
 

omdev/scripts/interp.py

@@ -2530,7 +2530,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/scripts/pyproject.py

@@ -3087,23 +3087,24 @@ TODO:
 @dc.dataclass(frozen=True)
 class ObjMarshalOptions:
     raw_bytes: bool = False
+    nonstrict_dataclasses: bool = False
 
 
 class ObjMarshaler(abc.ABC):
     @abc.abstractmethod
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
     @abc.abstractmethod
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         raise NotImplementedError
 
 
 class NopObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -3111,29 +3112,29 @@ class NopObjMarshaler(ObjMarshaler):
 class ProxyObjMarshaler(ObjMarshaler):
     m: ta.Optional[ObjMarshaler] = None
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).marshal(o, opts)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return check_not_none(self.m).unmarshal(o, opts)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return check_not_none(self.m).unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class CastObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(o)
 
 
 class DynamicObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return marshal_obj(o)
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return ctx.manager.marshal_obj(o, opts=ctx.options)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o
 
 
@@ -3141,10 +3142,10 @@ class DynamicObjMarshaler(ObjMarshaler):
 class Base64ObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return base64.b64encode(o).decode('ascii')
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty(base64.b64decode(o))
 
 
@@ -3152,25 +3153,25 @@ class Base64ObjMarshaler(ObjMarshaler):
 class BytesSwitchedObjMarshaler(ObjMarshaler):
     m: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.marshal(o, opts)
+        return self.m.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        if opts.raw_bytes:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        if ctx.options.raw_bytes:
             return o
-        return self.m.unmarshal(o, opts)
+        return self.m.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
 class EnumObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.name
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.__members__[o]  # type: ignore
 
 
@@ -3178,15 +3179,15 @@ class EnumObjMarshaler(ObjMarshaler):
 class OptionalObjMarshaler(ObjMarshaler):
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.marshal(o, opts)
+        return self.item.marshal(o, ctx)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         if o is None:
             return None
-        return self.item.unmarshal(o, opts)
+        return self.item.unmarshal(o, ctx)
 
 
 @dc.dataclass(frozen=True)
@@ -3195,11 +3196,11 @@ class MappingObjMarshaler(ObjMarshaler):
     km: ObjMarshaler
     vm: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {self.km.marshal(k, opts): self.vm.marshal(v, opts) for k, v in o.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {self.km.marshal(k, ctx): self.vm.marshal(v, ctx) for k, v in o.items()}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty((self.km.unmarshal(k, opts), self.vm.unmarshal(v, opts)) for k, v in o.items())
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty((self.km.unmarshal(k, ctx), self.vm.unmarshal(v, ctx)) for k, v in o.items())
 
 
 @dc.dataclass(frozen=True)
@@ -3207,11 +3208,11 @@ class IterableObjMarshaler(ObjMarshaler):
     ty: type
     item: ObjMarshaler
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return [self.item.marshal(e, opts) for e in o]
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return [self.item.marshal(e, ctx) for e in o]
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(self.item.unmarshal(e, opts) for e in o)
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(self.item.unmarshal(e, ctx) for e in o)
 
 
 @dc.dataclass(frozen=True)
@@ -3220,11 +3221,18 @@ class DataclassObjMarshaler(ObjMarshaler):
     fs: ta.Mapping[str, ObjMarshaler]
     nonstrict: bool = False
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return {k: m.marshal(getattr(o, k), opts) for k, m in self.fs.items()}
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return {
+            k: m.marshal(getattr(o, k), ctx)
+            for k, m in self.fs.items()
+        }
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
-        return self.ty(**{k: self.fs[k].unmarshal(v, opts) for k, v in o.items() if not self.nonstrict or k in self.fs})
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
+        return self.ty(**{
+            k: self.fs[k].unmarshal(v, ctx)
+            for k, v in o.items()
+            if not (self.nonstrict or ctx.options.nonstrict_dataclasses) or k in self.fs
+        })
 
 
 @dc.dataclass(frozen=True)
@@ -3244,50 +3252,50 @@ class PolymorphicObjMarshaler(ObjMarshaler):
             {i.tag: i for i in impls},
         )
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         impl = self.impls_by_ty[type(o)]
-        return {impl.tag: impl.m.marshal(o, opts)}
+        return {impl.tag: impl.m.marshal(o, ctx)}
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         [(t, v)] = o.items()
         impl = self.impls_by_tag[t]
-        return impl.m.unmarshal(v, opts)
+        return impl.m.unmarshal(v, ctx)
 
 
 @dc.dataclass(frozen=True)
 class DatetimeObjMarshaler(ObjMarshaler):
     ty: type
 
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return o.isoformat()
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return self.ty.fromisoformat(o)  # type: ignore
 
 
 class DecimalObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(check_isinstance(o, decimal.Decimal))
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return decimal.Decimal(check_isinstance(v, str))
 
 
 class FractionObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         fr = check_isinstance(o, fractions.Fraction)
         return [fr.numerator, fr.denominator]
 
-    def unmarshal(self, v: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, v: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         num, denom = check_isinstance(v, list)
         return fractions.Fraction(num, denom)
 
 
 class UuidObjMarshaler(ObjMarshaler):
-    def marshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def marshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return str(o)
 
-    def unmarshal(self, o: ta.Any, opts: ObjMarshalOptions) -> ta.Any:
+    def unmarshal(self, o: ta.Any, ctx: 'ObjMarshalContext') -> ta.Any:
         return uuid.UUID(o)
 
 
@@ -3448,6 +3456,12 @@ class ObjMarshalerManager:
 
     #
 
+    def _make_context(self, opts: ta.Optional[ObjMarshalOptions]) -> 'ObjMarshalContext':
+        return ObjMarshalContext(
+            options=opts or self._default_options,
+            manager=self,
+        )
+
     def marshal_obj(
             self,
             o: ta.Any,
@@ -3455,7 +3469,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> ta.Any:
         m = self.get_obj_marshaler(ty if ty is not None else type(o))
-        return m.marshal(o, opts or self._default_options)
+        return m.marshal(o, self._make_context(opts))
 
     def unmarshal_obj(
             self,
@@ -3464,7 +3478,7 @@ class ObjMarshalerManager:
             opts: ta.Optional[ObjMarshalOptions] = None,
     ) -> T:
         m = self.get_obj_marshaler(ty)
-        return m.unmarshal(o, opts or self._default_options)
+        return m.unmarshal(o, self._make_context(opts))
 
     def roundtrip_obj(
             self,
@@ -3479,6 +3493,12 @@ class ObjMarshalerManager:
         return u
 
 
+@dc.dataclass(frozen=True)
+class ObjMarshalContext:
+    options: ObjMarshalOptions
+    manager: ObjMarshalerManager
+
+
 ##
 
 
@@ -5728,7 +5748,7 @@ class InterpResolver:
             if spec.contains(si)
         ]
 
-        slst = sorted(lst, key=lambda t: (-t[0], t[1]))
+        slst = sorted(lst, key=lambda t: (-t[0], t[1].version))
         if not slst:
             return None
 

omdev/tokens.py

@@ -61,7 +61,7 @@ def join_lines(ls: ta.Iterable[Tokens]) -> str:
 
 def match_toks(
         ts: ta.Iterable['trt.Token'],
-        pat: ta.Sequence[tuple[str | None, str | None]],
+        pat: ta.Sequence[tuple[str | None, str | tuple[str, ...] | None]],
 ) -> bool:
     it = iter(ts)
     for pn, ps in pat:
@@ -71,6 +71,13 @@ def match_toks(
             return False
         if pn is not None and t.name != pn:
             return False
-        if ps is not None and t.src != ps:
-            return False
+        if ps is not None:
+            if isinstance(ps, str):
+                if t.src != ps:
+                    return False
+            elif isinstance(ps, tuple):
+                if t.src not in ps:
+                    return False
+            else:
+                raise TypeError(ps)
     return True

omdev/tools/docker.py

@@ -1,6 +1,6 @@
 """
 TODO:
- - check for updates
+ - https://github.com/zeromake/docker-debug
 """
 import os
 import re
@@ -232,6 +232,19 @@ class Cli(ap.Cli):
 
             print(f'{svc_name}: {lt}')
 
+    @ap.command()
+    def dockly(self) -> None:
+        os.execl(
+            exe := docker_exe(),
+            exe,
+            'run',
+            '-it',
+            '--rm',
+            '-v',
+            '/var/run/docker.sock:/var/run/docker.sock',
+            'lirantal/dockly',
+        )
+
 
 # @omlish-manifest
 _CLI_MODULE = CliModule('docker', __name__)

omdev/tools/git.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - https://github.com/vegardit/bash-funk/blob/main/docs/git.md
+"""
 import os
 import re
 import subprocess

omdev/tools/json/io.py

@@ -53,7 +53,7 @@
 #
 #
 # @dc.dataclass(frozen=True)
-# class FdIo(Input, Output):
+# class Fdio(Input, Output):
 #     fd: int
 #
 #     default_read_sz: int = DEFAULT_READ_SZ

{omdev-0.0.0.dev144.dist-info → omdev-0.0.0.dev146.dist-info}/METADATA

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

{omdev-0.0.0.dev144.dist-info → omdev-0.0.0.dev146.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=Uq3VB0ovogq663SM_1fuRBjqbod7kE30wNxBByQI2zo,8033
+omdev/.manifests.json,sha256=ln-OyFCqhvwbtxlfrQk-6s4Ilao4ufYVmQJQI_4UtT8,8033
 omdev/__about__.py,sha256=n5x-SO70OgbDQFzQ1d7sZDVMsnkQc4PxQZPFaIQFa0E,1281
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/bracepy.py,sha256=I8EdqtDvxzAi3I8TuMEW-RBfwXfqKbwp06CfOdj3L1o,2743
@@ -10,11 +10,11 @@ omdev/imgur.py,sha256=il12R3t19tALolteYCZywvcdQUEOcgvPyUYgWtKiqt4,2993
 omdev/pip.py,sha256=7cZ_IOpekQvgPm_gKnX3Pr8xjqUid50PPScTlZCYVlM,2118
 omdev/revisions.py,sha256=7tRBeDECSOhYfwSxJDrMFypQjtghLu9P4P0oFT3NHdQ,5008
 omdev/secrets.py,sha256=bcquaBIDKqX4UIKOzUuKrX7nxVCenj67rRHIMIrd9bk,540
-omdev/tokens.py,sha256=eCppK7BtlgAK_AmfO-Or_B-x85tqmu0HVla8d2gvB3I,1333
+omdev/tokens.py,sha256=zh2TCAfCbcq8ZnoVdQ824jrTiwNy3XJ_oCqlZpLpcCY,1574
 omdev/wheelfile.py,sha256=yfupGcGkbFlmzGzKU64k_vmOKpaKnUlDWxeGn2KdekU,10005
 omdev/amalg/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/amalg/__main__.py,sha256=h94M-VqZ3AFBU2a8zOsjeKK7RF6uINhTHl6OiGbVMgw,163
-omdev/amalg/amalg.py,sha256=AEhgXmc9y3zfvMpAdJUuTwlhYZ5bCAUrVf1WHsgV5PI,16084
+omdev/amalg/amalg.py,sha256=_5goY2wRrP9X4nma3MzDHTbCj7_bkfNxi98bRbd6eSQ,19240
 omdev/antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/antlr/consts.py,sha256=8pR6r0m0P3hAiyiAoJZ-nptd2GYbZ98mxwPL9cpaRuw,279
 omdev/antlr/gen.py,sha256=QnPyVWUrJYqHoOc3XsXA8fJdoiwAj6pyUwdG-DVrIeA,2953
@@ -62,7 +62,7 @@ omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=kxqb2kHap68Lkh8b211rDbcgj06hidBiAKA3f9posyc,2119
 omdev/cli/clicli.py,sha256=NhTYaCQx3K_Y8UOZZYqCa3lqxkCB41XgE2FpR_PT7Gc,3504
 omdev/cli/install.py,sha256=C-W171YlIHt4Cfok-nWSMbHwWhqF_PFqq2HixFttYx8,4460
-omdev/cli/main.py,sha256=p00ZoNIOlQW6GjyzryoIweQnC-a8tDx59S8EQYJ4uLY,7028
+omdev/cli/main.py,sha256=OY7ir2WWuDUM1Urmh-WdEv7uEhidRRGnE4FNYHaEN3s,7033
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
 omdev/cli/types.py,sha256=bqKw9SbtBtAip2vF9v4khh0CqKG6LBr6n9VzWBz7AJE,474
 omdev/clipboard/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +75,7 @@ omdev/interp/cli.py,sha256=sh7PZQoLletUViw1Y9OXNr9ekyNZ6YyxYuOQ_n9hyqU,2072
 omdev/interp/inspect.py,sha256=55_il4ehoW6Q468YE57w5CyZxHLNsndkRIH4W80OplM,2848
 omdev/interp/providers.py,sha256=PFEjozW0c33eqg8sno-GHMKbhVUzQF9jrAx-M0uQimk,1787
 omdev/interp/pyenv.py,sha256=rHps4saqLxp-udbZp-5RpFxNhZNQc6plqIvaCQpNBHo,13837
-omdev/interp/resolvers.py,sha256=tpzlmqGp1C4QKdA6TfcPmtmaygu7mb6WK2RPSbyNQ6s,3022
+omdev/interp/resolvers.py,sha256=O4QTqWGL7KXiJl3JN5BlbqT52FbhycrDSRd7M_jTeRs,3030
 omdev/interp/standalone.py,sha256=XcltiL7ypcfV89C82_3knQ3Kx7aW4wnnxf2056ZXC3A,7731
 omdev/interp/system.py,sha256=bI-JhX4GVJqW7wMxnIa-DGJWnCLmFcIsnl9pc1RGY2g,3513
 omdev/interp/types.py,sha256=EMN3StEMkFoQAMUIZd7JYL4uUWqzFGY-2hTL8EBznYM,2437
@@ -84,10 +84,8 @@ omdev/magic/find.py,sha256=tTmpWXAleaXG3_kNOsRF7s8D0CpYMXbdz6-HbCNBW90,7070
 omdev/magic/magic.py,sha256=h1nxoW6CV1MRCiHjDt3sO4kmG0qTtTRbkDNiPLGo2BE,224
 omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
 omdev/magic/styles.py,sha256=YQ-HgwfvFWPj-o_705E7A-yehEn1G1hRNLPWpeWCK0U,605
-omdev/manifests/__init__.py,sha256=P2B0dpT8D7l5lJwRGPA92IcQj6oeXfd90X5-q9BJrKg,51
-omdev/manifests/build.py,sha256=E7BelbrJEJes-BEbAUZCVLVs79sYuC0fbthgXAoxaOk,10865
-omdev/manifests/load.py,sha256=LtEsluDdd8CkNGj0QGBxee3twBn095Fru0xz2mtr7uk,4788
-omdev/manifests/types.py,sha256=Jv6PAdVLPb9Hh4y6vDhPlWuMNBBViin1bC_u83jfsH4,234
+omdev/manifests/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
+omdev/manifests/build.py,sha256=yFrMf1HUMlLFSV-VfDg0IwbHAAoWNmM2rJj7ZaXwwro,10913
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/mypy/debug.py,sha256=WcZw-3Z1njg_KFGqi3DB6RuqbBa3dLArJnjVCuY1Mn0,3003
 omdev/packaging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -102,7 +100,7 @@ omdev/precheck/base.py,sha256=a_lGoFM-QhL8u8XDUYFhb-feEyfPbP4j8lcmNO51sHY,732
 omdev/precheck/git.py,sha256=APC5Ln7x0zDrQiGPRWPsBcVJK3vWhbU-brqR5M63JQA,849
 omdev/precheck/lite.py,sha256=z99pgTO4SAmLEqSj6qaKd4hcs0WpwixYkQZn75lZRX8,3883
 omdev/precheck/main.py,sha256=wryjWMXEa-9dmfdcvU_1uVwWw_GtCcoknXfUOyZvdw8,2872
-omdev/precheck/manifests.py,sha256=YfXqt6u0hlFXY0QkBMec6V_6Y9T4eCVAmrJDkQkB13U,774
+omdev/precheck/manifests.py,sha256=JNWxY3e5uFsJJSjjOeZZJE9mEkV6o7Y4I89D-UIXWyg,780
 omdev/precheck/scripts.py,sha256=Xw9kkQzlDd_2V9av9qlaNpNZG9jZdy3TTo7x60MeR2I,1273
 omdev/ptk/__init__.py,sha256=QIu7cMeCKgNiXvIt7pXTESToJLuRMN0Qsxns_Z7ci0k,641
 omdev/ptk/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,8 +120,8 @@ omdev/scripts/bumpversion.py,sha256=Kn7fo73Hs8uJh3Hi3EIyLOlzLPWAC6dwuD_lZ3cIzuY,
 omdev/scripts/execrss.py,sha256=mR0G0wERBYtQmVIn63lCIIFb5zkCM6X_XOENDFYDBKc,651
 omdev/scripts/exectime.py,sha256=sFb376GflU6s9gNX-2-we8hgH6w5MuQNS9g6i4SqJIo,610
 omdev/scripts/importtrace.py,sha256=oa7CtcWJVMNDbyIEiRHej6ICfABfErMeo4_haIqe18Q,14041
-omdev/scripts/interp.py,sha256=Xzki1bTvF2uahDrK65_A-lbN29W67jE4t7v8SY__F44,74287
-omdev/scripts/pyproject.py,sha256=rxjEsErhrVmoOhX8RYZ0i77D13VKaE7uGFveu--bGtk,179110
+omdev/scripts/interp.py,sha256=nda-QHD-do9MVfXrDlfqdaEXdNwacil48RHd3OG0DIw,74295
+omdev/scripts/pyproject.py,sha256=SW4lGBmdgoXD_2ekbeIj-LIGMqSnQoTV36eXWuvyhik,179659
 omdev/scripts/slowcat.py,sha256=lssv4yrgJHiWfOiHkUut2p8E8Tq32zB-ujXESQxFFHY,2728
 omdev/scripts/tmpexec.py,sha256=WTYcf56Tj2qjYV14AWmV8SfT0u6Y8eIU6cKgQRvEK3c,1442
 omdev/toml/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
@@ -132,8 +130,8 @@ omdev/toml/writer.py,sha256=lk3on3YXVbWuLJa-xsOzOhs1bBAT1vXqw4mBbluZl_w,3040
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=13lUsYLyn1LoelhsCeKrRkIwwPE0x54JmdhXJ_lvWh0,3811
 omdev/tools/doc.py,sha256=mv9XfitzqXl3vFHSenv01xHCxWf8g03rUAb_sqoty98,2556
-omdev/tools/docker.py,sha256=k2BrVvFYwyGov064CPHd_HWo9aqR1zHc2UeEsVwPth4,6827
-omdev/tools/git.py,sha256=bfhYUFip7zVxtsyXk8yEFbK2y2zguhvgraLhXc7A53M,6899
+omdev/tools/docker.py,sha256=jRmKn2fiDy6szeC3MA-mN34EuU_Pbc_jWtnPJG6LIac,7141
+omdev/tools/git.py,sha256=WJ7iEsC5UkMnsCv8jN5FAcjj8cURF_nK4pcaZQjY6NY,6976
 omdev/tools/importscan.py,sha256=nhJIhtjDY6eFVlReP7fegvv6L5ZjN-Z2VeyhsBonev4,4639
 omdev/tools/mkrelimp.py,sha256=wsJAjTIf3nqcSfnT9TkDpS1VUOoM9W2Az5tZdWuzyLM,4054
 omdev/tools/notebook.py,sha256=M8Xi_gfZdlahnyFLtp0RBgYZPSHWQStMMDYZc71Zync,3494
@@ -145,16 +143,16 @@ omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
 omdev/tools/json/formats.py,sha256=XHabWAQnAQ9uNS7fHu3mdgxoptWw00RVLq08uadD6kk,1753
-omdev/tools/json/io.py,sha256=IoJ5asjS_gUan5TcrGgS0KpJaiSE5YQgEGljFMCcDto,1427
+omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=QLsdYv-fRFNIWwy8KLr19fQ5RodiQEX2hIw4jndnEXM,2180
 omdev/tools/json/processing.py,sha256=iFm5VqaxJ97WHaun2ed7NEjMxhFeJqf28bLNfoDJft0,1209
 omdev/tools/json/rendering.py,sha256=jNShMfCpFR9-Kcn6cUFuOChXHjg71diuTC4x7Ofmz-o,2240
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev144.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev144.dist-info/METADATA,sha256=zSYVvh5IUY6zP4Wn5I2TAlHKzLDdlRGccLePdsDiY0A,1760
-omdev-0.0.0.dev144.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omdev-0.0.0.dev144.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev144.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev144.dist-info/RECORD,,
+omdev-0.0.0.dev146.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev146.dist-info/METADATA,sha256=IOaFWNLrbiDx0sOwGaw5D3Ae874Vk2qCBZE_-B88Blo,1760
+omdev-0.0.0.dev146.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omdev-0.0.0.dev146.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev146.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev146.dist-info/RECORD,,

omdev/manifests/load.py

@@ -1,165 +0,0 @@
-"""
-Should be kept somewhat lightweight - used in cli entrypoints.
-
-TODO:
- - persisted caching support - {pkg_name: manifests}
-"""
-# ruff: noqa: UP006 UP007
-import dataclasses as dc
-import importlib.machinery
-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_contents(self, obj: ta.Any, pkg_name: str) -> ta.Sequence[Manifest]:
-        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)
-
-        return lst
-
-    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 = self.load_contents(obj, pkg_name)
-
-        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]:
-        # This is a fat dep so do it late.
-        import importlib.metadata
-
-        return [
-            ep.value
-            for ep in importlib.metadata.entry_points(group=self.ENTRY_POINT_GROUP)
-        ]

omdev/manifests/types.py

@@ -1,16 +0,0 @@
-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