omlish 0.0.0.dev72__tar.gz → 0.0.0.dev73__tar.gz

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

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

{omlish-0.0.0.dev72 → omlish-0.0.0.dev73}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev72'
-__revision__ = '4448e03bbb77cb149e46eeefb0e9e61faed2a494'
+__version__ = '0.0.0.dev73'
+__revision__ = '1fa2fcb99d4ea871fe3f5aa5c094ae37d0b1090c'
 
 
 #

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

@@ -1,6 +1,8 @@
+import enum
+
 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
@@ -9,16 +11,23 @@ from .exprs import ExprBuilder
 ##
 
 
-class BinaryOp(Node, lang.Final):
+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
 
 
 class BinaryOps(lang.Namespace):
-    ADD = BinaryOp('add')
-    SUB = BinaryOp('sub')
+    ADD = BinaryOp('add', BinaryOpKind.ARITH)
+    SUB = BinaryOp('sub', BinaryOpKind.ARITH)
 
-    EQ = BinaryOp('eq')
-    NE = BinaryOp('ne')
+    EQ = BinaryOp('eq', BinaryOpKind.CMP)
+    NE = BinaryOp('ne', BinaryOpKind.CMP)
 
 
 class Binary(Expr, lang.Final):

{omlish-0.0.0.dev72 → omlish-0.0.0.dev73}/omlish/sql/queries/multi.py

@@ -3,7 +3,6 @@ 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,7 +11,7 @@ from .exprs import ExprBuilder
 ##
 
 
-class MultiOp(Node, lang.Final):
+class MultiOp(dc.Frozen, lang.Final, eq=False):
     name: str
 
 

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

@@ -1,5 +1,5 @@
+from ... import dataclasses as dc
 from ... import lang
-from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
 from .exprs import ExprBuilder
@@ -8,7 +8,7 @@ from .exprs import ExprBuilder
 ##
 
 
-class UnaryOp(Node, lang.Final):
+class UnaryOp(dc.Frozen, lang.Final, eq=False):
     name: str
 
 

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

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

{omlish-0.0.0.dev72 → omlish-0.0.0.dev73}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev72'
+version = '0.0.0.dev73'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',