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

omlish/__about__.py

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

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/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/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/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/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,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.dist-info → omlish-0.0.0.dev73.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev73.dist-info}/RECORD

@@ -1,10 +1,10 @@
 omlish/.manifests.json,sha256=TXvFdkAU0Zr2FKdo7fyvt9nr3UjCtrnAZ0diZXSAteE,1430
-omlish/__about__.py,sha256=Xtux9lxQlFpaTqHV9Xq7BumGnu8QP3C6l4R7wQX9F_w,3420
+omlish/__about__.py,sha256=yPixWBOcI8ebqG0dPVHJ2dG1M4Ec4rBKr8ehmN0d7qQ,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
@@ -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
@@ -390,16 +390,16 @@ omlish/sql/alchemy/secrets.py,sha256=EMfy4EfTbEvrlv_41oOhn8qsoF-eTkY7HciPenIE6rI
 omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,403
 omlish/sql/queries/__init__.py,sha256=TEl0iNWVxPURJIRJSaKpy5EJkyVXw2Zej8jlKmeggAo,963
 omlish/sql/queries/base.py,sha256=_8O3MbH_OEjBnhp2oIJUZ3ClaQ8l4Sj9BdPdsP0Ie-g,224
-omlish/sql/queries/binary.py,sha256=7K8pX2ki4PsXo3RP-81LD-sl8A4nGAN7hbgJExwoQPw,1003
+omlish/sql/queries/binary.py,sha256=qqlsyW7PM4DS2MkESKV81GMue22OnftOc8VD5KFpZI8,1242
 omlish/sql/queries/exprs.py,sha256=tJ5gK21NKYbxKnJmrAUDkzaPqzg7hg6-z2GS4-MG05U,1092
 omlish/sql/queries/idents.py,sha256=erW6fE9UapuvW1ZeLfGFz7yuW6zzktWIWmOuAHeF8_g,496
-omlish/sql/queries/multi.py,sha256=7qFq3-n3g6MmYHM_lyhru9DcabiZRAQUVaOyR3gXvXU,865
+omlish/sql/queries/multi.py,sha256=qlcci2wv_gDfOPuPpwFS-aV6f11T8ftmIDzx2dbI82k,857
 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/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=B4PA__3GUB1L7bqG4e3fmUcS3Wypx8Ryy6P0rLiPBHQ,514
+omlish/sql/queries/unary.py,sha256=lbVfsfS2zcJFchZ4sqoGMFzNEgc_Tnfj5_P1Yjs9lqs,540
 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
@@ -433,9 +433,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.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,,