omlish 0.0.0.dev27__py3-none-any.whl → 0.0.0.dev29__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev27'
-__revision__ = 'c62e03dc2f032aa532d2c2b9f0d71ff96158cdec'
+__version__ = '0.0.0.dev29'
+__revision__ = 'cde08614ca06e103fcae31adbb677c772002aef1'
 
 
 #
@@ -30,7 +30,7 @@ class Project(ProjectBase):
 
     optional_dependencies = {
         'async': [
-            'anyio ~= 4.4',
+            'anyio ~= 4.5',
             'sniffio ~= 1.3',
 
             'greenlet ~= 3.1',
@@ -70,8 +70,6 @@ class Project(ProjectBase):
         ],
 
         'misc': [
-            'jinja2 ~= 3.1',
-
             'wrapt ~= 1.14',
         ],
 
@@ -81,7 +79,9 @@ class Project(ProjectBase):
 
         'sql': [
             'sqlalchemy[asyncio] ~= 2.0',
+        ],
 
+        'sql-drivers': [
             'pg8000 ~= 1.31',
             # 'psycopg2 ~= 2.9',
             # 'psycopg ~= 3.2',
@@ -93,9 +93,7 @@ class Project(ProjectBase):
             'aiomysql ~= 0.2',
             'aiosqlite ~= 0.20',
             'asyncpg ~= 0.29; python_version < "3.13"',
-        ],
 
-        'sqlx': [
             'sqlean.py ~= 3.45; python_version < "3.13"',
 
             'duckdb ~= 1.1',

omlish/collections/treap.py

@@ -17,7 +17,6 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER I
 OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 # ruff: noqa: SLF001
-
 import typing as ta
 
 

omlish/dataclasses/impl/api.py

@@ -36,6 +36,7 @@ def field(  # noqa
         check_type: bool | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
+        frozen: bool | None = None,
 ):  # -> dc.Field
     if default is not MISSING and default_factory is not MISSING:
         raise ValueError('cannot specify both default and default_factory')
@@ -47,6 +48,7 @@ def field(  # noqa
         check_type=check_type,
         override=override,
         repr_fn=repr_fn,
+        frozen=frozen,
     )
 
     md: ta.Mapping = {FieldExtras: fx}

omlish/dataclasses/impl/fields.py

@@ -178,6 +178,9 @@ def field_init(
     if fx.derive is not None:
         raise NotImplementedError
 
+    if fx.frozen:
+        raise NotImplementedError
+
     if fx.coerce is not None:
         cn = f'__dataclass_coerce__{f.name}__'
         locals[cn] = fx.coerce

omlish/dataclasses/impl/params.py

@@ -42,12 +42,13 @@ from .metadata import METADATA_ATTR
 
 @dc.dataclass(frozen=True, kw_only=True)
 class FieldExtras(lang.Final):
-    derive: ta.Callable[..., ta.Any] | None = None
+    derive: ta.Callable[..., ta.Any] | None = None  # TODO
     coerce: bool | ta.Callable[[ta.Any], ta.Any] | None = None
     validate: ta.Callable[[ta.Any], bool] | None = None
     check_type: bool | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
+    frozen: bool | None = None  # TODO
 
 
 DEFAULT_FIELD_EXTRAS = FieldExtras()

omlish/docker.py

@@ -170,9 +170,9 @@ _LIKELY_IN_DOCKER_PATTERN = re.compile(r'^overlay / .*/docker/')
 
 
 def is_likely_in_docker() -> bool:
-    if sys.platform != 'linux':
+    if getattr(sys, 'platform') != 'linux':
         return False
-    with open('/proc/mounts') as f:  # type: ignore
+    with open('/proc/mounts') as f:
         ls = f.readlines()
     return any(_LIKELY_IN_DOCKER_PATTERN.match(l) for l in ls)
 

omlish/lang/__init__.py

@@ -98,6 +98,7 @@ from .functions import (  # noqa
     Args,
     VoidError,
     as_async,
+    coalesce,
     constant,
     finally_,
     identity,
@@ -107,6 +108,7 @@ from .functions import (  # noqa
     isinstance_of,
     issubclass_of,
     maybe_call,
+    opt_coalesce,
     periodically,
     raise_,
     raising,

omlish/lang/descriptors.py

@@ -57,11 +57,6 @@ def unwrap_method_descriptors(fn: ta.Callable) -> ta.Callable:
 ##
 
 
-def unwrap_func(fn: ta.Callable) -> ta.Callable:
-    fn, _ = unwrap_func_with_partials(fn)
-    return fn
-
-
 def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functools.partial]]:
     ps = []
     while True:
@@ -88,6 +83,11 @@ def unwrap_func_with_partials(fn: ta.Callable) -> tuple[ta.Callable, list[functo
     return fn, ps
 
 
+def unwrap_func(fn: ta.Callable) -> ta.Callable:
+    uw, _ = unwrap_func_with_partials(fn)
+    return uw
+
+
 ##
 
 

omlish/lang/functions.py

@@ -183,3 +183,20 @@ class Args:
 
     def __call__(self, fn: ta.Callable[..., T]) -> T:
         return fn(*self.args, **self.kwargs)
+
+
+##
+
+
+def coalesce(*vs: T | None) -> T:
+    for v in vs:
+        if v is not None:
+            return v
+    raise ValueError('No value given')
+
+
+def opt_coalesce(*vs: T | None) -> T | None:
+    for v in vs:
+        if v is not None:
+            return v
+    return None

omlish/lite/secrets.py

@@ -20,3 +20,17 @@ class Secret:
 
     def reveal(self) -> str:
         return getattr(self, self._VALUE_ATTR)()
+
+    #
+
+    def __reduce__(self) -> ta.NoReturn:
+        raise TypeError
+
+    def __reduce_ex__(self, protocol) -> ta.NoReturn:
+        raise TypeError
+
+    def __getstate__(self) -> ta.NoReturn:
+        raise TypeError
+
+    def __setstate__(self, state) -> ta.NoReturn:
+        raise TypeError

omlish/marshal/__init__.py

@@ -55,8 +55,13 @@ from .helpers import (  # noqa
 )
 
 from .objects import (  # noqa
+    FieldInfo,
     FieldMetadata,
+    ObjectMarshaler,
     ObjectMetadata,
+    ObjectUnmarshaler,
+    SimpleObjectMarshalerFactory,
+    SimpleObjectUnmarshalerFactory,
 )
 
 from .polymorphism import (  # noqa

omlish/marshal/objects.py

@@ -9,6 +9,7 @@ import typing as ta
 
 from .. import check
 from .. import dataclasses as dc
+from .. import reflect as rfl
 from .base import MarshalContext
 from .base import Marshaler
 from .base import MarshalerFactory
@@ -87,6 +88,27 @@ class ObjectMarshaler(Marshaler):
         return ret
 
 
+@dc.dataclass(frozen=True)
+class SimpleObjectMarshalerFactory(MarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    def guard(self, ctx: MarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
+        ty = check.isinstance(rty, type)
+        flds = self.dct[ty]
+        fields = [
+            (fi, ctx.make(fi.type))
+            for fi in flds
+        ]
+        return ObjectMarshaler(
+            fields,
+            unknown_field=self.unknown_field,
+        )
+
+
 ##
 
 
@@ -123,3 +145,26 @@ class ObjectUnmarshaler(Unmarshaler):
             kw[fi.name] = u.unmarshal(ctx, mv)
 
         return self.cls(**kw)
+
+
+@dc.dataclass(frozen=True)
+class SimpleObjectUnmarshalerFactory(UnmarshalerFactory):
+    dct: ta.Mapping[type, ta.Sequence[FieldInfo]]
+    unknown_field: str | None = None
+
+    def guard(self, ctx: UnmarshalContext, rty: rfl.Type) -> bool:
+        return isinstance(rty, type) and rty in self.dct
+
+    def fn(self, ctx: UnmarshalContext, rty: rfl.Type) -> Unmarshaler:
+        ty = check.isinstance(rty, type)
+        flds = self.dct[ty]
+        fields_by_unmarshal_name = {
+            n: (fi, ctx.make(fi.type))
+            for fi in flds
+            for n in fi.unmarshal_names
+        }
+        return ObjectUnmarshaler(
+            ty,
+            fields_by_unmarshal_name,
+            unknown_field=self.unknown_field,
+        )

omlish/{math.py → math/bits.py}

@@ -1,15 +1,10 @@
 import functools
-import struct
 import typing as ta
 
 
 ##
 
 
-def isclose(a: float, b: float, *, rel_tol: float = 1e-09, abs_tol: float = 0.0) -> float:
-    return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
-
-
 def get_bit(bit: int, value: int) -> int:
     return (value >> bit) & 1
 
@@ -29,14 +24,6 @@ def set_bits(bits_from: int, num_bits: int, bits_value: int, value: int) -> int:
     return value & ~(((1 << num_bits) - 1) << bits_from) | (bits_value << bits_from)
 
 
-def float_to_bytes(f: float) -> bytes:
-    return struct.pack('>f', f)
-
-
-def bytes_to_float(b: bytes) -> float:
-    return struct.unpack('>f', b)[0]
-
-
 ##
 
 

omlish/math/floats.py

@@ -0,0 +1,13 @@
+import struct
+
+
+def isclose(a: float, b: float, *, rel_tol: float = 1e-09, abs_tol: float = 0.0) -> float:
+    return abs(a - b) <= max(rel_tol * max(abs(a), abs(b)), abs_tol)
+
+
+def float_to_bytes(f: float) -> bytes:
+    return struct.pack('>f', f)
+
+
+def bytes_to_float(b: bytes) -> float:
+    return struct.unpack('>f', b)[0]

omlish/{stats.py → math/stats.py}

@@ -3,6 +3,7 @@ TODO:
  - reservoir
  - dep tdigest?
  - struct-of-arrays - array.array('f', ...) - backed SamplingHistogram
+ - https://docs.python.org/3/library/statistics.html
 """
 import bisect
 import collections
@@ -14,8 +15,8 @@ import random
 import time
 import typing as ta
 
-from . import cached
-from . import check
+from .. import cached
+from .. import check
 
 
 ##

omlish/text/asdl.py

@@ -0,0 +1,529 @@
+"""
+https://github.com/python/cpython/blob/21d2a9ab2f4dcbf1be462d3b7f7a231a46bc1cb7/Parser/asdl.py
+
+-------------------------------------------------------------------------------
+
+Parser for ASDL [1] definition files. Reads in an ASDL description and parses it into an AST that describes it.
+
+The EBNF we're parsing here: Figure 1 of the paper [1]. Extended to support modules and attributes after a product.
+Words starting with Capital letters are terminals. Literal tokens are in "double quotes". Others are non-terminals. Id
+is either TokenId or ConstructorId.
+
+module        ::= "module" Id "{" [definitions] "}"
+definitions   ::= { TypeId "=" type }
+type          ::= product | sum
+product       ::= fields ["attributes" fields]
+fields        ::= "(" { field, "," } field ")"
+field         ::= TypeId ["?" | "*"] [Id]
+sum           ::= constructor { "|" constructor } ["attributes" fields]
+constructor   ::= ConstructorId [fields]
+
+[1] "The Zephyr Abstract Syntax Description Language" by Wang, et. al. See http://asdl.sourceforge.net/
+"""
+# PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
+# --------------------------------------------
+#
+# 1. This LICENSE AGREEMENT is between the Python Software Foundation ("PSF"), and the Individual or Organization
+# ("Licensee") accessing and otherwise using this software ("Python") in source or binary form and its associated
+# documentation.
+#
+# 2. Subject to the terms and conditions of this License Agreement, PSF hereby grants Licensee a nonexclusive,
+# royalty-free, world-wide license to reproduce, analyze, test, perform and/or display publicly, prepare derivative
+# works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License
+# Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights
+# Reserved" are retained in Python alone or in any derivative version prepared by Licensee.
+#
+# 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and
+# wants to make the derivative work available to others as provided herein, then Licensee hereby agrees to include in
+# any such work a brief summary of the changes made to Python.
+#
+# 4. PSF is making Python available to Licensee on an "AS IS" basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES,
+# EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY
+# OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY THIRD PARTY
+# RIGHTS.
+#
+# 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL
+# DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY DERIVATIVE THEREOF, EVEN IF
+# ADVISED OF THE POSSIBILITY THEREOF.
+#
+# 6. This License Agreement will automatically terminate upon a material breach of its terms and conditions.
+#
+# 7. Nothing in this License Agreement shall be deemed to create any relationship of agency, partnership, or joint
+# venture between PSF and Licensee.  This License Agreement does not grant permission to use PSF trademarks or trade
+# name in a trademark sense to endorse or promote products or services of Licensee, or any third party.
+#
+# 8. By copying, installing or otherwise using Python, Licensee agrees to be bound by the terms and conditions of this
+# License Agreement.
+# ruff: noqa: N802
+import abc
+import dataclasses as dc
+import enum
+import re
+import typing as ta
+
+from .. import cached
+from .. import check
+
+
+##
+
+
+# The following classes define nodes into which the Asdl description is parsed. Note: this is a "meta-AST". Asdl files
+# (such as Python.asdl) describe the AST structure used by a programming language. But Asdl files themselves need to be
+# parsed. This module parses Asdl files and uses a simple AST to represent them. See the EBNF at the top of the file to
+# understand the logical connection between the various node types.
+
+class Ast(abc.ABC):
+    @abc.abstractmethod
+    def __repr__(self) -> str:
+        raise NotImplementedError
+
+
+@dc.dataclass(frozen=True)
+class Field(Ast):
+    type: str
+    name: str | None = None
+    seq: bool = False
+    opt: bool = False
+
+    def __str__(self) -> str:
+        if self.seq:
+            extra = '*'
+        elif self.opt:
+            extra = '?'
+        else:
+            extra = ''
+
+        return f'{self.type}{extra} {self.name}'
+
+    def __repr__(self) -> str:
+        if self.seq:
+            extra = ', seq=True'
+        elif self.opt:
+            extra = ', opt=True'
+        else:
+            extra = ''
+        if self.name is None:
+            return f'Field({self.type}{extra})'
+        else:
+            return f'Field({self.type}, {self.name}{extra})'
+
+
+@dc.dataclass(frozen=True)
+class Constructor(Ast):
+    name: str
+    fields: ta.Sequence[Field] | None = None
+
+    def __repr__(self) -> str:
+        return f'Constructor({self.name}, {self.fields})'
+
+
+@dc.dataclass(frozen=True)
+class Sum(Ast):
+    types: ta.Sequence[Constructor]
+    attributes: ta.Sequence[Field] | None = None
+
+    def __repr__(self) -> str:
+        if self.attributes:
+            return f'Sum({self.types}, {self.attributes})'
+        else:
+            return f'Sum({self.types})'
+
+
+@dc.dataclass(frozen=True)
+class Product(Ast):
+    fields: ta.Sequence[Field]
+    attributes: ta.Sequence[Field] | None = None
+
+    def __repr__(self) -> str:
+        if self.attributes:
+            return f'Product({self.fields}, {self.attributes})'
+        else:
+            return f'Product({self.fields})'
+
+
+@dc.dataclass(frozen=True)
+class Type(Ast):
+    name: str
+    value: Sum | Product
+
+    def __repr__(self) -> str:
+        return f'Type({self.name}, {self.value})'
+
+
+@dc.dataclass(frozen=True)
+class Module(Ast):
+    name: str
+    dfns: ta.Sequence[Type]
+
+    @cached.property
+    def types(self) -> ta.Mapping[str, Sum | Product]:
+        return {ty.name: ty.value for ty in self.dfns}
+
+    def __repr__(self) -> str:
+        return f'Module({self.name}, {self.dfns})'
+
+
+##
+
+
+# A generic visitor for the meta-Ast that describes Asdl. This can be used by emitters. Note that this visitor does not
+# provide a generic visit method, so a subclass needs to define visit methods from visitModule to as deep as the
+# interesting node.
+# We also define a Check visitor that makes sure the parsed Asdl is well-formed.
+
+class VisitorBase:
+    """Generic tree visitor for Asts."""
+
+    def __init__(self) -> None:
+        super().__init__()
+        self.cache: dict[type, ta.Any] = {}
+
+    def visit(self, obj, *args):
+        klass = obj.__class__
+        meth = self.cache.get(klass)
+        if meth is None:
+            methname = 'visit' + klass.__name__
+            meth = getattr(self, methname, None)
+            self.cache[klass] = meth
+        if meth:
+            try:
+                meth(obj, *args)
+            except Exception as e:
+                raise Exception(f'Error visiting {obj!r}') from e
+
+
+##
+
+
+BUILTIN_TYPES: ta.AbstractSet[str] = {
+    'identifier',
+    'string',
+    'int',
+    'constant',
+}
+
+
+##
+
+
+# Types for describing tokens in an Asdl specification.
+class TokenKind(enum.IntEnum):
+    """TokenKind is provides a scope for enumerated token kinds."""
+
+    CONSTRUCTOR_ID = enum.auto()
+    TYPE_ID = enum.auto()
+    EQUALS = enum.auto()
+    COMMA = enum.auto()
+    QUESTION = enum.auto()
+    PIPE = enum.auto()
+    ASTERISK = enum.auto()
+    L_PAREN = enum.auto()
+    R_PAREN = enum.auto()
+    L_BRACE = enum.auto()
+    R_BRACE = enum.auto()
+
+
+OPERATOR_TABLE: ta.Mapping[str, TokenKind] = {
+    '=': TokenKind.EQUALS,
+    ',': TokenKind.COMMA,
+    '?': TokenKind.QUESTION,
+    '|': TokenKind.PIPE,
+    '(': TokenKind.L_PAREN,
+    ')': TokenKind.R_PAREN,
+    '*': TokenKind.ASTERISK,
+    '{': TokenKind.L_BRACE,
+    '}': TokenKind.R_BRACE,
+}
+
+
+@dc.dataclass(frozen=True)
+class Token:
+    kind: TokenKind
+    value: str
+    lineno: int
+
+
+class AsdlSyntaxError(Exception):
+    def __init__(self, msg: str, lineno: int | None = None) -> None:
+        super().__init__()
+        self.msg = msg
+        self.lineno = lineno or '<unknown>'
+
+    def __str__(self) -> str:
+        return f'Syntax error on line {self.lineno}: {self.msg}'
+
+
+def tokenize_asdl(buf: str) -> ta.Iterator[Token]:
+    """Tokenize the given buffer. Yield Token objects."""
+
+    for lineno, line in enumerate(buf.splitlines(), 1):
+        for m in re.finditer(r'\s*(\w+|--.*|.)', line.strip()):
+            c = m.group(1)
+            if c[0].isalpha():
+                # Some kind of identifier
+                if c[0].isupper():
+                    yield Token(TokenKind.CONSTRUCTOR_ID, c, lineno)
+                else:
+                    yield Token(TokenKind.TYPE_ID, c, lineno)
+            elif c[:2] == '--':
+                # Comment
+                break
+            else:
+                # Operators
+                try:
+                    op_kind = OPERATOR_TABLE[c]
+                except KeyError:
+                    raise AsdlSyntaxError(f'Invalid operator {c}', lineno)  # noqa
+                yield Token(op_kind, c, lineno)
+
+
+##
+
+
+class AsdlParser:
+    """
+    Parser for Asdl files.
+
+    Create, then call the parse method on a buffer containing Asdl. This is a simple recursive descent parser that uses
+    tokenize_asdl for the lexing.
+    """
+
+    def __init__(self) -> None:
+        super().__init__()
+        self._tokenizer: ta.Iterator[Token] | None = None
+        self.cur_token: Token | None = None
+
+    def cur(self) -> Token:
+        return check.not_none(self.cur_token)
+
+    def parse(self, buf: str) -> Module:
+        """Parse the Asdl in the buffer and return an Ast with a Module root."""
+
+        self._tokenizer = tokenize_asdl(buf)
+        self._advance()
+        return self._parse_module()
+
+    def _parse_module(self) -> Module:
+        if self._at_keyword('module'):
+            self._advance()
+        else:
+            raise AsdlSyntaxError(f'Expected "module" (found {self.cur().value})', self.cur().lineno)  # noqa
+        name = self._match(self._id_kinds)
+        self._match(TokenKind.L_BRACE)
+        defs = self._parse_definitions()
+        self._match(TokenKind.R_BRACE)
+        return Module(name, defs)
+
+    def _parse_definitions(self) -> ta.Sequence[Type]:
+        defs = []
+        while self.cur().kind == TokenKind.TYPE_ID:
+            typename = check.non_empty_str(self._advance())
+            self._match(TokenKind.EQUALS)
+            ty = self._parse_type()
+            defs.append(Type(typename, ty))
+        return defs
+
+    def _parse_type(self) -> Sum | Product:
+        if self.cur().kind == TokenKind.L_PAREN:
+            # If we see a (, it's a product
+            return self._parse_product()
+        else:
+            # Otherwise it's a sum. Look for ConstructorId
+            sumlist = [Constructor(self._match(TokenKind.CONSTRUCTOR_ID), self._parse_optional_fields())]
+            while self.cur().kind == TokenKind.PIPE:
+                # More constructors
+                self._advance()
+                sumlist.append(Constructor(
+                    self._match(TokenKind.CONSTRUCTOR_ID),
+                    self._parse_optional_fields()),
+                )
+            return Sum(sumlist, self._parse_optional_attributes())
+
+    def _parse_product(self) -> Product:
+        return Product(self._parse_fields(), self._parse_optional_attributes())
+
+    def _parse_fields(self) -> ta.Sequence[Field]:
+        fields = []
+        self._match(TokenKind.L_PAREN)
+        while self.cur().kind == TokenKind.TYPE_ID:
+            typename = check.non_empty_str(self._advance())
+            is_seq, is_opt = self._parse_optional_field_quantifier()
+            id = self._advance() if self.cur().kind in self._id_kinds else None  # noqa
+            fields.append(Field(typename, id, seq=is_seq, opt=is_opt))
+            if self.cur().kind == TokenKind.R_PAREN:
+                break
+            elif self.cur().kind == TokenKind.COMMA:
+                self._advance()
+        self._match(TokenKind.R_PAREN)
+        return fields
+
+    def _parse_optional_fields(self) -> ta.Sequence[Field] | None:
+        if self.cur().kind == TokenKind.L_PAREN:
+            return self._parse_fields()
+        else:
+            return None
+
+    def _parse_optional_attributes(self) -> ta.Sequence[Field] | None:
+        if self._at_keyword('attributes'):
+            self._advance()
+            return self._parse_fields()
+        else:
+            return None
+
+    def _parse_optional_field_quantifier(self) -> tuple[bool, bool]:  # (seq, opt)
+        is_seq, is_opt = False, False
+        if self.cur().kind == TokenKind.ASTERISK:
+            is_seq = True
+            self._advance()
+        elif self.cur().kind == TokenKind.QUESTION:
+            is_opt = True
+            self._advance()
+        return is_seq, is_opt
+
+    def _advance(self) -> str | None:
+        """Return the value of the current token and read the next one into self.cur_token."""
+
+        cur_val = None if self.cur_token is None else self.cur_token.value
+        try:
+            self.cur_token = next(check.not_none(self._tokenizer))
+        except StopIteration:
+            self.cur_token = None
+        return cur_val
+
+    _id_kinds = (TokenKind.CONSTRUCTOR_ID, TokenKind.TYPE_ID)
+
+    def _match(self, kind: TokenKind | tuple[TokenKind, ...]) -> str:
+        """
+        The 'match' primitive of RD parsers.
+
+        * Verifies that the current token is of the given kind (kind can be a tuple, in which the kind must match one of
+          its members).
+        * Returns the value of the current token
+        * Reads in the next token
+        """
+
+        if isinstance(kind, tuple) and self.cur().kind in kind or self.cur().kind == kind:
+            value = self.cur().value
+            self._advance()
+            return value
+        else:
+            raise AsdlSyntaxError(
+                f'Unmatched {kind} (found {self.cur().kind})',
+                self.cur().lineno,
+            )
+
+    def _at_keyword(self, keyword: str) -> bool:
+        return self.cur().kind == TokenKind.TYPE_ID and self.cur().value == keyword
+
+
+##
+
+
+FlatFieldArity: ta.TypeAlias = ta.Literal[1, '?', '*']
+
+
+@dc.dataclass(frozen=True)
+class FlatField:
+    name: str
+    type: str
+    n: FlatFieldArity = 1
+
+
+@dc.dataclass(frozen=True)
+class FlatNode(abc.ABC):
+    name: str
+    fields: ta.Sequence[FlatField] = dc.field(default=(), kw_only=True)
+    attributes: ta.Sequence[FlatField] = dc.field(default=(), kw_only=True)
+
+
+@dc.dataclass(frozen=True)
+class FlatSum(FlatNode):
+    constructors: ta.Sequence[str] = dc.field(default=(), kw_only=True)
+
+
+@dc.dataclass(frozen=True)
+class FlatProduct(FlatNode):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class FlatConstructor(FlatNode):
+    sum: str = dc.field(kw_only=True)
+
+
+def flatten(mod: Module) -> ta.Mapping[str, FlatNode]:
+    lst: list[FlatNode] = []
+
+    def mk_field(af: Field) -> FlatField:
+        return FlatField(
+            check.non_empty_str(af.name),
+            af.type,
+            n='*' if af.seq else '?' if af.opt else 1,
+        )
+
+    def mk_fields(afs: ta.Iterable[Field] | None) -> ta.Sequence[FlatField]:
+        return list(map(mk_field, afs or []))
+
+    for ty in mod.dfns:
+        v = ty.value
+
+        if isinstance(v, Sum):
+            lst.append(FlatSum(
+                ty.name,
+                attributes=mk_fields(v.attributes),
+                constructors=[c.name for c in v.types],
+            ))
+
+            for c in v.types:
+                lst.append(FlatConstructor(
+                    c.name,
+                    fields=mk_fields(c.fields),
+                    attributes=mk_fields(v.attributes),
+                    sum=ty.name,
+                ))
+
+        elif isinstance(v, Product):
+            lst.append(FlatProduct(
+                ty.name,
+                fields=mk_fields(v.fields),
+                attributes=mk_fields(v.attributes),
+            ))
+
+        else:
+            raise TypeError(v)
+
+    #
+
+    dct: dict[str, FlatNode] = {}
+
+    for n in lst:
+        if n.name in dct:
+            raise KeyError(n.name)
+        dct[n.name] = n
+
+    return dct
+
+
+#
+
+
+def build_fields_info(
+        nodes: ta.Mapping[str, FlatNode],
+        *,
+        exclude_builtins: bool = False,
+) -> ta.Mapping[str, ta.Mapping[str, tuple[str, FlatFieldArity]]]:
+    dct: dict[str, dict[str, tuple[str, FlatFieldArity]]] = {}
+    for n in nodes.values():
+        cur = {}
+        f: FlatField
+        for f in [*n.fields, *n.attributes]:
+            if f.type in BUILTIN_TYPES:
+                if exclude_builtins:
+                    continue
+            elif f.type not in nodes:
+                raise KeyError(f.type)
+            cur[f.name] = (f.type, f.n)
+        if cur:
+            dct[n.name] = cur
+    return dct

omlish/text/parts.py

@@ -30,7 +30,7 @@ def _check_part(o: PartT) -> PartT:
     return o
 
 
-def _check_optional_part(o: PartT | None) -> PartT | None:
+def _check_opt_part(o: PartT | None) -> PartT | None:
     if o is None:
         return None
     return _check_part(o)
@@ -49,7 +49,7 @@ class Wrap(DataPart, lang.Final):
 
 
 class List(DataPart, lang.Final):
-    parts: ta.Sequence[Part | None] = dc.xfield(coerce=col.seq_of(_check_optional_part))
+    parts: ta.Sequence[Part | None] = dc.xfield(coerce=col.seq_of(_check_opt_part))
     delimiter: str = dc.field(default=',')  # FIXME: , check_type=str)
     trailer: bool = dc.field(default=False)  # FIXME: , check_type=bool)
 

{omlish-0.0.0.dev27.dist-info → omlish-0.0.0.dev29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev27
+Version: 0.0.0.dev29
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause
@@ -13,7 +13,7 @@ Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
 Provides-Extra: all
-Requires-Dist: anyio ~=4.4 ; extra == 'all'
+Requires-Dist: anyio ~=4.5 ; extra == 'all'
 Requires-Dist: sniffio ~=1.3 ; extra == 'all'
 Requires-Dist: greenlet ~=3.1 ; extra == 'all'
 Requires-Dist: trio ~=0.26 ; extra == 'all'
@@ -29,7 +29,6 @@ Requires-Dist: json5 ~=0.9 ; extra == 'all'
 Requires-Dist: pyyaml ~=5.0 ; extra == 'all'
 Requires-Dist: cloudpickle ~=3.0 ; extra == 'all'
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'all'
-Requires-Dist: jinja2 ~=3.1 ; extra == 'all'
 Requires-Dist: wrapt ~=1.14 ; extra == 'all'
 Requires-Dist: cryptography ~=43.0 ; extra == 'all'
 Requires-Dist: sqlalchemy[asyncio] ~=2.0 ; extra == 'all'
@@ -43,7 +42,7 @@ Requires-Dist: python-snappy ~=0.7 ; (python_version < "3.13") and extra == 'all
 Requires-Dist: asyncpg ~=0.29 ; (python_version < "3.13") and extra == 'all'
 Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'all'
 Provides-Extra: async
-Requires-Dist: anyio ~=4.4 ; extra == 'async'
+Requires-Dist: anyio ~=4.5 ; extra == 'async'
 Requires-Dist: sniffio ~=1.3 ; extra == 'async'
 Requires-Dist: greenlet ~=3.1 ; extra == 'async'
 Requires-Dist: trio ~=0.26 ; extra == 'async'
@@ -65,20 +64,19 @@ Requires-Dist: cloudpickle ~=3.0 ; extra == 'formats'
 Provides-Extra: http
 Requires-Dist: httpx[http2] ~=0.27 ; extra == 'http'
 Provides-Extra: misc
-Requires-Dist: jinja2 ~=3.1 ; extra == 'misc'
 Requires-Dist: wrapt ~=1.14 ; extra == 'misc'
 Provides-Extra: secrets
 Requires-Dist: cryptography ~=43.0 ; extra == 'secrets'
 Provides-Extra: sql
 Requires-Dist: sqlalchemy[asyncio] ~=2.0 ; extra == 'sql'
-Requires-Dist: pg8000 ~=1.31 ; extra == 'sql'
-Requires-Dist: pymysql ~=1.1 ; extra == 'sql'
-Requires-Dist: aiomysql ~=0.2 ; extra == 'sql'
-Requires-Dist: aiosqlite ~=0.20 ; extra == 'sql'
-Requires-Dist: asyncpg ~=0.29 ; (python_version < "3.13") and extra == 'sql'
-Provides-Extra: sqlx
-Requires-Dist: duckdb ~=1.1 ; extra == 'sqlx'
-Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'sqlx'
+Provides-Extra: sql-drivers
+Requires-Dist: pg8000 ~=1.31 ; extra == 'sql-drivers'
+Requires-Dist: pymysql ~=1.1 ; extra == 'sql-drivers'
+Requires-Dist: aiomysql ~=0.2 ; extra == 'sql-drivers'
+Requires-Dist: aiosqlite ~=0.20 ; extra == 'sql-drivers'
+Requires-Dist: duckdb ~=1.1 ; extra == 'sql-drivers'
+Requires-Dist: asyncpg ~=0.29 ; (python_version < "3.13") and extra == 'sql-drivers'
+Requires-Dist: sqlean.py ~=3.45 ; (python_version < "3.13") and extra == 'sql-drivers'
 Provides-Extra: testing
 Requires-Dist: pytest ~=8.0 ; extra == 'testing'
 

{omlish-0.0.0.dev27.dist-info → omlish-0.0.0.dev29.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=N1F-Xz3GaBn2H1p7uKzhkhKCQV8QVR0t76XD6wmFtXA,3
-omlish/__about__.py,sha256=zjwXesy8pai60AJpe7FV4t72dwRlRVraIytt0d1XmnE,2721
+omlish/__about__.py,sha256=KzvTeQDmeZtJfbz_X82IPqzh5xJ44YhJRVMI4N3c2Ig,2698
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=QRQmX9G0-L_nATkFtGHvpd4qrpYzKATdjuFLbBqzJPM,6224
 omlish/c3.py,sha256=W5EwYx9Por3rWYLkKUitJ6OoRMLLgVTfLTyroOz41Y0,8047
@@ -7,18 +7,16 @@ omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
 omlish/check.py,sha256=3qp1_W8uRp23I26nWvG_c7YFxdTwJAZEFxmY8Bfw50Y,10078
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
-omlish/docker.py,sha256=GyzrHUTdD3rHeDBPGOI_mBzysVDtv5YAo1XN-HnMeo8,6231
+omlish/docker.py,sha256=wipM7Xsx7rUv7-PoBTTT2v0uk3JVan0USljgm2QesXg,6227
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
 omlish/fnpairs.py,sha256=hVuLqQFdRNNze3FYH2cAQO3GC7nK5yQP_GWPUSbL7nE,10601
 omlish/genmachine.py,sha256=LCMiqvK32dAWtrlB6lKw9tXdQFiXC8rRdk4TMQYIroU,1603
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=u0481imCiTFqP_e-v9g0pD-0WD249j5vYzhtn-fnNkY,15308
 omlish/matchfns.py,sha256=ygqbqthRxgF9I1PJaw9Xl7FoZnAVMmnKBrYgimKQ0ag,6152
-omlish/math.py,sha256=AVqp5Y8yxKA-wO0BgrzaxA0Ga3PZiCXnYcwivMneC-0,3804
 omlish/multiprocessing.py,sha256=QZT4C7I-uThCAjaEY3xgUYb-5GagUlnE4etN01LDyU4,5186
 omlish/os.py,sha256=cz4nL2ujaxH_-XRq3JUD8af8mSe1JXGPIoXP9XAEd0M,2607
 omlish/runmodule.py,sha256=PWvuAaJ9wQQn6bx9ftEL3_d04DyotNn8dR_twm2pgw0,700
-omlish/stats.py,sha256=vJOJgYIW6DGDEgNm5AGWIp08GiLk61Cjld71fnC29fY,9998
 omlish/sync.py,sha256=AqwIfIuCMVHLwlJUa7dmaSjfA4sM5AYPCD5-nsz3XVQ,1516
 omlish/term.py,sha256=NEmxqAhicyInGtmFamZAizI2xdu819MzFYPEp0Fx97M,6111
 omlish/asyncs/__init__.py,sha256=uUz9ziKh4_QrgmdhKFMgq6j7mFbiZd3LiogguDCQsGI,587
@@ -50,7 +48,7 @@ omlish/collections/ordered.py,sha256=RzEC3fHvrDeJQSWThVDNYQKke263Vje1II5YwtDwT1Q
 omlish/collections/persistent.py,sha256=KG471s0bhhReQrjlmX0xaN9HeAIcrtT264ddZCxsExo,875
 omlish/collections/skiplist.py,sha256=xjuKZtSScp1VnOi9lpf7I090vGp1DnjA5ELjFhMeGps,5987
 omlish/collections/sorted.py,sha256=E5ZOdNn7Jju1EcQ7CX2Ltk9StIXsBOzqvh7EsT3ZA2U,3354
-omlish/collections/treap.py,sha256=wq9L5hvxq4QgPvIpHmueZMF8t7UrvX5vmlNN4BOqY4g,7720
+omlish/collections/treap.py,sha256=A09ZPacGyJlyRB-Wi4TNj3tE0w-RpFNliPgpDaa6Vwg,7719
 omlish/collections/treapmap.py,sha256=TxOM-ZRF5PK2xe5wRIhESNt7DGh9b_MeZfE7HLkCOs4,5804
 omlish/collections/unmodifiable.py,sha256=QmUEi9IBXqiM_KGgH2rqg15VmkHJo1MZ6kwq2twEMho,4750
 omlish/collections/utils.py,sha256=9o9STwzAn5YjZRZ9ns1kuo7NgLXLaoVPFu6AJd-3JT8,4336
@@ -70,12 +68,12 @@ omlish/dataclasses/__init__.py,sha256=L2kRMvsWgsennXVw7VgZdczCtdLsQzyPcMFit2rBpb
 omlish/dataclasses/utils.py,sha256=qBKHyW2LSjnJYfPSAExEsVZ5EdmDBfp4napAhfWkZFs,3221
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=rQJRcE9fVsGEvRUOZ18r4DE0xiLbSRjspyJRXgbLS3I,348
-omlish/dataclasses/impl/api.py,sha256=PyBMuoamkp77r3OS7TIWKv27cy7laqN2iviq5JoihuE,6339
+omlish/dataclasses/impl/api.py,sha256=UsCUtpHbElFEht0h-LiLKKOwlsrngmryz8jy9HDbNLw,6398
 omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX0,2598
 omlish/dataclasses/impl/copy.py,sha256=Tn8_n6Vohs-w4otbGdubBEvhd3TsSTaM3EfNGdS2LYo,591
 omlish/dataclasses/impl/descriptors.py,sha256=rEYE1Len99agTQCC25hSPMnM19BgPr0ZChABGi58Fdk,2476
 omlish/dataclasses/impl/exceptions.py,sha256=DeiM6rcjgncudn-XVuph9TDbVDEwBtyYb1bcbO3FFcA,193
-omlish/dataclasses/impl/fields.py,sha256=yh2mwXVZW-eOhPesY-BG9sVMWSdn0VqzXNHkbs4Jmok,5987
+omlish/dataclasses/impl/fields.py,sha256=DrFPLlPeJ4dCbbRsuwfx-y47Fx3iSllJP0YM5eq6nIE,6040
 omlish/dataclasses/impl/frozen.py,sha256=x87DSM8FIMZ3c_BIUE8NooCkExFjPsabeqIueEP5qKs,2988
 omlish/dataclasses/impl/hashing.py,sha256=FKnHuXCg9ylrzK2TLGqO5yfRN4HX3F415CSLlVYXtYE,3190
 omlish/dataclasses/impl/init.py,sha256=IgxO9nwHaHF8jGrUAk-Y5xke9uV2OwzfEe-88McE1Wg,6161
@@ -84,7 +82,7 @@ omlish/dataclasses/impl/main.py,sha256=Ti0PKbFKraKvfmoPuR-G7nLVNzRC8mvEuXhCuC-M2
 omlish/dataclasses/impl/metaclass.py,sha256=dlQEIN9MHBirll7Nx3StpzxYxXjrqxJ-QsorMcCNt7w,2828
 omlish/dataclasses/impl/metadata.py,sha256=4veWwTr-aA0KP-Y1cPEeOcXHup9EKJTYNJ0ozIxtzD4,1401
 omlish/dataclasses/impl/order.py,sha256=zWvWDkSTym8cc7vO1cLHqcBhhjOlucHOCUVJcdh4jt0,1369
-omlish/dataclasses/impl/params.py,sha256=1kvL75eptGll9NXqBv66HN94ACwv_tucBRb1cDAvglM,2620
+omlish/dataclasses/impl/params.py,sha256=KOeRuqVgYRa229tstv0whaYvT1SlXWEDLksiBCxxcQ4,2667
 omlish/dataclasses/impl/processing.py,sha256=DFxyFjL_h3awRyF_5eyTnB8QkuApx7Zc4QFnVoltlao,459
 omlish/dataclasses/impl/reflect.py,sha256=a19BbNxrmjNTbXzWuAl_794RCIQSMYyVqQ2Bf-DnNnM,5305
 omlish/dataclasses/impl/replace.py,sha256=wS9GHX4fIwaPv1JBJzIewdBfXyK3X3V7_t55Da87dYo,1217
@@ -164,15 +162,15 @@ omlish/inject/impl/privates.py,sha256=alpCYyk5VJ9lJknbRH2nLVNFYVvFhkj-VC1Vco3zCF
 omlish/inject/impl/providers.py,sha256=QnwhsujJFIHC0JTgd2Wlo1kP53i3CWTrj1nKU2DNxwg,2375
 omlish/inject/impl/proxy.py,sha256=1ko0VaKqzu9UG8bIldp9xtUrAVUOFTKWKTjOCqIGr4s,1636
 omlish/inject/impl/scopes.py,sha256=ASfULXgP_ETlsAqFJfrZmyEaZt64Zr8tNn5ScA-EoXk,5900
-omlish/lang/__init__.py,sha256=WF4vYG4awiOAXezL4gwCjzYu4JpzqU57U-w3c6rzoLw,3500
+omlish/lang/__init__.py,sha256=7GgNUH1ez1N68rkTN1-zKDaVOoDHW-BZ9V_H2LIFfqM,3532
 omlish/lang/cached.py,sha256=LwsgWQjQ5op618rBvI8vbASOEGWDTt_SKq6Tc1vlgZM,7680
 omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
 omlish/lang/contextmanagers.py,sha256=rzMSwJU7ObFXl46r6pGDbD45Zi_qZ9NHxDPnLNuux9o,9732
 omlish/lang/datetimes.py,sha256=ehI_DhQRM-bDxAavnp470XcekbbXc4Gdw9y1KpHDJT0,223
-omlish/lang/descriptors.py,sha256=tZzDyXSp3wMNzTytt9BScFFriBwMRpt0EeYP3CRKPX8,6602
+omlish/lang/descriptors.py,sha256=OLM1qi14kY7PLGIJnvkd6CBEOzHgD9q8Cs2cB6Kzflk,6602
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
-omlish/lang/functions.py,sha256=yJxWwqlXEAT2gied4uTwiz5x1qXeuVubOSXyn9zy5aI,3624
+omlish/lang/functions.py,sha256=kkPfcdocg-OmyN7skIqrFxNvqAv89Zc_kXKYAN8vw8g,3895
 omlish/lang/imports.py,sha256=04ugFC8NI5sbL7NH4V0r0q_nFsP_AMkHLz697CVkMtQ,6274
 omlish/lang/iterables.py,sha256=_q6rHbdFfW3VBqez0IV3rUABoNxsA_oBv_sykm5zsbQ,2243
 omlish/lang/maybes.py,sha256=NYHZDjqDtwPMheDrj2VtUVujxRPf8Qpgk4ZlZCTvBZc,3492
@@ -205,7 +203,7 @@ omlish/lite/logs.py,sha256=PeJZUJWd1K-UFErVs0wtD0zRMFW5-olUNFVVZAj_ScY,5549
 omlish/lite/marshal.py,sha256=u6jYUN_AndvI6__HJBvSw5ElHWC0CfHqgiDS28Vpqjg,8593
 omlish/lite/reflect.py,sha256=9QYJwdINraq1JNMEgvoqeSlVvRRgOXpxAkpgX8EgRXc,1307
 omlish/lite/runtime.py,sha256=VUhmNQvwf8QzkWSKj4Q0ReieJA_PzHaJNRBivfTseow,452
-omlish/lite/secrets.py,sha256=KZvGG7bFrjzIeLwohxsJ0Ctzpi42C-3A1PEMCIszJJs,521
+omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
 omlish/lite/strings.py,sha256=9dO_A6EkhcTZ2xmOUGSOMT-mx9BnoOzYu1-ocSrDJaA,670
 omlish/lite/subprocesses.py,sha256=KuGV3ImehMjCUK0JoV3pUtG_7o5wei1lRDn9HxzByAg,3063
 omlish/logs/__init__.py,sha256=FbOyAW-lGH8gyBlSVArwljdYAU6RnwZLI5LwAfuNnrk,438
@@ -215,7 +213,7 @@ omlish/logs/formatters.py,sha256=q79nMnR2mRIStPyGrydQHpYTXgC5HHptt8lH3W2Wwbs,671
 omlish/logs/handlers.py,sha256=nyuFgmO05By_Xwq7es58ClzS51-F53lJL7gD0x5IqAg,228
 omlish/logs/noisy.py,sha256=8JORjI1dH38yU2MddM54OB6qt32Xozfocdb88vY4wro,335
 omlish/logs/utils.py,sha256=MgGovbP0zUrZ3FGD3qYNQWn-l0jy0Y0bStcQvv5BOmQ,391
-omlish/marshal/__init__.py,sha256=8r5nY0DMVT_kT4hARuTDsa8GOdshko40VEzOq0qNdS8,1628
+omlish/marshal/__init__.py,sha256=RkZGfdp7x9KU8nEpb8hYBGANK-P_9AXMyjBXCrdYMmc,1757
 omlish/marshal/any.py,sha256=e82OyYK3Emm1P1ClnsnxP7fIWC2iNVyW0H5nK4mLmWM,779
 omlish/marshal/base.py,sha256=EIgrqsQ1OQ4mVUMuDH5zRBCwJpn8ijVS98Nmoka_Mrs,6025
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
@@ -232,7 +230,7 @@ omlish/marshal/mappings.py,sha256=zhLtyot7tzQtBNj7C4RBxjMELxA5r2q2Mth8Br7xkFs,28
 omlish/marshal/maybes.py,sha256=tKkVsJATERgbVcEfBnsHBK_2_LCQIVyBzca-cA-9KH0,2112
 omlish/marshal/naming.py,sha256=UCviMAXTTUpW1lyAGymybGP2rFUAW44P1X0zrIVbvi4,464
 omlish/marshal/numbers.py,sha256=oY_yMNJEnJhjfLh89gpPXvKqeUyhQcaTcQB6ecyHiG8,1704
-omlish/marshal/objects.py,sha256=T3prlm0HESpOLXHWcdsYekfmythJRZQOvaoL0is8J_o,3097
+omlish/marshal/objects.py,sha256=R-NPCT1-UZhONTnrsrAvZvAtM2qyQsKZ8CPLfqkSg5g,4494
 omlish/marshal/optionals.py,sha256=r0XB5rqfasvgZJNrKYd6Unq2U4nHt3JURi26j0dYHlw,1499
 omlish/marshal/polymorphism.py,sha256=gyvNYUAkmQVhWrcXBLzXINxqx6RHyulf9n16Iv38PFI,5597
 omlish/marshal/primitives.py,sha256=wcvcs5GH_TWVmzAszh3dvyKibJgBxnXke-AlAXiwrrI,1107
@@ -242,6 +240,10 @@ omlish/marshal/unions.py,sha256=m9uVp2HrkZKY9lDyGoWQGXFgan8mRuBaKimtWNksl64,2635
 omlish/marshal/utils.py,sha256=puKJpwPpuDlMOIrKMcLTRLJyMiL6n_Xs-p59AuDEymA,543
 omlish/marshal/uuids.py,sha256=H4B7UX_EPNmP2tC8bubcKrPLTS4aQu98huvbXQ3Zv2g,910
 omlish/marshal/values.py,sha256=ssHiWdg_L6M17kAn8GiGdPW7UeQOm3RDikWkvwblf5I,263
+omlish/math/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/math/bits.py,sha256=yip1l8agOYzT7bFyMGc0RR3XlnGCfHMpjw_SECLLh1I,3477
+omlish/math/floats.py,sha256=UimhOT7KRl8LXTzOI5cQWoX_9h6WNWe_3vcOuO7-h_8,327
+omlish/math/stats.py,sha256=MegzKVsmv2kra4jDWLOUgV0X7Ee2Tbl5u6ql1v4-dEY,10053
 omlish/reflect/__init__.py,sha256=iWDCNJNP4afPcv-MxZRJSIRQ4NRw6XYPyRHhBXb5YIA,667
 omlish/reflect/isinstance.py,sha256=x5T9S2634leinBT4hl3CZZkRttvdvvlxChkC_x9Qu2s,1176
 omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
@@ -306,12 +308,13 @@ omlish/testing/pytest/plugins/spacing.py,sha256=JQQhi9q3c523Ro1a_K_9RGAb7HotiO74
 omlish/testing/pytest/plugins/switches.py,sha256=9FtN5qtPBoS-teEp54OHPF6jlZJakRJdq4pnLJpPj_A,3001
 omlish/testing/pytest/plugins/utils.py,sha256=L5C622UXcA_AUKDcvyh5IMiRfqSGGz0McdhwZWvfMlU,261
 omlish/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/text/asdl.py,sha256=3v5UocAfxan_d9drkGNdH3AMfx_FFBpQu3ULGL4M6VM,16865
 omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
-omlish/text/parts.py,sha256=KGgo0wHOIMVMZtDso-rhSWKAcAkYAH2IGpg9tULabu8,6505
-omlish-0.0.0.dev27.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev27.dist-info/METADATA,sha256=y3f_PoZpAVj2Mpn51ruURaZtqJ0Tm8YWmtFacYsa0ck,3666
-omlish-0.0.0.dev27.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-omlish-0.0.0.dev27.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev27.dist-info/RECORD,,
+omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
+omlish-0.0.0.dev29.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev29.dist-info/METADATA,sha256=J9BcC0SJmQjneAgNGyWD756p2EyX8iSvs92bU2JAQH4,3636
+omlish-0.0.0.dev29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+omlish-0.0.0.dev29.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev29.dist-info/RECORD,,