omlish 0.0.0.dev72__py3-none-any.whl → 0.0.0.dev74__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev72'
-__revision__ = '4448e03bbb77cb149e46eeefb0e9e61faed2a494'
+__version__ = '0.0.0.dev74'
+__revision__ = '002d07c8f9579e6b60584c9b2c6c05cd6b7219af'
 
 
 #

omlish/check.py

@@ -96,7 +96,7 @@ def _default_exception_factory(exc_cls: type[Exception], *args, **kwargs) -> Exc
 _EXCEPTION_FACTORY = _default_exception_factory
 
 
-class _Args:
+class _ArgsKwargs:
     def __init__(self, *args, **kwargs):
         self.args = args
         self.kwargs = kwargs
@@ -106,7 +106,7 @@ def _raise(
         exception_type: type[Exception],
         default_message: str,
         message: Message,
-        ak: _Args = _Args(),
+        ak: _ArgsKwargs = _ArgsKwargs(),
         *,
         render_fmt: str | None = None,
 ) -> ta.NoReturn:
@@ -159,7 +159,7 @@ def isinstance(v: ta.Any, spec: type[T] | tuple, msg: Message = None) -> T:  # n
             TypeError,
             'Must be instance',
             msg,
-            _Args(v, spec),
+            _ArgsKwargs(v, spec),
             render_fmt='not isinstance(%s, %s)',
         )
 
@@ -179,7 +179,7 @@ def cast(v: ta.Any, cls: type[T], msg: Message = None) -> T:  # noqa
             TypeError,
             'Must be instance',
             msg,
-            _Args(v, cls),
+            _ArgsKwargs(v, cls),
         )
 
     return v
@@ -198,7 +198,7 @@ def not_isinstance(v: T, spec: ta.Any, msg: Message = None) -> T:  # noqa
             TypeError,
             'Must not be instance',
             msg,
-            _Args(v, spec),
+            _ArgsKwargs(v, spec),
             render_fmt='isinstance(%s, %s)',
         )
 
@@ -221,7 +221,7 @@ def issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:  # noq
             TypeError,
             'Must be subclass',
             msg,
-            _Args(v, spec),
+            _ArgsKwargs(v, spec),
             render_fmt='not issubclass(%s, %s)',
         )
 
@@ -234,7 +234,7 @@ def not_issubclass(v: type[T], spec: ta.Any, msg: Message = None) -> type[T]:  #
             TypeError,
             'Must not be subclass',
             msg,
-            _Args(v, spec),
+            _ArgsKwargs(v, spec),
             render_fmt='issubclass(%s, %s)',
         )
 
@@ -250,7 +250,7 @@ def in_(v: T, c: ta.Container[T], msg: Message = None) -> T:
             ValueError,
             'Must be in',
             msg,
-            _Args(v, c),
+            _ArgsKwargs(v, c),
             render_fmt='%s not in %s',
         )
 
@@ -263,7 +263,7 @@ def not_in(v: T, c: ta.Container[T], msg: Message = None) -> T:
             ValueError,
             'Must not be in',
             msg,
-            _Args(v, c),
+            _ArgsKwargs(v, c),
             render_fmt='%s in %s',
         )
 
@@ -276,7 +276,7 @@ def empty(v: SizedT, msg: Message = None) -> SizedT:
             ValueError,
             'Must be empty',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -294,7 +294,7 @@ def iterempty(v: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
             ValueError,
             'Must be empty',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -307,7 +307,7 @@ def not_empty(v: SizedT, msg: Message = None) -> SizedT:
             ValueError,
             'Must not be empty',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -321,7 +321,7 @@ def unique(it: ta.Iterable[T], msg: Message = None) -> ta.Iterable[T]:
             ValueError,
             'Must be unique',
             msg,
-            _Args(it, dupes),
+            _ArgsKwargs(it, dupes),
         )
 
     return it
@@ -335,7 +335,7 @@ def single(obj: ta.Iterable[T], message: Message = None) -> T:
             ValueError,
             'Must be single',
             message,
-            _Args(obj),
+            _ArgsKwargs(obj),
             render_fmt='%s',
         )
 
@@ -358,7 +358,7 @@ def opt_single(obj: ta.Iterable[T], message: Message = None) -> T | None:
         ValueError,
         'Must be empty or single',
         message,
-        _Args(obj),
+        _ArgsKwargs(obj),
         render_fmt='%s',
     )
 
@@ -372,7 +372,7 @@ def none(v: ta.Any, msg: Message = None) -> None:
             ValueError,
             'Must be None',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -383,7 +383,7 @@ def not_none(v: T | None, msg: Message = None) -> T:
             ValueError,
             'Must not be None',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -399,7 +399,7 @@ def equal(v: T, o: ta.Any, msg: Message = None) -> T:
             ValueError,
             'Must be equal',
             msg,
-            _Args(v, o),
+            _ArgsKwargs(v, o),
             render_fmt='%s != %s',
         )
 
@@ -412,7 +412,7 @@ def is_(v: T, o: ta.Any, msg: Message = None) -> T:
             ValueError,
             'Must be the same',
             msg,
-            _Args(v, o),
+            _ArgsKwargs(v, o),
             render_fmt='%s is not %s',
         )
 
@@ -425,7 +425,7 @@ def is_not(v: T, o: ta.Any, msg: Message = None) -> T:
             ValueError,
             'Must not be the same',
             msg,
-            _Args(v, o),
+            _ArgsKwargs(v, o),
             render_fmt='%s is %s',
         )
 
@@ -438,7 +438,7 @@ def callable(v: T, msg: Message = None) -> T:  # noqa
             TypeError,
             'Must be callable',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -451,7 +451,7 @@ def non_empty_str(v: str | None, msg: Message = None) -> str:
             ValueError,
             'Must be non-empty str',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -464,7 +464,7 @@ def replacing(expected: ta.Any, old: ta.Any, new: T, msg: Message = None) -> T:
             ValueError,
             'Must be replacing',
             msg,
-            _Args(expected, old, new),
+            _ArgsKwargs(expected, old, new),
             render_fmt='%s -> %s -> %s',
         )
 
@@ -477,7 +477,7 @@ def replacing_none(old: ta.Any, new: T, msg: Message = None) -> T:
             ValueError,
             'Must be replacing None',
             msg,
-            _Args(old, new),
+            _ArgsKwargs(old, new),
             render_fmt='%s -> %s',
         )
 
@@ -493,7 +493,7 @@ def arg(v: bool, msg: Message = None) -> None:
             RuntimeError,
             'Argument condition not met',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )
 
@@ -504,6 +504,6 @@ def state(v: bool, msg: Message = None) -> None:
             RuntimeError,
             'State condition not met',
             msg,
-            _Args(v),
+            _ArgsKwargs(v),
             render_fmt='%s',
         )

omlish/dataclasses/impl/fields.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - point validate / check exceptions to lambdas
+"""
 import dataclasses as dc
 import types
 import typing as ta

omlish/dataclasses/impl/metaclass.py

@@ -108,7 +108,11 @@ class DataMeta(abc.ABCMeta):
 
 
 # @ta.dataclass_transform(field_specifiers=(field,))  # FIXME: ctor
-class Data(metaclass=DataMeta):
+class Data(
+    eq=False,
+    order=False,
+    metaclass=DataMeta,
+):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -125,6 +129,8 @@ class Data(metaclass=DataMeta):
 class Frozen(
     Data,
     frozen=True,
+    eq=False,
+    order=False,
     confer=frozenset([
         'frozen',
         'cache_hash',

omlish/http/clients.py

@@ -133,7 +133,7 @@ class UrllibHttpClient(HttpClient):
 
         # urllib headers are dumb dicts [1], and keys *must* be strings or it will automatically add problematic default
         # headers because it doesn't see string keys in its header dict [2]. frustratingly it has no problem accepting
-        # bytes keys though [3].
+        # bytes values though [3].
         # [1]: https://github.com/python/cpython/blob/232b303e4ca47892f544294bf42e31dc34f0ec72/Lib/urllib/request.py#L319-L325  # noqa
         # [2]: https://github.com/python/cpython/blob/232b303e4ca47892f544294bf42e31dc34f0ec72/Lib/urllib/request.py#L1276-L1279  # noqa
         # [3]: https://github.com/python/cpython/blob/232b303e4ca47892f544294bf42e31dc34f0ec72/Lib/http/client.py#L1300-L1301  # noqa

omlish/http/headers.py

@@ -12,13 +12,14 @@ CanHttpHeaders: ta.TypeAlias = ta.Union[
 
     ta.Mapping[str, str],
     ta.Mapping[str, ta.Sequence[str]],
+    ta.Mapping[str, str | ta.Sequence[str]],
 
     ta.Mapping[bytes, bytes],
     ta.Mapping[bytes, ta.Sequence[bytes]],
+    ta.Mapping[bytes, bytes | ta.Sequence[bytes]],
 
     ta.Mapping[StrOrBytes, StrOrBytes],
     ta.Mapping[StrOrBytes, ta.Sequence[StrOrBytes]],
-
     ta.Mapping[StrOrBytes, StrOrBytes | ta.Sequence[StrOrBytes]],
 
     ta.Sequence[tuple[str, str]],
@@ -153,11 +154,11 @@ class HttpHeaders:
         ...
 
     @ta.overload
-    def __getitem__(self, item: int) -> StrOrBytes:
+    def __getitem__(self, item: int) -> tuple[StrOrBytes, StrOrBytes]:
         ...
 
     @ta.overload
-    def __getitem__(self, item: slice) -> ta.Sequence[StrOrBytes]:
+    def __getitem__(self, item: slice) -> ta.Sequence[tuple[StrOrBytes, StrOrBytes]]:
         ...
 
     def __getitem__(self, item):

omlish/marshal/enums.py

@@ -28,7 +28,7 @@ class EnumMarshalerFactory(MarshalerFactory):
     def fn(self, ctx: MarshalContext, rty: rfl.Type) -> Marshaler:
         ty = check.isinstance(rty, type)
         check.state(issubclass(ty, enum.Enum))
-        return EnumMarshaler(ty)
+        return EnumMarshaler(ty)  # noqa
 
 
 @dc.dataclass(frozen=True)

omlish/sql/queries/__init__.py

@@ -11,6 +11,10 @@ from .binary import (  # noqa
     BinaryOps,
 )
 
+from .building import (  # noqa
+    StdBuilder,
+)
+
 from .exprs import (  # noqa
     CanExpr,
     CanLiteral,
@@ -18,6 +22,7 @@ from .exprs import (  # noqa
     ExprBuilder,
     Literal,
     NameExpr,
+    Param,
 )
 
 from .idents import (  # noqa
@@ -29,8 +34,7 @@ from .idents import (  # noqa
 from .multi import (  # noqa
     Multi,
     MultiBuilder,
-    MultiOp,
-    MultiOps,
+    MultiKind,
 )
 
 from .names import (  # noqa
@@ -39,6 +43,10 @@ from .names import (  # noqa
     NameBuilder,
 )
 
+from .ops import (  # noqa
+    OpKind,
+)
+
 from .relations import (  # noqa
     CanRelation,
     CanTable,
@@ -47,6 +55,12 @@ from .relations import (  # noqa
     Table,
 )
 
+from .rendering import (  # noqa
+    Renderer,
+    StdRenderer,
+    render,
+)
+
 from .selects import (  # noqa
     CanRelation,
     Select,
@@ -54,10 +68,6 @@ from .selects import (  # noqa
     SelectItem,
 )
 
-from .std import (  # noqa
-    StdBuilder,
-)
-
 from .stmts import (  # noqa
     CanExpr,
     ExprStmt,
@@ -77,3 +87,11 @@ from .unary import (  # noqa
 
 
 Q = StdBuilder()
+
+
+##
+
+
+from ...lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('...marshal', '.marshal', __package__)

omlish/sql/queries/binary.py

@@ -1,24 +1,41 @@
+"""
+TODO:
+ - in_
+ - like
+  - no this is a dedicated node, escape / negation in grammar
+"""
 from ... import check
+from ... import dataclasses as dc
 from ... import lang
-from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
+from .ops import OpKind
 
 
 ##
 
 
-class BinaryOp(Node, lang.Final):
+class BinaryOp(dc.Frozen, lang.Final, eq=False):
     name: str
+    kind: OpKind
 
 
 class BinaryOps(lang.Namespace):
-    ADD = BinaryOp('add')
-    SUB = BinaryOp('sub')
+    EQ = BinaryOp('eq', OpKind.CMP)
+    NE = BinaryOp('ne', OpKind.CMP)
+    LT = BinaryOp('lt', OpKind.CMP)
+    LE = BinaryOp('le', OpKind.CMP)
+    GT = BinaryOp('gt', OpKind.CMP)
+    GE = BinaryOp('ge', OpKind.CMP)
 
-    EQ = BinaryOp('eq')
-    NE = BinaryOp('ne')
+    ADD = BinaryOp('add', OpKind.ARITH)
+    SUB = BinaryOp('sub', OpKind.ARITH)
+    MUL = BinaryOp('mul', OpKind.ARITH)
+    DIV = BinaryOp('div', OpKind.ARITH)
+    MOD = BinaryOp('mod', OpKind.ARITH)
+
+    CONCAT = BinaryOp('concat', OpKind.STR)
 
 
 class Binary(Expr, lang.Final):
@@ -35,14 +52,44 @@ class BinaryBuilder(ExprBuilder):
             l = Binary(op, l, self.expr(r))
         return l
 
+    #
+
+    def eq(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.EQ, *es)
+
+    def ne(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.NE, *es)
+
+    def lt(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.LT, *es)
+
+    def le(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.LE, *es)
+
+    def gt(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.GT, *es)
+
+    def ge(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.GE, *es)
+
+    #
+
     def add(self, *es: CanExpr) -> Expr:
         return self.binary(BinaryOps.ADD, *es)
 
     def sub(self, *es: CanExpr) -> Expr:
         return self.binary(BinaryOps.SUB, *es)
 
-    def eq(self, *es: CanExpr) -> Expr:
-        return self.binary(BinaryOps.EQ, *es)
+    def mul(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.MUL, *es)
 
-    def ne(self, *es: CanExpr) -> Expr:
-        return self.binary(BinaryOps.NE, *es)
+    def div(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.DIV, *es)
+
+    def mod(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.MOD, *es)
+
+    #
+
+    def concat(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.CONCAT, *es)

omlish/sql/queries/exprs.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - case
+ - cast / ::
+"""
 import typing as ta
 
 from ... import lang
@@ -24,6 +29,24 @@ class NameExpr(Expr, lang.Final):
     n: Name
 
 
+class Param(Expr, lang.Final):
+    n: str | None = None
+
+    def __repr__(self) -> str:
+        if self.n is not None:
+            return f'{self.__class__.__name__}({self.n!r})'
+        else:
+            return f'{self.__class__.__name__}(@{hex(id(self))[2:]})'
+
+    def __eq__(self, other):
+        if not isinstance(other, Param):
+            return False
+        if self.n is None and other.n is None:
+            return self is other
+        else:
+            return self.n == other.n
+
+
 CanLiteral: ta.TypeAlias = Literal | Value
 CanExpr: ta.TypeAlias = Expr | CanName | CanLiteral
 
@@ -41,6 +64,8 @@ class ExprBuilder(NameBuilder):
     def l(self, o: CanLiteral) -> Literal:  # noqa
         return self.literal(o)
 
+    #
+
     def expr(self, o: CanExpr) -> Expr:
         if isinstance(o, Expr):
             return o
@@ -52,3 +77,12 @@ class ExprBuilder(NameBuilder):
     @ta.final
     def e(self, o: CanExpr) -> Expr:
         return self.expr(o)
+
+    #
+
+    def param(self, n: str | None = None) -> Param:
+        return Param(n)
+
+    @ta.final
+    def p(self, n: str | None = None) -> Param:
+        return self.param(n)

omlish/sql/queries/marshal.py

@@ -0,0 +1,74 @@
+import enum
+import typing as ta
+
+from ... import cached
+from ... import check
+from ... import collections as col
+from ... import dataclasses as dc
+from ... import lang
+from ... import marshal as msh
+from .base import Node
+from .binary import BinaryOp
+from .binary import BinaryOps
+from .exprs import Expr
+from .multi import MultiKind
+from .relations import Relation
+from .stmts import Stmt
+from .unary import UnaryOp
+from .unary import UnaryOps
+
+
+@dc.dataclass(frozen=True)
+class OpMarshalerUnmarshaler(msh.Marshaler, msh.Unmarshaler):
+    ty: type
+    ns: type[lang.Namespace]
+
+    @cached.property
+    @dc.init
+    def by_name(self) -> ta.Mapping[str, ta.Any]:
+        return col.make_map(((o.name, o) for _, o in self.ns), strict=True)
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        return check.isinstance(o, self.ty).name  # type: ignore  # noqa
+
+    def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
+        return self.by_name[check.isinstance(v, str)]
+
+
+@dc.dataclass(frozen=True)
+class LowerEnumMarshaler(msh.Marshaler, msh.Unmarshaler):
+    ty: type[enum.Enum]
+
+    @cached.property
+    @dc.init
+    def by_name(self) -> ta.Mapping[str, ta.Any]:
+        return col.make_map(((o.name.lower(), o) for o in self.ty), strict=True)
+
+    def marshal(self, ctx: msh.MarshalContext, o: ta.Any) -> msh.Value:
+        return o.name.lower()
+
+    def unmarshal(self, ctx: msh.UnmarshalContext, v: msh.Value) -> ta.Any:
+        return self.by_name[check.isinstance(v, str).lower()]
+
+
+@lang.static_init
+def _install_standard_marshalling() -> None:
+    for ty, ns in [
+        (BinaryOp, BinaryOps),
+        (UnaryOp, UnaryOps),
+    ]:
+        msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
+        msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
+
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({MultiKind: LowerEnumMarshaler(MultiKind)})]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({MultiKind: LowerEnumMarshaler(MultiKind)})]  # noqa
+
+    for cls in [
+        Expr,
+        Node,
+        Relation,
+        Stmt,
+    ]:
+        p = msh.polymorphism_from_subclasses(cls, naming=msh.Naming.SNAKE)
+        msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(p)]
+        msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(p)]

omlish/sql/queries/multi.py

@@ -1,9 +1,9 @@
+import enum
 import typing as ta
 
 from ... import check
 from ... import dataclasses as dc
 from ... import lang
-from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
@@ -12,30 +12,26 @@ from .exprs import ExprBuilder
 ##
 
 
-class MultiOp(Node, lang.Final):
-    name: str
-
-
-class MultiOps(lang.Namespace):
-    AND = MultiOp('and')
-    OR = MultiOp('or')
+class MultiKind(enum.Enum):
+    AND = enum.auto()
+    OR = enum.auto()
 
 
 class Multi(Expr, lang.Final):
-    op: MultiOp
-    es: ta.Sequence[Expr] = dc.xfield(coerce=tuple)
+    k: MultiKind
+    es: ta.Sequence[Expr] = dc.xfield(coerce=tuple, validate=lambda es: len(es) > 1)
 
 
 class MultiBuilder(ExprBuilder):
-    def multi(self, op: MultiOp, *es: CanExpr) -> Expr:
+    def multi(self, k: MultiKind, *es: CanExpr) -> Expr:
         check.not_empty(es)
         if len(es) == 1:
             return self.expr(es[0])
         else:
-            return Multi(op, [self.expr(e) for e in es])
+            return Multi(k, [self.expr(e) for e in es])
 
     def and_(self, *es: CanExpr) -> Expr:
-        return self.multi(MultiOps.AND, *es)
+        return self.multi(MultiKind.AND, *es)
 
     def or_(self, *es: CanExpr) -> Expr:
-        return self.multi(MultiOps.OR, *es)
+        return self.multi(MultiKind.OR, *es)

omlish/sql/queries/ops.py

@@ -0,0 +1,8 @@
+import enum
+
+
+class OpKind(enum.Enum):
+    CMP = enum.auto()
+    ARITH = enum.auto()
+    BIT = enum.auto()
+    STR = enum.auto()

omlish/sql/queries/relations.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - join
+ - subquery
+"""
 import typing as ta
 
 from ... import dataclasses as dc

omlish/sql/queries/rendering.py

@@ -0,0 +1,180 @@
+"""
+TODO:
+ - minimal parens
+ - text.parts
+ - QuoteStyle
+ - ParamStyle
+
+==
+
+def needs_parens(self, e: Expr) -> bool:
+    if isinstance(e, (Literal, Ident, Name)):
+        return True
+    elif isinstance(e, Expr):
+        return False
+    else:
+        raise TypeError(e)
+"""
+import io
+import typing as ta
+
+from ... import dispatch
+from ... import lang
+from .base import Node
+from .binary import Binary
+from .binary import BinaryOp
+from .binary import BinaryOps
+from .exprs import Literal
+from .exprs import NameExpr
+from .idents import Ident
+from .multi import Multi
+from .multi import MultiKind
+from .names import Name
+from .relations import Table
+from .selects import Select
+from .selects import SelectItem
+from .unary import Unary
+from .unary import UnaryOp
+from .unary import UnaryOps
+
+
+class Renderer(lang.Abstract):
+    def __init__(self, out: ta.TextIO) -> None:
+        super().__init__()
+        self._out = out
+
+    @dispatch.method
+    def render(self, o: ta.Any) -> None:
+        raise TypeError(o)
+
+    @classmethod
+    def render_str(cls, o: ta.Any, *args: ta.Any, **kwargs: ta.Any) -> str:
+        out = io.StringIO()
+        cls(out, *args, **kwargs).render(o)
+        return out.getvalue()
+
+
+class StdRenderer(Renderer):
+    # binary
+
+    BINARY_OP_TO_STR: ta.ClassVar[ta.Mapping[BinaryOp, str]] = {
+        BinaryOps.EQ: '=',
+        BinaryOps.NE: '!=',
+        BinaryOps.LT: '<',
+        BinaryOps.LE: '<=',
+        BinaryOps.GT: '>',
+        BinaryOps.GE: '>=',
+
+        BinaryOps.ADD: '+',
+        BinaryOps.SUB: '-',
+        BinaryOps.MUL: '*',
+        BinaryOps.DIV: '/',
+        BinaryOps.MOD: '%',
+
+        BinaryOps.CONCAT: '||',
+    }
+
+    @Renderer.render.register
+    def render_binary(self, o: Binary) -> None:
+        self._out.write('(')
+        self.render(o.l)
+        self._out.write(f' {self.BINARY_OP_TO_STR[o.op]} ')
+        self.render(o.r)
+        self._out.write(')')
+
+    # exprs
+
+    @Renderer.render.register
+    def render_literal(self, o: Literal) -> None:
+        self._out.write(repr(o.v))
+
+    @Renderer.render.register
+    def render_name_expr(self, o: NameExpr) -> None:
+        self.render(o.n)
+
+    # idents
+
+    @Renderer.render.register
+    def render_ident(self, o: Ident) -> None:
+        self._out.write(f'"{o.s}"')
+
+    # multis
+
+    MULTI_KIND_TO_STR: ta.ClassVar[ta.Mapping[MultiKind, str]] = {
+        MultiKind.AND: 'and',
+        MultiKind.OR: 'or',
+
+    }
+
+    @Renderer.render.register
+    def render_multi(self, o: Multi) -> None:
+        d = f' {self.MULTI_KIND_TO_STR[o.k]} '
+        self._out.write('(')
+        for i, e in enumerate(o.es):
+            if i:
+                self._out.write(d)
+            self.render(e)
+        self._out.write(')')
+
+    # names
+
+    @Renderer.render.register
+    def render_name(self, o: Name) -> None:
+        for n, i in enumerate(o.ps):
+            if n:
+                self._out.write('.')
+            self.render(i)
+
+    # relations
+
+    @Renderer.render.register
+    def render_table(self, o: Table) -> None:
+        self.render(o.n)
+        if o.a is not None:
+            self._out.write(' as ')
+            self.render(o.a)
+
+    # selects
+
+    @Renderer.render.register
+    def render_select_item(self, o: SelectItem) -> None:
+        self.render(o.v)
+        if o.a is not None:
+            self._out.write(' as ')
+            self.render(o.a)
+
+    @Renderer.render.register
+    def render_select(self, o: Select) -> None:
+        self._out.write('select ')
+        for i, it in enumerate(o.items):
+            if i:
+                self._out.write(', ')
+            self.render(it)
+        if o.from_ is not None:
+            self._out.write(' from ')
+            self.render(o.from_)
+        if o.where:
+            self._out.write(' where ')
+            self.render(o.where)
+
+    # unary
+
+    UNARY_OP_TO_STR: ta.ClassVar[ta.Mapping[UnaryOp, tuple[str, str]]] = {
+        UnaryOps.NOT: ('not ', ''),
+        UnaryOps.IS_NULL: ('', ' is null'),
+        UnaryOps.IS_NOT_NULL: ('', ' is not null'),
+
+        UnaryOps.POS: ('+', ''),
+        UnaryOps.NEG: ('-', ''),
+    }
+
+    @Renderer.render.register
+    def render_unary(self, o: Unary) -> None:
+        pfx, sfx = self.UNARY_OP_TO_STR[o.op]
+        self._out.write(pfx)
+        self.render(o.v)
+        self._out.write(sfx)
+
+
+def render(n: Node) -> str:
+    return StdRenderer.render_str(n)

omlish/sql/queries/selects.py

@@ -22,9 +22,9 @@ class SelectItem(Node, lang.Final):
 
 
 class Select(Stmt, lang.Final):
-    its: ta.Sequence[SelectItem] = dc.xfield(coerce=tuple)
-    fr: Relation | None = dc.xfield(None, repr_fn=dc.opt_repr)
-    wh: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    items: ta.Sequence[SelectItem] = dc.xfield(coerce=tuple)
+    from_: Relation | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    where: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr)
 
 
 CanSelectItem: ta.TypeAlias = SelectItem | CanExpr
@@ -39,12 +39,12 @@ class SelectBuilder(ExprBuilder, RelationBuilder):
 
     def select(
             self,
-            its: ta.Sequence[CanSelectItem],
-            fr: CanRelation | None = None,
-            wh: CanExpr | None = None,
+            items: ta.Sequence[CanSelectItem],
+            from_: CanRelation | None = None,
+            where: CanExpr | None = None,
     ) -> Select:
         return Select(
-            [self.select_item(i) for i in its],
-            fr=self.relation(fr) if fr is not None else None,
-            wh=self.expr(wh) if wh is not None else None,
+            [self.select_item(i) for i in items],
+            from_=self.relation(from_) if from_ is not None else None,
+            where=self.expr(where) if where is not None else None,
         )

omlish/sql/queries/unary.py

@@ -1,19 +1,26 @@
+from ... import dataclasses as dc
 from ... import lang
-from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
+from .ops import OpKind
 
 
 ##
 
 
-class UnaryOp(Node, lang.Final):
+class UnaryOp(dc.Frozen, lang.Final, eq=False):
     name: str
+    kind: OpKind
 
 
 class UnaryOps(lang.Namespace):
-    NOT = UnaryOp('not')
+    NOT = UnaryOp('not', OpKind.CMP)
+    IS_NULL = UnaryOp('is_null', OpKind.CMP)
+    IS_NOT_NULL = UnaryOp('is_not_null', OpKind.CMP)
+
+    POS = UnaryOp('pos', OpKind.ARITH)
+    NEG = UnaryOp('neg', OpKind.ARITH)
 
 
 class Unary(Expr, lang.Final):
@@ -25,5 +32,21 @@ class UnaryBuilder(ExprBuilder):
     def unary(self, op: UnaryOp, v: CanExpr) -> Unary:
         return Unary(op, self.expr(v))
 
+    #
+
     def not_(self, v: CanExpr) -> Unary:
         return self.unary(UnaryOps.NOT, v)
+
+    def is_null(self, v: CanExpr) -> Unary:
+        return self.unary(UnaryOps.IS_NULL, v)
+
+    def is_not_null(self, v: CanExpr) -> Unary:
+        return self.unary(UnaryOps.IS_NOT_NULL, v)
+
+    #
+
+    def pos(self, v: CanExpr) -> Unary:
+        return self.unary(UnaryOps.POS, v)
+
+    def neg(self, v: CanExpr) -> Unary:
+        return self.unary(UnaryOps.NEG, v)

omlish/sql/tabledefs/marshal.py

@@ -10,10 +10,7 @@ def _install_poly(cls: type) -> None:
     msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(p)]
 
 
-@lang.cached_function
+@lang.static_init
 def _install_standard_marshalling() -> None:
     _install_poly(Dtype)
     _install_poly(Element)
-
-
-_install_standard_marshalling()

{omlish-0.0.0.dev72.dist-info → omlish-0.0.0.dev74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev72
+Version: 0.0.0.dev74
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev72.dist-info → omlish-0.0.0.dev74.dist-info}/RECORD

@@ -1,10 +1,10 @@
 omlish/.manifests.json,sha256=TXvFdkAU0Zr2FKdo7fyvt9nr3UjCtrnAZ0diZXSAteE,1430
-omlish/__about__.py,sha256=Xtux9lxQlFpaTqHV9Xq7BumGnu8QP3C6l4R7wQX9F_w,3420
+omlish/__about__.py,sha256=6L5yBogPnXXOqNId_oVRZJ4kjVB68VskkdZvIJ7NlE0,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
 omlish/cached.py,sha256=UAizxlH4eMWHPzQtmItmyE6FEpFEUFzIkxaO2BHWZ5s,196
-omlish/check.py,sha256=fgWiBoHvqZlE8tjaxK7OMW4J8z3_rEGRENTka3EohbI,10378
+omlish/check.py,sha256=rZFEn6IHiMq4KGCYxlUGcUCJP12pPPUs_-AG0aouPM8,10540
 omlish/datetimes.py,sha256=HajeM1kBvwlTa-uR1TTZHmZ3zTPnnUr1uGGQhiO1XQ0,2152
 omlish/defs.py,sha256=T3bq_7h_tO3nDB5RAFBn7DkdeQgqheXzkFColbOHZko,4890
 omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
@@ -132,13 +132,13 @@ omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX
 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=iXA8j3q8GFQoj-6MgAKVLGG9GSSNOLGgyVtogCQ5q1E,6459
+omlish/dataclasses/impl/fields.py,sha256=mr8tnSDceHGZ6VBbeegt-iCzQJbtCXoWOUwltjRULy4,6521
 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
 omlish/dataclasses/impl/internals.py,sha256=UvZYjrLT1S8ntyxJ_vRPIkPOF00K8HatGAygErgoXTU,2990
 omlish/dataclasses/impl/main.py,sha256=Ti0PKbFKraKvfmoPuR-G7nLVNzRC8mvEuXhCuC-M2kc,2574
-omlish/dataclasses/impl/metaclass.py,sha256=E0lIKGjUcQXOJEZYb6qXa2h4iYNj292OFtau3sq8cSQ,3153
+omlish/dataclasses/impl/metaclass.py,sha256=Fb0ExFiyYdOpvck4ayXMr_vEVDvHLhe28Ns3F4aduM8,3222
 omlish/dataclasses/impl/metadata.py,sha256=4veWwTr-aA0KP-Y1cPEeOcXHup9EKJTYNJ0ozIxtzD4,1401
 omlish/dataclasses/impl/order.py,sha256=zWvWDkSTym8cc7vO1cLHqcBhhjOlucHOCUVJcdh4jt0,1369
 omlish/dataclasses/impl/params.py,sha256=zsobAD6QvMAZeMsohP8nKFyv_w6Q4buocARQG1y1etA,2768
@@ -202,13 +202,13 @@ omlish/graphs/dot/rendering.py,sha256=2UgXvMRN4Z9cfIqLlC7Iu_8bWbwUDEL4opHHkFfSqT
 omlish/graphs/dot/utils.py,sha256=_FMwn77WfiiAfLsRTOKWm4IYbNv5kQN22YJ5psw6CWg,801
 omlish/http/__init__.py,sha256=-ENDALr8ehHvivRD6cxIbEC94t0RHhrakf6CQRDTc8o,625
 omlish/http/asgi.py,sha256=wXhBZ21bEl32Kv9yBrRwUR_7pHEgVtHP8ZZwbasQ6-4,3307
-omlish/http/clients.py,sha256=KPWDw251eBmiYSXw7KafMP9UQHEiLiLdh9ZLPV7jydc,6002
+omlish/http/clients.py,sha256=eOY4bmbGdXuOOabt9NLAcTO7G49u85-HoAFW28mCXS4,6004
 omlish/http/collections.py,sha256=s8w5s4Gewgxxhe2Ai0R45PgJYYifrLgTbU3VXVflHj4,260
 omlish/http/consts.py,sha256=FTolezLknKU6WJjk_x2T3a5LEMlnZSqv7gzTq55lxcU,2147
 omlish/http/cookies.py,sha256=uuOYlHR6e2SC3GM41V0aozK10nef9tYg83Scqpn5-HM,6351
 omlish/http/dates.py,sha256=Otgp8wRxPgNGyzx8LFowu1vC4EKJYARCiAwLFncpfHM,2875
 omlish/http/encodings.py,sha256=w2WoKajpaZnQH8j-IBvk5ZFL2O2pAU_iBvZnkocaTlw,164
-omlish/http/headers.py,sha256=MO5uDwbViY6Z371Hl5OwTvh2DGl76_PnWHlurNwIsOs,4895
+omlish/http/headers.py,sha256=S66wiXezBHybrnjAM15E9x4GJvPRvFQHeKaXdJ799fw,5028
 omlish/http/json.py,sha256=9XwAsl4966Mxrv-1ytyCqhcE6lbBJw-0_tFZzGszgHE,7440
 omlish/http/sessions.py,sha256=VZ_WS5uiQG5y7i3u8oKuQMqf8dPKUOjFm_qk_0OvI8c,4793
 omlish/http/wsgi.py,sha256=czZsVUX-l2YTlMrUjKN49wRoP4rVpS0qpeBn4O5BoMY,948
@@ -299,7 +299,7 @@ omlish/marshal/base.py,sha256=_ZKSSuv6p9r86sja_jaxI09WYpjCBFi0KTsOiZCYyk0,6587
 omlish/marshal/base64.py,sha256=F-3ogJdcFCtWINRgJgWT0rErqgx6f4qahhcg8OrkqhE,1089
 omlish/marshal/dataclasses.py,sha256=G6Uh8t4vvNBAx2BhzH8ksj8Hq_bo6npFphQhyF298VU,6892
 omlish/marshal/datetimes.py,sha256=0ffg8cEvx9SMKIXZGD9b7MqpLfmgw0uKKdn6YTfoqok,3714
-omlish/marshal/enums.py,sha256=-0fKutBbyz8ygEaA0_P_8IOJrI9jMGigmnPbutV9Bg4,1464
+omlish/marshal/enums.py,sha256=CMAbx6RI2EcQoo7SoD-5q2l-3DFKreWMiOxs6mFpl_4,1472
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
 omlish/marshal/factories.py,sha256=UV2Svjok-lTWsRqKGh-CeuAhvlohw9uJe7ZLyoKMvTM,2968
 omlish/marshal/forbidden.py,sha256=BNshzm4lN5O8sUZ1YvxrSYq3WPklq9NMQCRZ7RC3DLM,865
@@ -388,24 +388,27 @@ omlish/sql/alchemy/duckdb.py,sha256=kr7pIhiBLNAuZrcigHDtFg9zHkVcrRW3LfryO9VJ4mk,
 omlish/sql/alchemy/exprs.py,sha256=gO4Fj4xEY-PuDgV-N8hBMy55glZz7O-4H7v1LWabfZY,323
 omlish/sql/alchemy/secrets.py,sha256=EMfy4EfTbEvrlv_41oOhn8qsoF-eTkY7HciPenIE6rI,178
 omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,403
-omlish/sql/queries/__init__.py,sha256=TEl0iNWVxPURJIRJSaKpy5EJkyVXw2Zej8jlKmeggAo,963
+omlish/sql/queries/__init__.py,sha256=BdhONMw2JebX-jEgYb1WrM5L3vkJOzQRm0nt04IYKgQ,1229
 omlish/sql/queries/base.py,sha256=_8O3MbH_OEjBnhp2oIJUZ3ClaQ8l4Sj9BdPdsP0Ie-g,224
-omlish/sql/queries/binary.py,sha256=7K8pX2ki4PsXo3RP-81LD-sl8A4nGAN7hbgJExwoQPw,1003
-omlish/sql/queries/exprs.py,sha256=tJ5gK21NKYbxKnJmrAUDkzaPqzg7hg6-z2GS4-MG05U,1092
+omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
+omlish/sql/queries/building.py,sha256=pddD8-WDDGwX97OW7MLahaZTLsO_0NLxxIIAXXq1N40,537
+omlish/sql/queries/exprs.py,sha256=kAI5PmvfJ-TqEzzc9H4_womFShT1eA0jWSZH2j2Wg-c,1802
 omlish/sql/queries/idents.py,sha256=erW6fE9UapuvW1ZeLfGFz7yuW6zzktWIWmOuAHeF8_g,496
-omlish/sql/queries/multi.py,sha256=7qFq3-n3g6MmYHM_lyhru9DcabiZRAQUVaOyR3gXvXU,865
+omlish/sql/queries/marshal.py,sha256=MKZ3CVcr7mpnmg25twVgErWk1SpRBEkE1mu2fE8QwUA,2508
+omlish/sql/queries/multi.py,sha256=KKHf8uS3Akk-YACPUwaqQO20NlDdrB3gbauOAejZzgU,832
 omlish/sql/queries/names.py,sha256=YiIyS6ehYMYrdLlUxMawV_Xf2zdi7RwVO9Qsxr_W4_4,772
-omlish/sql/queries/relations.py,sha256=zAOCJWopA3MxAE_J4wxRtuvGEOcQgOnAQaF_wT4z930,804
-omlish/sql/queries/selects.py,sha256=yuFg_OZ0Nzn5Jgy3-gkkDV3JhtVrzR3Ov3asAzCgkQU,1328
-omlish/sql/queries/std.py,sha256=pddD8-WDDGwX97OW7MLahaZTLsO_0NLxxIIAXXq1N40,537
+omlish/sql/queries/ops.py,sha256=B7IDfjr2DW5LJhWoNaY1WW90BJhe5ZtmxIELhWXbW-0,129
+omlish/sql/queries/relations.py,sha256=-d3n-dN17c3TPMZmzSplhWawllUzdq12XPDAuzoeMEQ,838
+omlish/sql/queries/rendering.py,sha256=AC2PSGFCLXYk38mnH7EAMV7hQOKp5x6O-ZYV8FXgnAM,4360
+omlish/sql/queries/selects.py,sha256=EcHlyKl5kGSY1d3GVxnImhGCTB6WvwQnlSA9eZanBqU,1364
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
-omlish/sql/queries/unary.py,sha256=B4PA__3GUB1L7bqG4e3fmUcS3Wypx8Ryy6P0rLiPBHQ,514
+omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
 omlish/sql/tabledefs/__init__.py,sha256=TvtQsp-jJu6_ZahyCOFAaElSSBcRftNyJpdiDPGYCDk,190
 omlish/sql/tabledefs/alchemy.py,sha256=MiNfVSgX_Ka6PmVTgAcCmS3ULK5mfVRXD_VC2-9TidU,485
 omlish/sql/tabledefs/dtypes.py,sha256=egZDi-A17MC-4R_ZKR_3uQf1a6mGm91Gmh0b72O85bQ,362
 omlish/sql/tabledefs/elements.py,sha256=lP_Ch19hKmiGYPQVeC8HpFaKdTYnXi2FfpfwKMxZOck,1674
 omlish/sql/tabledefs/lower.py,sha256=YQf8gl1kxD5Fm-vOxV6G0Feh_D9PP1pYwz_vz6XjTPQ,1405
-omlish/sql/tabledefs/marshal.py,sha256=CvjNUHD5ABz72m7MsIqhpHyz2AZHYS6ijWwJXg3_MSs,542
+omlish/sql/tabledefs/marshal.py,sha256=j-Rz1HsiXmABv39-2VoJdzSSB3kbxqaVevbdkZWMyG8,504
 omlish/sql/tabledefs/tabledefs.py,sha256=lIhvlt0pk6G7RZAtDFsFXm5j0l9BvRfnP7vNGeydHtE,816
 omlish/testing/__init__.py,sha256=M_BQrcCHkoL-ZvE-UpQ8XxXNYRRawhjUz4rCJnAqM2A,152
 omlish/testing/testing.py,sha256=TT2wwSzPZ_KhIvKxpM1qc1yHKD-LHDNgGrcr_h8vs7c,2895
@@ -433,9 +436,9 @@ 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=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev72.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev72.dist-info/METADATA,sha256=fC-RJQd1zeLsNghRMhMtxbjiAbWfSE6bbIBTkW85Rxg,4167
-omlish-0.0.0.dev72.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev72.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev72.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev72.dist-info/RECORD,,
+omlish-0.0.0.dev74.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev74.dist-info/METADATA,sha256=fnVoKX28JDI8_XtMIkZGO22Po_cPDkZIi8nGwf6A_84,4167
+omlish-0.0.0.dev74.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev74.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev74.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev74.dist-info/RECORD,,