omlish 0.0.0.dev392__py3-none-any.whl → 0.0.0.dev393__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev392'
-__revision__ = 'b709bee1bc3c60ff875c432a230426a0eb51269f'
+__version__ = '0.0.0.dev393'
+__revision__ = '7624d40b9a78e52aec03b012a4b4f7b060d4f2f0'
 
 
 #

omlish/dataclasses/tools/modifiers.py

@@ -2,6 +2,13 @@ import dataclasses as dc
 import typing as ta
 
 from ... import check
+from ... import lang
+
+
+if ta.TYPE_CHECKING:
+    from ..metaclass import meta
+else:
+    meta = lang.proxy_import('..metaclass.meta', __package__)
 
 
 T = ta.TypeVar('T')
@@ -30,6 +37,9 @@ def update_fields(
         fields: ta.Iterable[str] | None = None,
 ) -> ta.Callable[[type[T]], type[T]]:
     def inner(cls):
+        if issubclass(cls, meta.DataMeta):
+            raise TypeError('update_fields() cannot be used on DataMeta subclasses')
+
         if fields is None:
             for a, v in list(cls.__dict__.items()):
                 if isinstance(v, dc.Field):

omlish/lang/__init__.py

@@ -254,6 +254,8 @@ from .maysyncs import (  # noqa
     MaysyncP,
 
     make_maysync,
+    make_maysync_from_sync,
+
     maysync,
 )
 

omlish/lang/maysyncs.py

@@ -16,6 +16,16 @@ MaysyncP: ta.TypeAlias = ta.Callable[P, Maywaitable[T]]
 
 
 def make_maysync(
+        s: ta.Callable[P, T],
+        a: ta.Callable[P, ta.Awaitable[T]],
+) -> MaysyncP[P, T]:
+    return ta.cast('MaysyncP[P, T]', _make_maysync(
+        s,
+        a,
+    ))
+
+
+def make_maysync_from_sync(
         s: ta.Callable[P, T],
         a: ta.Callable[P, ta.Awaitable[T]] | None = None,
 ) -> MaysyncP[P, T]:
@@ -25,6 +35,9 @@ def make_maysync(
     ))
 
 
+##
+
+
 def maysync(m: ta.Callable[P, ta.Awaitable[T]]) -> MaysyncP[P, T]:
     return ta.cast('MaysyncP[P, T]', _maysync(
         m,

omlish/lite/maysyncs.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP045
+# ruff: noqa: UP006 UP045
 # @omlish-lite
 """
 TODO:
@@ -34,8 +34,22 @@ class Maywaitable(ta.Protocol[T_co]):
 Maysync = ta.Callable[..., Maywaitable[T]]  # ta.TypeAlias  # omlish-amalg-typing-no-move
 
 
-class Maysync_(abc.ABC):  # noqa
-    pass
+class Maysync_(abc.ABC, ta.Generic[T]):  # noqa
+    @ta.final
+    def cast(self) -> Maysync[T]:
+        return ta.cast('Maysync[T]', self)
+
+    class FnPair(ta.NamedTuple):
+        s: ta.Callable[..., ta.Any]
+        a: ta.Callable[..., ta.Awaitable[ta.Any]]
+
+    @abc.abstractmethod
+    def fn_pair(self) -> ta.Optional[FnPair]:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def __call__(self, *args, **kwargs):  # -> Maywaitable[T]
+        raise NotImplementedError
 
 
 ##
@@ -49,16 +63,19 @@ class _Maywaitable(abc.ABC, ta.Generic[_MaysyncX, T]):
             *args: ta.Any,
             **kwargs: ta.Any,
     ) -> None:
-        self.x = x
-        self.args = args
-        self.kwargs = kwargs
+        self._x = x
+        self._args = args
+        self._kwargs = kwargs
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._x!r})'
 
     @ta.final
     def m(self) -> ta.Awaitable[T]:
         return _MaysyncFuture(_MaysyncOp(
-            ta.cast(ta.Any, self.x),
-            *self.args,
-            **self.kwargs,
+            ta.cast(ta.Any, self._x),
+            self._args,
+            self._kwargs,
         ))
 
 
@@ -76,13 +93,22 @@ class _FnMaysync(Maysync_, ta.Generic[T]):
             raise TypeError(s)
         if a is None:
             raise TypeError(a)
-        self.s = s
-        self.a = a
+        self._s = s
+        self._a = a
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._s!r}, {self._a!r})'
+
+    def fn_pair(self) -> ta.Optional[Maysync_.FnPair]:
+        return Maysync_.FnPair(
+            self._s,
+            self._a,
+        )
 
     def __get__(self, instance, owner=None):
         return _FnMaysync(
-            self.s.__get__(instance, owner),  # noqa
-            self.a.__get__(instance, owner),  # noqa
+            self._s.__get__(instance, owner),  # noqa
+            self._a.__get__(instance, owner),  # noqa
         )
 
     def __call__(self, *args, **kwargs):
@@ -92,10 +118,10 @@ class _FnMaysync(Maysync_, ta.Generic[T]):
 @ta.final
 class _FnMaywaitable(_Maywaitable[_FnMaysync[T], T]):
     def s(self) -> T:
-        return self.x.s(*self.args, **self.kwargs)
+        return self._x._s(*self._args, **self._kwargs)  # noqa
 
     async def a(self) -> T:
-        return await self.x.a(*self.args, **self.kwargs)
+        return await self._x._a(*self._args, **self._kwargs)  # noqa
 
 
 def make_maysync(
@@ -114,13 +140,19 @@ class _MgMaysync(Maysync_, ta.Generic[T]):
             self,
             mg: ta.Callable[..., _MaysyncGen[T]],
     ) -> None:
-        self.mg = mg
+        self._mg = mg
 
         functools.update_wrapper(self, mg, updated=())
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._mg!r})'
+
+    def fn_pair(self) -> ta.Optional[Maysync_.FnPair]:
+        return None
+
     def __get__(self, instance, owner=None):
         return _MgMaysync(
-            self.mg.__get__(instance, owner),  # noqa
+            self._mg.__get__(instance, owner),  # noqa
         )
 
     def __call__(self, *args, **kwargs):
@@ -130,7 +162,7 @@ class _MgMaysync(Maysync_, ta.Generic[T]):
 @ta.final
 class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
     def s(self) -> T:
-        g = self.x.mg(*self.args, **self.kwargs)
+        g = self._x._mg(*self._args, **self._kwargs)  # noqa
 
         i: ta.Any = None
         e: ta.Any = None
@@ -158,7 +190,7 @@ class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
             del o
 
     async def a(self) -> T:
-        g = self.x.mg(*self.args, **self.kwargs)
+        g = self._x._mg(*self._args, **self._kwargs)  # noqa
 
         i: ta.Any = None
         e: ta.Any = None
@@ -189,17 +221,20 @@ class _MgMaywaitable(_Maywaitable[_MgMaysync[T], T]):
 @ta.final
 class _MgMaysyncFn:
     def __init__(self, m):
-        self.m = m
+        self._m = m
 
         functools.update_wrapper(self, m, updated=())
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self._m!r})'
+
     def __get__(self, instance, owner=None):
         return _MgMaysyncFn(
-            self.m.__get__(instance, owner),
+            self._m.__get__(instance, owner),
         )
 
     def __call__(self, *args, **kwargs):
-        a = self.m(*args, **kwargs).__await__()
+        a = self._m(*args, **kwargs).__await__()
         try:
             g = iter(a)
             try:
@@ -240,13 +275,16 @@ class _MaysyncOp:
     def __init__(
             self,
             x: Maysync[T],
-            *args: ta.Any,
-            **kwargs: ta.Any,
+            args: ta.Tuple[ta.Any, ...],
+            kwargs: ta.Mapping[str, ta.Any],
     ) -> None:
         self.x = x
         self.args = args
         self.kwargs = kwargs
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self.x!r})'
+
 
 class _MaysyncFutureNotAwaitedError(RuntimeError):
     pass
@@ -260,6 +298,9 @@ class _MaysyncFuture(ta.Generic[T]):
     ) -> None:
         self.op = op
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}@{id(self):x}({self.op!r}, done={self.done!r})'
+
     done: bool = False
     result: T
     error: ta.Optional[BaseException] = None

omlish/sql/queries/relations.py

@@ -1,6 +1,5 @@
 """
 TODO:
- - join
  - subquery
 """
 import enum
@@ -8,6 +7,7 @@ import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
+from ... import marshal as msh
 from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
@@ -29,7 +29,7 @@ class Relation(Node, lang.Abstract):
 
 class Table(Relation, lang.Final):
     n: Name
-    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 #
@@ -50,7 +50,7 @@ class Join(Relation, lang.Final):
     l: Relation
     r: Relation
 
-    c: Expr | None = None
+    c: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 ##

omlish/sql/queries/selects.py

@@ -2,6 +2,7 @@ import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
+from ... import marshal as msh
 from .base import Node
 from .exprs import CanExpr
 from .exprs import Expr
@@ -26,7 +27,7 @@ class AllSelectItem(SelectItem, lang.Final):
 
 class ExprSelectItem(SelectItem, lang.Final):
     v: Expr
-    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr)
+    a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 ##
@@ -34,8 +35,8 @@ class ExprSelectItem(SelectItem, lang.Final):
 
 class Select(Stmt, lang.Final):
     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)
+    from_: Relation | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(name='from', omit_if=lang.is_none)  # noqa
+    where: Expr | None = dc.xfield(None, repr_fn=dc.opt_repr) | msh.with_field_metadata(omit_if=lang.is_none)
 
 
 CanSelectItem: ta.TypeAlias = SelectItem | CanExpr

{omlish-0.0.0.dev392.dist-info → omlish-0.0.0.dev393.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev392
+Version: 0.0.0.dev393
 Summary: omlish
 Author: wrmsr
 License-Expression: BSD-3-Clause

{omlish-0.0.0.dev392.dist-info → omlish-0.0.0.dev393.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=aT8yZ-Zh-9wfHl5Ym5ouiWC1i0cy7Q7RlhzavB6VLPI,8587
-omlish/__about__.py,sha256=XdAI-aCVCwAxt0sgNLHpPlE2oWfpMedlrB4gF020R7g,3543
+omlish/__about__.py,sha256=Ecs9Y68M7tY4vQsy6795a2JDqG9iRNujk3WD8bB9QRY,3543
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -198,7 +198,7 @@ omlish/dataclasses/processing/registry.py,sha256=iNDHwW1gsq8gTMi4XvNBBzab0OYdSKv
 omlish/dataclasses/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/dataclasses/tools/as_.py,sha256=3mTFXf563Z4ZZnbCzJHv83WizOYBs2mpigJCamxTlpQ,2893
 omlish/dataclasses/tools/iter.py,sha256=JQUFG4Gn-xthhJ3OEqXLOWkq2KhRMuIqvEow0HcFPZg,540
-omlish/dataclasses/tools/modifiers.py,sha256=xo6D4yl58HhJrFwV1JeoNrLrgC4MUA6SAXCGoyV-gnM,1212
+omlish/dataclasses/tools/modifiers.py,sha256=VpE16fYDIQo7dpT0oUbCuqr9WohMohmFdKHhVVjkQqE,1486
 omlish/dataclasses/tools/only_.py,sha256=hPpqzr9YW09YmlX_QJNU2aePHYJEIrbGCPwmnvVS_to,849
 omlish/dataclasses/tools/replace.py,sha256=izM9lPT6AhEtjqn22auqaofa0j69KO7iootF-2Uj4cY,396
 omlish/dataclasses/tools/repr.py,sha256=KFvF6uv2YYIKq8O3ZNbEAS1tqRQALsJ-SUlBNPd5_GI,190
@@ -420,7 +420,7 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=M16LXrJhMdsz5ea2qH0vws30ZvhQuQSCVFSLpRf_gTg,2096
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=ZkDWvp1jUTbw2-sDzUij4hYH4RtjnTBLHMPjrw-4ORk,6785
+omlish/lang/__init__.py,sha256=JAtUfF-W0qW4BdJz2hgXRBdjUGl43ZLUghbM_bffoIM,6814
 omlish/lang/attrs.py,sha256=zFiVuGVOq88x45464T_LxDa-ZEq_RD9zJLq2zeVEBDc,5105
 omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
@@ -435,7 +435,7 @@ omlish/lang/functions.py,sha256=aLdxhmqG0Pj9tBgsKdoCu_q15r82WIkNqDDSPQU19L8,5689
 omlish/lang/generators.py,sha256=a4D5HU_mySs2T2z3xCmE_s3t4QJkj0YRrK4-hhpGd0A,5197
 omlish/lang/imports.py,sha256=y9W9Y-d_cQ35QCLuSIPoa6vnEqSErFCz8b-34IH128U,10552
 omlish/lang/iterables.py,sha256=y1SX2Co3VsOeX2wlfFF7K3rwLvF7Dtre7VY6EpfwAwA,3338
-omlish/lang/maysyncs.py,sha256=rUeOFpoqVSbQ_YcPvky4IDBDnpm67K26ADYCNfjMSQY,683
+omlish/lang/maysyncs.py,sha256=kULOW2M9PFhLd1TdtmGGQstPgrJpl--JUv9FOHWl4f8,894
 omlish/lang/objects.py,sha256=ZsibJwNp1EXorbaObm9TlCNtuuM65snCmVb7H4_llqI,6116
 omlish/lang/outcomes.py,sha256=0PqxoKaGbBXU9UYZ6AE2QSq94Z-gFDt6wYdp0KomNQw,8712
 omlish/lang/overrides.py,sha256=IBzK6ljfLX6TLgIyKTSjhqTLcuKRkQNVtEOnBLS4nuA,2095
@@ -478,7 +478,7 @@ omlish/lite/json.py,sha256=m0Ce9eqUZG23-H7-oOp8n1sf4fzno5vtK4AK_4Vc-Mg,706
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
 omlish/lite/marshal.py,sha256=JD_8ox5-yeIo7MZ6iipCdiVxx33So52M02AtvFlRGC8,20392
 omlish/lite/maybes.py,sha256=0p_fzb6yiOjEpvMKaQ53Q6CH1VPW1or7v7Lt1JIKcgM,4359
-omlish/lite/maysyncs.py,sha256=ltB3CQ_zYl2PiTmHjtpeErZDFpNwj27JhO6_3xBmnfk,5852
+omlish/lite/maysyncs.py,sha256=MT3zF5kQ5rNlWU7db9Q_uXSM8K2C8LK85PIgdBsJyGE,7251
 omlish/lite/pycharm.py,sha256=FRHGcCDo42UzZXqNwW_DkhI-6kb_CmJKPiQ8F6mYkLA,1174
 omlish/lite/reflect.py,sha256=pzOY2PPuHH0omdtglkN6DheXDrGopdL3PtTJnejyLFU,2189
 omlish/lite/reprs.py,sha256=Tiqf_ciD8FfS0ury7FcJ5G21yY342fW0vPacYlb8EO4,2014
@@ -733,9 +733,9 @@ omlish/sql/queries/multi.py,sha256=7x6x-4jnPzxA6ZasBjnjFuhHFpWt5rGCua3UvuTMIJ0,8
 omlish/sql/queries/names.py,sha256=ko5ADruhhma9xfm4T7-UEd2uXRgGchfUeiz-xgiZlFE,2207
 omlish/sql/queries/ops.py,sha256=pDZ_2Jo_Fa8DDbtYkc6-9eehkWsZPI-jh-KFlubcY6Y,134
 omlish/sql/queries/params.py,sha256=_4Cg2MWfcU0EGcVkyOfbyJ5MA4PDUexNlaGEiqmt8Ls,1268
-omlish/sql/queries/relations.py,sha256=_uOFcv_bfS0jfAexagxNMqMftmDWuWWWeRMzEQ3g_Oc,2479
+omlish/sql/queries/relations.py,sha256=P0qBqNICyeig9sEZAYLZcTXcI1YFiBe6REm6jNhpHUI,2630
 omlish/sql/queries/rendering.py,sha256=3Ocw52DDDsUavEmb8xH-2Mhp-3pZCXsJVXFuVTOUBqk,7779
-omlish/sql/queries/selects.py,sha256=5CD4qmlv5hysQKmoZuF1bbikA-VcC9opN94Ea1QE3mU,1577
+omlish/sql/queries/selects.py,sha256=XNisb2draHURYhbZsTFw7DJQaN1Zfo2Znm-Ty0lHNTo,1773
 omlish/sql/queries/std.py,sha256=FdJkXD7oiuj8mtVzvbsL1ZocEEAfaSdOsfTVB1YhtrE,699
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
 omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
@@ -895,9 +895,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev392.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev392.dist-info/METADATA,sha256=TK9eckhnzTzWGHYKBnCjqN88cxzp2WejWEtJat98x_s,18825
-omlish-0.0.0.dev392.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev392.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev392.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev392.dist-info/RECORD,,
+omlish-0.0.0.dev393.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev393.dist-info/METADATA,sha256=siHQt0dS0bqBCCqnpqhdYepmt0xzBPGtMcJ3GNXPZAw,18825
+omlish-0.0.0.dev393.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev393.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev393.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev393.dist-info/RECORD,,