omlish 0.0.0.dev167__py3-none-any.whl → 0.0.0.dev168__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev167'
-__revision__ = '4dc487c3620d4629b8a2895a84511a4be478a801'
+__version__ = '0.0.0.dev168'
+__revision__ = 'ecfbedaaef82716f605534252d3eabcc71b2f5c6'
 
 
 #

omlish/lite/check.py

@@ -2,6 +2,8 @@
 """
 TODO:
  - def maybe(v: lang.Maybe[T])
+ - def not_ ?
+ - ** class @dataclass Raise - user message should be able to be an exception type or instance or factory
 """
 import collections
 import threading

omlish/lite/strings.py

@@ -27,6 +27,28 @@ def strip_with_newline(s: str) -> str:
     return s.strip() + '\n'
 
 
+@ta.overload
+def split_keep_delimiter(s: str, d: str) -> str:
+    ...
+
+
+@ta.overload
+def split_keep_delimiter(s: bytes, d: bytes) -> bytes:
+    ...
+
+
+def split_keep_delimiter(s, d):
+    ps = []
+    i = 0
+    while i < len(s):
+        if (n := s.find(d, i)) < i:
+            ps.append(s[i:])
+            break
+        ps.append(s[i:n + 1])
+        i = n + 1
+    return ps
+
+
 ##
 
 

omlish/os/paths.py

@@ -21,8 +21,12 @@ def relative_symlink(
         *,
         target_is_directory: bool = False,
         dir_fd: ta.Optional[int] = None,
+        make_dirs: bool = False,
         **kwargs: ta.Any,
 ) -> None:
+    if make_dirs:
+        os.makedirs(os.path.dirname(dst), exist_ok=True)
+
     os.symlink(
         os.path.relpath(src, os.path.dirname(dst)),
         dst,

omlish/sql/queries/__init__.py

@@ -22,13 +22,13 @@ from .exprs import (  # noqa
     ExprBuilder,
     Literal,
     NameExpr,
-    Param,
 )
 
 from .idents import (  # noqa
     CanIdent,
     Ident,
     IdentBuilder,
+    IdentLike,
 )
 
 from .multi import (  # noqa
@@ -41,12 +41,20 @@ from .names import (  # noqa
     CanName,
     Name,
     NameBuilder,
+    NameLike,
 )
 
 from .ops import (  # noqa
     OpKind,
 )
 
+from .params import (  # noqa
+    CanParam,
+    Param,
+    ParamBuilder,
+    as_param,
+)
+
 from .relations import (  # noqa
     CanRelation,
     CanTable,

omlish/sql/queries/building.py

@@ -5,6 +5,7 @@ from .idents import IdentBuilder
 from .inserts import InsertBuilder
 from .multi import MultiBuilder
 from .names import NameBuilder
+from .params import ParamBuilder
 from .relations import RelationBuilder
 from .selects import SelectBuilder
 from .stmts import StmtBuilder
@@ -23,6 +24,8 @@ class StdBuilder(
 
     RelationBuilder,
 
+    ParamBuilder,
+
     NameBuilder,
     IdentBuilder,
 

omlish/sql/queries/exprs.py

@@ -8,10 +8,11 @@ import typing as ta
 from ... import lang
 from .base import Node
 from .base import Value
-from .idents import Ident
+from .idents import IdentLike
 from .names import CanName
 from .names import Name
 from .names import NameBuilder
+from .names import NameLike
 
 
 ##
@@ -21,30 +22,21 @@ class Expr(Node, lang.Abstract):
     pass
 
 
+#
+
+
 class Literal(Expr, lang.Final):
     v: Value
 
 
-class NameExpr(Expr, lang.Final):
-    n: Name
+#
 
 
-class Param(Expr, lang.Final):
-    n: str | None = None
+class NameExpr(Expr, lang.Final):
+    n: Name
 
-    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
@@ -69,7 +61,7 @@ class ExprBuilder(NameBuilder):
     def expr(self, o: CanExpr) -> Expr:
         if isinstance(o, Expr):
             return o
-        elif isinstance(o, (Name, Ident)):
+        elif isinstance(o, (NameLike, IdentLike)):
             return NameExpr(self.name(o))
         else:
             return self.literal(o)
@@ -77,12 +69,3 @@ 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/idents.py

@@ -1,3 +1,5 @@
+import abc
+import functools
 import typing as ta
 
 from ... import lang
@@ -8,22 +10,58 @@ from .base import Node
 ##
 
 
-class Ident(Node, lang.Final):
+class IdentLike(abc.ABC):  # noqa
+    pass
+
+
+##
+
+
+class Ident(Node, IdentLike, lang.Final):
     s: str
 
 
-CanIdent: ta.TypeAlias = Ident | str
+##
+
+
+@functools.singledispatch
+def as_ident(o: ta.Any) -> Ident:
+    raise TypeError(o)
+
+
+@as_ident.register
+def _(i: Ident) -> Ident:
+    return i
+
+
+@as_ident.register
+def _(s: str) -> Ident:
+    return Ident(s)
+
+
+##
+
+
+CanIdent: ta.TypeAlias = IdentLike | Ident | str
+
+
+class IdentAccessor(lang.Final):
+    def __getattr__(self, s: str) -> Ident:
+        return Ident(s)
+
+    def __call__(self, o: CanIdent) -> Ident:
+        return as_ident(o)
+
+
+##
 
 
 class IdentBuilder(Builder):
+    @ta.final
     def ident(self, o: CanIdent) -> Ident:
-        if isinstance(o, Ident):
-            return o
-        elif isinstance(o, str):
-            return Ident(o)
-        else:
-            raise TypeError(o)
+        return as_ident(o)
 
     @ta.final
-    def i(self, o: CanIdent) -> Ident:
-        return self.ident(o)
+    @property
+    def i(self) -> IdentAccessor:
+        return IdentAccessor()

omlish/sql/queries/names.py

@@ -1,34 +1,101 @@
+import abc
+import functools
 import typing as ta
 
+from ... import check
 from ... import dataclasses as dc
 from ... import lang
 from .base import Node
 from .idents import CanIdent
 from .idents import Ident
 from .idents import IdentBuilder
+from .idents import as_ident
 
 
 ##
 
 
-class Name(Node, lang.Final):
-    ps: ta.Sequence[Ident] = dc.xfield(coerce=tuple)
+class NameLike(abc.ABC):  # noqa
+    pass
 
 
-CanName: ta.TypeAlias = Name | CanIdent | ta.Sequence[CanIdent]
+##
+
+
+def _coerce_name_parts(o: ta.Iterable[Ident]) -> ta.Sequence[Ident]:
+    check.not_isinstance(o, str)
+    return check.not_empty(tuple(check.isinstance(e, Ident) for e in o))
+
+
+class Name(Node, NameLike, lang.Final):
+    ps: ta.Sequence[Ident] = dc.xfield(coerce=_coerce_name_parts)
+
+
+##
+
+
+@functools.singledispatch
+def as_name(o: ta.Any) -> Name:
+    if isinstance(o, ta.Sequence):
+        return Name([as_ident(p) for p in o])
+    else:
+        raise TypeError(o)
+
+
+@as_name.register
+def _(n: Name) -> Name:
+    return n
+
+
+@as_name.register
+def _(o: Ident | str) -> Name:
+    return Name([as_ident(o)])
+
+
+##
+
+
+CanName: ta.TypeAlias = ta.Union[
+    NameLike,
+    Name,
+    CanIdent,
+    ta.Sequence[CanIdent],
+    'NameAccessor',
+]
+
+
+class NameAccessor(NameLike, lang.Final):
+    def __init__(self, ps: tuple[str, ...] = ()) -> None:
+        super().__init__()
+        self.__query_name_parts__ = ps
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.__query_name_parts__!r})'
+
+    def __getattr__(self, s: str) -> 'NameAccessor':
+        return NameAccessor((*self.__query_name_parts__, s))
+
+    def __call__(self, o: CanName) -> Name:
+        n = as_name(o)
+        if (ps := self.__query_name_parts__):
+            n = Name(tuple(*tuple(Ident(p) for p in ps), *n.ps))  # type: ignore[arg-type]
+        return n
+
+
+@as_name.register
+def _(a: NameAccessor) -> Name:
+    return Name(tuple(Ident(p) for p in a.__query_name_parts__))
+
+
+##
 
 
 class NameBuilder(IdentBuilder):
+    @ta.final
     def name(self, o: CanName) -> Name:
-        if isinstance(o, Name):
-            return o
-        elif isinstance(o, (Ident, str)):
-            return Name([self.ident(o)])
-        elif isinstance(o, ta.Sequence):
-            return Name([self.ident(p) for p in o])
-        else:
-            raise TypeError(o)
+        return as_name(o)
 
     @ta.final
-    def n(self, o: CanName) -> Name:
-        return self.name(o)
+    @property
+    def n(self) -> NameAccessor:
+        return NameAccessor()

omlish/sql/queries/params.py

@@ -0,0 +1,64 @@
+import typing as ta
+
+from ... import lang
+from .base import Builder
+from .exprs import Expr
+
+
+##
+
+
+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
+
+
+##
+
+
+CanParam: ta.TypeAlias = Param | str | None
+
+
+def as_param(o: CanParam = None) -> Param:
+    if isinstance(o, Param):
+        return o
+    else:
+        return Param(o)
+
+
+##
+
+
+class ParamAccessor(lang.Final):
+    def __getattr__(self, s: str) -> Param:
+        return Param(s)
+
+    def __call__(self, o: CanParam = None) -> Param:
+        return as_param(o)
+
+
+##
+
+
+class ParamBuilder(Builder):
+    @ta.final
+    def param(self, o: CanParam = None) -> Param:
+        return as_param(o)
+
+    @ta.final
+    @property
+    def p(self) -> ParamAccessor:
+        return ParamAccessor()

omlish/sql/queries/rendering.py

@@ -29,13 +29,13 @@ from .binary import BinaryOp
 from .binary import BinaryOps
 from .exprs import Literal
 from .exprs import NameExpr
-from .exprs import Param
 from .idents import Ident
 from .inserts import Insert
 from .inserts import Values
 from .multi import Multi
 from .multi import MultiKind
 from .names import Name
+from .params import Param
 from .relations import Table
 from .selects import Select
 from .selects import SelectItem

{omlish-0.0.0.dev167.dist-info → omlish-0.0.0.dev168.dist-info}/METADATA

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

{omlish-0.0.0.dev167.dist-info → omlish-0.0.0.dev168.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=0BnQGD2dcXEma0Jop2ZesvDNzSj3CAJBNq8aTGuBz9A,7276
-omlish/__about__.py,sha256=6MZuOZq8DwHRIcwPmVPdl5xZJjs_D7eV9-nFWn00wgI,3409
+omlish/__about__.py,sha256=zpJK1N36A2zarYgLGuGMOmoRcQ1YdO2W0GFM7G2k-Sw,3409
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -367,7 +367,7 @@ omlish/lifecycles/states.py,sha256=zqMOU2ZU-MDNnWuwauM3_anIAiXM8LoBDElDEraptFg,1
 omlish/lifecycles/transitions.py,sha256=qQtFby-h4VzbvgaUqT2NnbNumlcOx9FVVADP9t83xj4,1939
 omlish/lite/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omlish/lite/cached.py,sha256=O7ozcoDNFm1Hg2wtpHEqYSp_i_nCLNOP6Ueq_Uk-7mU,1300
-omlish/lite/check.py,sha256=KvcO86LqWlh2j4ORaZXRR4FM8fFb7kUkNqq3lTs0Ta0,12821
+omlish/lite/check.py,sha256=0PD-GKtaDqDX6jU5KbzbMvH-vl6jH82xgYfplmfTQkg,12941
 omlish/lite/contextmanagers.py,sha256=m9JO--p7L7mSl4cycXysH-1AO27weDKjP3DZG61cwwM,1683
 omlish/lite/inject.py,sha256=EEaioN9ESAveVCMe2s5osjwI97FPRUVoU8P95vGUiYo,23376
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
@@ -381,7 +381,7 @@ omlish/lite/runtime.py,sha256=XQo408zxTdJdppUZqOWHyeUR50VlCpNIExNGHz4U6O4,459
 omlish/lite/secrets.py,sha256=3Mz3V2jf__XU9qNHcH56sBSw95L3U2UPL24bjvobG0c,816
 omlish/lite/socket.py,sha256=7OYgkXTcQv0wq7TQuLnl9y6dJA1ZT6Vbc1JH59QlxgY,1792
 omlish/lite/socketserver.py,sha256=doTXIctu_6c8XneFtzPFVG_Wq6xVmA3p9ymut8IvBoU,1586
-omlish/lite/strings.py,sha256=SkCQPtw1grKGr1KFgJr3CL3ocvCEcPwH7XIzb-JxFAY,1610
+omlish/lite/strings.py,sha256=nGWaOi9LzTjkc5kPN2IqsVN8PUw8m_2yllTGRUQU5PI,1983
 omlish/lite/typing.py,sha256=U3-JaEnkDSYxK4tsu_MzUn3RP6qALBe5FXQXpD-licE,1090
 omlish/logs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/logs/abc.py,sha256=ho4ABKYMKX-V7g4sp1BByuOLzslYzLlQ0MESmjEpT-o,8005
@@ -438,7 +438,7 @@ omlish/os/deathsig.py,sha256=hk9Yq2kyDdI-cI7OQH7mOfpRbOKzY_TfPKEqgrjVYbA,641
 omlish/os/files.py,sha256=1tNy1z5I_CgYKA5c6lOfsXc-hknP4tQDbSShdz8HArw,1308
 omlish/os/journald.py,sha256=2nI8Res1poXkbLc31--MPUlzYMESnCcPUkIxDOCjZW0,3903
 omlish/os/linux.py,sha256=whJ6scwMKSFBdXiVhJW0BCpJV4jOGMr-a_a3Bhwz6Ls,18938
-omlish/os/paths.py,sha256=o1vTpQgbOQR0X6Wtb_7oqajxykMy58yJ0WCQIaY9gAA,735
+omlish/os/paths.py,sha256=hqPiyg_eYaRoIVPdAeX4oeLEV4Kpln_XsH0tHvbOf8Q,844
 omlish/os/pidfile.py,sha256=S4Nbe00oSxckY0qCC9AeTEZe7NSw4eJudnQX7wCXzks,1738
 omlish/os/sizes.py,sha256=ohkALLvqSqBX4iR-7DMKJ4pfOCRdZXV8htH4QywUNM0,152
 omlish/reflect/__init__.py,sha256=4-EuCSX1qpEWfScCFzAJv_XghHFu4cXxpxKeBKrosQ4,720
@@ -507,19 +507,20 @@ 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=BdhONMw2JebX-jEgYb1WrM5L3vkJOzQRm0nt04IYKgQ,1229
+omlish/sql/queries/__init__.py,sha256=8wdq6PBf5YzqQWFu-CE8om6BN38sDAD9UEz9VzkojzM,1337
 omlish/sql/queries/base.py,sha256=_8O3MbH_OEjBnhp2oIJUZ3ClaQ8l4Sj9BdPdsP0Ie-g,224
 omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
-omlish/sql/queries/building.py,sha256=dIQyEqNef2egKAf5qO_aZvXxlAEfxIGWS23qvJ-ozqQ,591
-omlish/sql/queries/exprs.py,sha256=kAI5PmvfJ-TqEzzc9H4_womFShT1eA0jWSZH2j2Wg-c,1802
-omlish/sql/queries/idents.py,sha256=erW6fE9UapuvW1ZeLfGFz7yuW6zzktWIWmOuAHeF8_g,496
+omlish/sql/queries/building.py,sha256=lmHItVEi0IkIDEhYL1le8adNhjah0SHhffm59CZtpH4,643
+omlish/sql/queries/exprs.py,sha256=THeSyFF8bouDvU-Keej-hyFUwbp63bw0HpAF4lCYuiQ,1187
+omlish/sql/queries/idents.py,sha256=w2RxO6SR3K-u30S259OtnAZaPv7YA70PzY9R7RtuCQ8,891
 omlish/sql/queries/inserts.py,sha256=Uo0ewnLPEt43dnX5AJWOC9ioViou7xYes7sGT9lD_0k,1281
 omlish/sql/queries/marshal.py,sha256=uLN_gOqiYHBQioZEvg7OREycY0bzKwzBw5mnbg_0cio,2938
 omlish/sql/queries/multi.py,sha256=7x6x-4jnPzxA6ZasBjnjFuhHFpWt5rGCua3UvuTMIJ0,837
-omlish/sql/queries/names.py,sha256=YiIyS6ehYMYrdLlUxMawV_Xf2zdi7RwVO9Qsxr_W4_4,772
+omlish/sql/queries/names.py,sha256=4sDvgRobMEt_6mDeuYVbCqHzLCOwpXUdEyyB4-QjxKo,1996
 omlish/sql/queries/ops.py,sha256=B7IDfjr2DW5LJhWoNaY1WW90BJhe5ZtmxIELhWXbW-0,129
+omlish/sql/queries/params.py,sha256=iR8tnetkZFWY378iUbPe08d86g-Wf1J3YqfZr_KhIwQ,1175
 omlish/sql/queries/relations.py,sha256=-d3n-dN17c3TPMZmzSplhWawllUzdq12XPDAuzoeMEQ,838
-omlish/sql/queries/rendering.py,sha256=DUmdsQqChCBxCSXSL0dDUz0H5joTL_qayhdErsWz6dQ,5945
+omlish/sql/queries/rendering.py,sha256=NOJqwxK8yt3Morq5yhgI-zU_51MSyhDvSc8S-8tURVM,5946
 omlish/sql/queries/selects.py,sha256=8dqm4KyrJvOsW3KHSO7qLEfPlZa7sJDp8puuGxrfvoA,1369
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
 omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
@@ -557,9 +558,9 @@ omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,329
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev167.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev167.dist-info/METADATA,sha256=XQoZ5IEtdiX_6-I2wMBv-GB3-Nz6-WbQLpzCKbEjxkI,4264
-omlish-0.0.0.dev167.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-omlish-0.0.0.dev167.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev167.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev167.dist-info/RECORD,,
+omlish-0.0.0.dev168.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev168.dist-info/METADATA,sha256=CkmiX1w3Ef334-qtNR8QvHcHiUtJrd3uPwzmUJ1hBZE,4264
+omlish-0.0.0.dev168.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+omlish-0.0.0.dev168.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev168.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev168.dist-info/RECORD,,