omlish 0.0.0.dev72__tar.gz → 0.0.0.dev74__tar.gz

{omlish-0.0.0.dev72/omlish.egg-info → omlish-0.0.0.dev74}/PKG-INFO

@@ -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 → omlish-0.0.0.dev74}/omlish/__about__.py

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

{omlish-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev74/omlish/sql/queries/binary.py

@@ -0,0 +1,95 @@
+"""
+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 BinaryOp(dc.Frozen, lang.Final, eq=False):
+    name: str
+    kind: OpKind
+
+
+class BinaryOps(lang.Namespace):
+    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)
+
+    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):
+    op: BinaryOp
+    l: Expr
+    r: Expr
+
+
+class BinaryBuilder(ExprBuilder):
+    def binary(self, op: BinaryOp, *es: CanExpr) -> Expr:
+        check.not_empty(es)
+        l = self.expr(es[0])
+        for r in es[1:]:
+            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 mul(self, *es: CanExpr) -> Expr:
+        return self.binary(BinaryOps.MUL, *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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev74/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-0.0.0.dev72 → omlish-0.0.0.dev74}/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-0.0.0.dev74/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-0.0.0.dev72 → omlish-0.0.0.dev74}/omlish/sql/queries/relations.py

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