omlish 0.0.0.dev73__py3-none-any.whl → 0.0.0.dev75__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev73'
-__revision__ = '1fa2fcb99d4ea871fe3f5aa5c094ae37d0b1090c'
+__version__ = '0.0.0.dev75'
+__revision__ = 'dcdc82976a464689890fe99f9aaf5fc596ddd563'
 
 
 #

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

@@ -1,5 +1,6 @@
 """
 TODO:
+ - httpx catch
  - check=False
  - return non-200 HttpResponses
  - async

omlish/http/sse.py

@@ -0,0 +1,96 @@
+"""
+TODO:
+ - end-of-line   = ( cr lf / cr / lf )
+"""
+import string
+import typing as ta
+
+from .. import dataclasses as dc
+from .. import lang
+
+
+class SseDecoderOutput(lang.Abstract):
+    pass
+
+
+@dc.dataclass(frozen=True)
+class SseComment(SseDecoderOutput, lang.Final):
+    data: bytes
+
+
+SseEventId: ta.TypeAlias = bytes
+
+
+@dc.dataclass(frozen=True)
+class SseEvent(SseDecoderOutput, lang.Final):
+    type: bytes
+    data: bytes
+    last_id: SseEventId = dc.xfield(b'', repr_fn=dc.truthy_repr)
+
+
+_DIGIT_BYTES = string.digits.encode('ascii')
+
+
+class SseDecoder:
+    """https://html.spec.whatwg.org/multipage/server-sent-events.html#event-stream-interpretation"""
+
+    def __init__(self) -> None:
+        super().__init__()
+
+        self._reset()
+        self._last_event_id = b''
+        self._reconnection_time: int | None = None
+
+    _event_type: bytes
+    _data: list[bytes]
+
+    def _reset(self) -> None:
+        self._event_type = b'message'
+        self._data = []
+
+    def _process_field(self, name: bytes, value: bytes) -> None:
+        if name == b'event':
+            self._event_type = value
+
+        elif name == b'data':
+            self._data.append(value)
+
+        elif name == b'id':
+            if 0 not in value:
+                self._last_event_id = value
+
+        elif name == b'retry':
+            if all(c in _DIGIT_BYTES for c in value):
+                self._reconnection_time = int(value)
+
+    def _dispatch_event(self) -> SseEvent:
+        data = b''.join(lang.interleave(self._data, b'\n'))
+
+        e = SseEvent(
+            type=self._event_type,
+            data=data,
+            last_id=self._last_event_id,
+        )
+
+        self._reset()
+
+        return e
+
+    def process_line(self, line: bytes) -> ta.Iterable[SseDecoderOutput]:
+        if b'\r' in line or b'\n' in line:
+            raise ValueError(line)
+
+        if not line:
+            yield self._dispatch_event()
+
+        elif line[0] == b':'[0]:
+            yield SseComment(line)
+
+        elif (c := line.find(b':')) >= 0:
+            d = c + 1
+            if len(line) > d and line[d] == b' '[0]:
+                d += 1
+            self._process_field(line[:c], line[d:])
+
+        else:
+            self._process_field(line, b'')

omlish/io.py

@@ -0,0 +1,142 @@
+import dataclasses as dc
+import io
+import typing as ta
+
+from . import check
+
+
+@dc.dataclass(frozen=True)
+class DelimitingBufferError(Exception):
+    buffer: 'DelimitingBuffer'
+
+
+class ClosedDelimitingBufferError(DelimitingBufferError):
+    pass
+
+
+class FullDelimitingBufferError(DelimitingBufferError):
+    pass
+
+
+class IncompleteDelimitingBufferError(DelimitingBufferError):
+    pass
+
+
+class DelimitingBuffer:
+    """
+    https://github.com/python-trio/trio/issues/796 :|
+    """
+
+    DEFAULT_DELIMITERS: bytes = b'\n'
+
+    def __init__(
+            self,
+            delimiters: ta.Iterable[int] = DEFAULT_DELIMITERS,
+            *,
+            keep_ends: bool = False,
+            max_size: int | None = None,
+            on_full: ta.Literal['raise', 'yield'] = 'raise',
+            on_incomplete: ta.Literal['raise', 'yield'] = 'yield',
+    ) -> None:
+        super().__init__()
+
+        self._delimiters = frozenset(check.isinstance(d, int) for d in delimiters)
+        self._keep_ends = keep_ends
+        self._max_size = max_size
+        self._on_full = on_full
+        self._on_incomplete = on_incomplete
+
+        self._buf: io.BytesIO | None = io.BytesIO()
+
+    @property
+    def is_closed(self) -> bool:
+        return self._buf is None
+
+    def tell(self) -> int:
+        if (buf := self._buf) is None:
+            raise ClosedDelimitingBufferError(self)
+        return buf.tell()
+
+    def peek(self) -> bytes:
+        if (buf := self._buf) is None:
+            raise ClosedDelimitingBufferError(self)
+        return buf.getvalue()
+
+    def _find_delim(self, data: bytes | bytearray, i: int) -> int | None:
+        r = None  # type: int | None
+        for d in self._delimiters:
+            if (p := data.find(d, i)) >= 0:
+                if r is None or p < r:
+                    r = p
+        return r
+
+    def _append_and_reset(self, chunk: bytes) -> bytes:
+        buf = check.not_none(self._buf)
+        if not buf.tell():
+            return chunk
+
+        buf.write(chunk)
+        ret = buf.getvalue()
+        buf.seek(0)
+        return ret
+
+    def feed(self, data: bytes | bytearray) -> ta.Generator[bytes, None, None]:
+        if (buf := self._buf) is None:
+            raise ClosedDelimitingBufferError(self)
+
+        if not data:
+            self._buf = None
+
+            if buf.tell():
+                if self._on_incomplete == 'raise':
+                    raise IncompleteDelimitingBufferError(self)
+
+                elif self._on_incomplete == 'yield':
+                    yield buf.getvalue()
+
+                else:
+                    raise ValueError(f'Unknown on_incomplete value: {self._on_incomplete!r}')
+
+            return
+
+        l = len(data)
+        i = 0
+        while i < l:
+            if (p := self._find_delim(data, i)) is None:
+                break
+
+            n = p + 1
+            if self._keep_ends:
+                p = n
+
+            yield self._append_and_reset(data[i:p])
+
+            i = n
+
+        if i >= l:
+            return
+
+        if self._max_size is None:
+            buf.write(data[i:])
+            return
+
+        while i < l:
+            remaining_data_len = l - i
+            remaining_buf_capacity = self._max_size - buf.tell()
+
+            if remaining_data_len < remaining_buf_capacity:
+                buf.write(data[i:])
+                return
+
+            if self._on_full == 'raise':
+                raise FullDelimitingBufferError(self)
+
+            elif self._on_full == 'yield':
+                p = i + remaining_buf_capacity
+
+                yield self._append_and_reset(data[i:p])
+
+                i = p
+
+            else:
+                raise ValueError(f'Unknown on_full value: {self._on_full!r}')

omlish/lang/__init__.py

@@ -140,6 +140,7 @@ from .iterables import (  # noqa
     flatmap,
     flatten,
     ilen,
+    interleave,
     itergen,
     peek,
     prodrange,

omlish/lang/iterables.py

@@ -37,6 +37,13 @@ def peek(vs: ta.Iterable[T]) -> tuple[T, ta.Iterator[T]]:
     return v, itertools.chain(iter((v,)), it)
 
 
+def interleave(vs: ta.Iterable[T], d: T) -> ta.Iterable[T]:
+    for i, v in enumerate(vs):
+        if i:
+            yield d
+        yield v
+
+
 Rangeable: ta.TypeAlias = ta.Union[  # noqa
     int,
     tuple[int],

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,33 +1,41 @@
-import enum
-
+"""
+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 .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
+from .ops import OpKind
 
 
 ##
 
 
-class BinaryOpKind(enum.Enum):
-    ARITH = enum.auto()
-    BIT = enum.auto()
-    CMP = enum.auto()
-
-
 class BinaryOp(dc.Frozen, lang.Final, eq=False):
     name: str
-    kind: BinaryOpKind
+    kind: OpKind
 
 
 class BinaryOps(lang.Namespace):
-    ADD = BinaryOp('add', BinaryOpKind.ARITH)
-    SUB = BinaryOp('sub', BinaryOpKind.ARITH)
+    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', BinaryOpKind.CMP)
-    NE = BinaryOp('ne', BinaryOpKind.CMP)
+    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):
@@ -44,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,3 +1,4 @@
+import enum
 import typing as ta
 
 from ... import check
@@ -11,30 +12,26 @@ from .exprs import ExprBuilder
 ##
 
 
-class MultiOp(dc.Frozen, lang.Final, eq=False):
-    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/unary.py

@@ -3,6 +3,7 @@ from ... import lang
 from .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
+from .ops import OpKind
 
 
 ##
@@ -10,10 +11,16 @@ from .exprs import ExprBuilder
 
 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.dev73.dist-info → omlish-0.0.0.dev75.dist-info}/METADATA

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

{omlish-0.0.0.dev73.dist-info → omlish-0.0.0.dev75.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=TXvFdkAU0Zr2FKdo7fyvt9nr3UjCtrnAZ0diZXSAteE,1430
-omlish/__about__.py,sha256=yPixWBOcI8ebqG0dPVHJ2dG1M4Ec4rBKr8ehmN0d7qQ,3420
+omlish/__about__.py,sha256=KmKwb6iUcg1fxhudcMoQVNM13U_ufTfnRbe5K2n-Za0,3420
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -11,6 +11,7 @@ omlish/dynamic.py,sha256=35C_cCX_Vq2HrHzGk5T-zbrMvmUdiIiwDzDNixczoDo,6541
 omlish/fnpairs.py,sha256=Sl8CMFNyDS-1JYAjSWqnT5FmUm9Lj6o7FxSRo7g4jww,10875
 omlish/fnpipes.py,sha256=AJkgz9nvRRm7oqw7ZgYyz21klu276LWi54oYCLg-vOg,2196
 omlish/genmachine.py,sha256=LCMiqvK32dAWtrlB6lKw9tXdQFiXC8rRdk4TMQYIroU,1603
+omlish/io.py,sha256=4_0naIRniQ_xGhCW44xkk3sKqgddCbtIjbs72SGqK9g,3679
 omlish/iterators.py,sha256=GGLC7RIT86uXMjhIIIqnff_Iu5SI_b9rXYywYGFyzmo,7292
 omlish/libc.py,sha256=8r7Ejyhttk9ruCfBkxNTrlzir5WPbDE2vmY7VPlceMA,15362
 omlish/matchfns.py,sha256=I1IlQGfEyk_AcFSy6ulVS3utC-uwyZM2YfUXYHc9Bw0,6152
@@ -132,13 +133,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,7 +203,7 @@ 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=eOY4bmbGdXuOOabt9NLAcTO7G49u85-HoAFW28mCXS4,6004
+omlish/http/clients.py,sha256=phwWe4a6aVU2_E-Z_zSzrmAb5iX9zoCDIMa2l6Trzck,6019
 omlish/http/collections.py,sha256=s8w5s4Gewgxxhe2Ai0R45PgJYYifrLgTbU3VXVflHj4,260
 omlish/http/consts.py,sha256=FTolezLknKU6WJjk_x2T3a5LEMlnZSqv7gzTq55lxcU,2147
 omlish/http/cookies.py,sha256=uuOYlHR6e2SC3GM41V0aozK10nef9tYg83Scqpn5-HM,6351
@@ -211,6 +212,7 @@ omlish/http/encodings.py,sha256=w2WoKajpaZnQH8j-IBvk5ZFL2O2pAU_iBvZnkocaTlw,164
 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/sse.py,sha256=T2_EXTcDfEhCF4E9B68YtEYLFb803MPnh8eCNjdPlRo,2223
 omlish/http/wsgi.py,sha256=czZsVUX-l2YTlMrUjKN49wRoP4rVpS0qpeBn4O5BoMY,948
 omlish/inject/__init__.py,sha256=JQ7x8l9MjU-kJ5ap7cPVq7SY7zbbCIrjyJAF0UeE5-s,1886
 omlish/inject/binder.py,sha256=H8AQ4ecmBOtDL8fMgrU1yUJl1gBADLNcdysRbvO8Wso,4167
@@ -242,7 +244,7 @@ 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=-DRmyoSAwSWOh7nJh4UrpR-w_hGQfe-e06S9qLjHZF8,3636
+omlish/lang/__init__.py,sha256=p63qmjZwg2CjLhMaZncnZKsuLZ6B_QVfpPGZKVH8FTw,3652
 omlish/lang/cached.py,sha256=92TvRZQ6sWlm7dNn4hgl7aWKbX0J1XUEo3DRjBpgVQk,7834
 omlish/lang/clsdct.py,sha256=AjtIWLlx2E6D5rC97zQ3Lwq2SOMkbg08pdO_AxpzEHI,1744
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -252,7 +254,7 @@ omlish/lang/descriptors.py,sha256=RRBbkMgTzg82fFFE4D0muqobpM-ZZaOta6yB1lpX3s8,66
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=kkPfcdocg-OmyN7skIqrFxNvqAv89Zc_kXKYAN8vw8g,3895
 omlish/lang/imports.py,sha256=Oy7iInOTqgZv6nyRbnvGrPv4cKKIAzPbhfDXCajDUcc,6626
-omlish/lang/iterables.py,sha256=_q6rHbdFfW3VBqez0IV3rUABoNxsA_oBv_sykm5zsbQ,2243
+omlish/lang/iterables.py,sha256=xRwktm6i2RHSb_ELfAXdjITIfE69qDyMEzgeZqvQXiU,2386
 omlish/lang/maybes.py,sha256=NYHZDjqDtwPMheDrj2VtUVujxRPf8Qpgk4ZlZCTvBZc,3492
 omlish/lang/objects.py,sha256=t7Pvj9ILoxfdAMy5HC7bb9LfUokW5WfpLaoH2YYyTjQ,4460
 omlish/lang/resolving.py,sha256=OuN2mDTPNyBUbcrswtvFKtj4xgH4H4WglgqSKv3MTy0,1606
@@ -299,7 +301,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 +390,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=qqlsyW7PM4DS2MkESKV81GMue22OnftOc8VD5KFpZI8,1242
-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=qlcci2wv_gDfOPuPpwFS-aV6f11T8ftmIDzx2dbI82k,857
+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/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/std.py,sha256=pddD8-WDDGwX97OW7MLahaZTLsO_0NLxxIIAXXq1N40,537
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
-omlish/sql/queries/unary.py,sha256=lbVfsfS2zcJFchZ4sqoGMFzNEgc_Tnfj5_P1Yjs9lqs,540
+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 +438,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.dev73.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev73.dist-info/METADATA,sha256=8-3oSBXhJcYztmni0BLIGOG4G_Wme3JfJKM25ag5sLI,4167
-omlish-0.0.0.dev73.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev73.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev73.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev73.dist-info/RECORD,,
+omlish-0.0.0.dev75.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev75.dist-info/METADATA,sha256=GuYbZyayGe8TDZ3NyirRfVwE06aEFatiflv_jOd9zQI,4167
+omlish-0.0.0.dev75.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev75.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev75.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev75.dist-info/RECORD,,