omlish 0.0.0.dev298__py3-none-any.whl → 0.0.0.dev299__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev298'
-__revision__ = '9e881abfe892f0f87226c902329ce0b913e28eed'
+__version__ = '0.0.0.dev299'
+__revision__ = '73b5419aa5d43e554a35a615d906559440e76d1b'
 
 
 #

omlish/argparse/cli.py

@@ -9,6 +9,7 @@ TODO:
  - auto match all underscores to hyphens
  - pre-run, post-run hooks
  - exitstack?
+ - suggestion - difflib.get_close_matches
 """
 import argparse
 import dataclasses as dc

omlish/lang/functions.py

@@ -211,6 +211,9 @@ class Args:
         self.args = args
         self.kwargs = kwargs
 
+    def __bool__(self) -> bool:
+        return bool(self.args) or bool(self.kwargs)
+
     def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
         return Args(
             *self.args,

omlish/sql/__init__.py

@@ -5,9 +5,9 @@ from .. import lang as _lang
 
 
 if _ta.TYPE_CHECKING:
-    from . import api
+    from . import api  # noqa
 else:
-    api = _lang.proxy_import('.api', __package__)
+    globals()['api'] = _lang.proxy_import('.api', __package__)
 
 from .dbs import (  # noqa
     DbLoc,
@@ -24,6 +24,6 @@ from .qualifiedname import (  # noqa
 )
 
 if _ta.TYPE_CHECKING:
-    from . import queries
+    from . import queries  # noqa
 else:
-    queries = _lang.proxy_import('.queries', __package__)
+    globals()['queries'] = _lang.proxy_import('.queries', __package__)

omlish/sql/alchemy/apiadapter.py

@@ -25,6 +25,11 @@ class SqlalchemyApiWrapper(api.ContextCloser, ta.Generic[T]):
         self._u = u
         self._auto_close = auto_close
 
+    @property
+    @ta.override
+    def _is_resourceless(self) -> bool:
+        return not self._auto_close
+
     def _close(self) -> None:
         if self._auto_close and hasattr(self._u, 'close'):
             self._u.close()

omlish/sql/api/__init__.py

@@ -1,3 +1,9 @@
+from .asquery import (  # noqa
+    AsQueryParams,
+    as_query,
+    as_query_,
+)
+
 from .base import (  # noqa
     Querier,
     Rows,
@@ -37,8 +43,6 @@ from .funcs import (  # noqa
 from .queries import (  # noqa
     QueryMode,
     Query,
-
-    as_query,
 )
 
 from .resources import (  # noqa

omlish/sql/api/_queries.py

@@ -1,10 +1,12 @@
 """
 TODO:
  - dialect lol
+ - args lol
 """
 from ..queries import Stmt
 from ..queries.rendering import render
-from .funcs import as_query
+from .asquery import AsQueryParams
+from .asquery import as_query_
 from .queries import Query
 from .queries import QueryMode
 
@@ -12,17 +14,19 @@ from .queries import QueryMode
 ##
 
 
-@as_query.register
+@as_query_.register
 def _(
         stmt: Stmt,
         *,
-        mode: QueryMode | str | None = None,
+        params: AsQueryParams,
 ) -> Query:
     rq = render(stmt)
 
-    # FIXME: rq.args
+    if rq.args:
+        raise NotImplementedError
+
     return Query(
-        mode=QueryMode.of(mode, QueryMode.QUERY),
+        mode=QueryMode.of(params.mode, QueryMode.QUERY),
         text=rq.s,
         args=[],
     )

omlish/sql/api/asquery.py

@@ -0,0 +1,67 @@
+import dataclasses as dc
+import functools
+import typing as ta
+
+from ... import check
+from .base import Querier
+from .queries import Query
+from .queries import QueryMode
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class AsQueryParams:
+    mode: QueryMode | str | None = None
+    querier: Querier | None = None
+
+
+def as_query(
+        obj: ta.Any,
+        *args: ta.Any,
+        mode: QueryMode | str | None = None,
+        querier: Querier | None = None,
+) -> Query:
+    return as_query_(
+        obj,
+        *args,
+        params=AsQueryParams(
+            mode=mode,
+            querier=querier,
+        ),
+    )
+
+
+@functools.singledispatch
+def as_query_(
+        obj: ta.Any,
+        *args: ta.Any,
+        params: AsQueryParams,
+) -> Query:
+    raise TypeError(obj)
+
+
+@as_query_.register
+def _(
+        q: Query,
+        *,
+        params: AsQueryParams,
+) -> Query:
+    if params.mode is not None:
+        check.arg(q.mode is QueryMode.of(params.mode))
+
+    return q
+
+
+@as_query_.register
+def _(
+        s: str,
+        *args: ta.Any,
+        params: AsQueryParams,
+) -> Query:
+    return Query(
+        mode=QueryMode.of(params.mode, QueryMode.QUERY),
+        text=s,
+        args=args,
+    )

omlish/sql/api/funcs.py

@@ -1,9 +1,9 @@
 import typing as ta
 
+from .asquery import as_query
 from .base import Querier
 from .base import Rows
 from .queries import QueryMode
-from .queries import as_query
 from .rows import Row
 
 
@@ -15,7 +15,12 @@ def query(
         obj: ta.Any,
         *args: ta.Any,
 ) -> Rows:
-    q = as_query(obj, *args, mode=QueryMode.QUERY)
+    q = as_query(
+        obj,
+        *args,
+        mode=QueryMode.QUERY,
+        querier=querier,
+    )
 
     return querier.query(q)
 
@@ -40,7 +45,12 @@ def exec(  # noqa
         obj: ta.Any,
         *args: ta.Any,
 ) -> None:
-    q = as_query(obj, *args, mode=QueryMode.EXEC)
+    q = as_query(
+        obj,
+        *args,
+        mode=QueryMode.EXEC,
+        querier=querier,
+    )
 
     with querier.query(q):
         pass

omlish/sql/api/queries.py

@@ -1,6 +1,5 @@
 import dataclasses as dc
 import enum
-import functools
 import typing as ta
 
 from ... import check
@@ -35,41 +34,3 @@ class Query(lang.Final):
     mode: QueryMode
     text: str
     args: ta.Sequence[ta.Any]
-
-
-##
-
-
-@functools.singledispatch
-def as_query(
-        obj: ta.Any,
-        *args: ta.Any,
-        mode: QueryMode | str | None = None,
-        **kwargs: ta.Any,
-) -> Query:
-    raise TypeError(obj)
-
-
-@as_query.register
-def _(
-        q: Query,
-        *,
-        mode: QueryMode | str | None = None,
-) -> Query:
-    if mode is not None:
-        check.arg(q.mode is QueryMode.of(mode))
-
-    return q
-
-
-@as_query.register
-def _(
-        s: str,
-        *args: ta.Any,
-        mode: QueryMode | str | None = None,
-) -> Query:
-    return Query(
-        mode=QueryMode.of(mode, QueryMode.QUERY),
-        text=s,
-        args=args,
-    )

omlish/sql/api/resources.py

@@ -38,6 +38,10 @@ class Closer(lang.Abstract):
             self.__repr = repr(self)
             self.__traceback = traceback.format_stack()[:-1]
 
+    @property
+    def _is_resourceless(self) -> bool:
+        return False
+
     @ta.final
     def close(self) -> None:
         self.__closed = True
@@ -47,7 +51,11 @@ class Closer(lang.Abstract):
         pass
 
     def __del__(self) -> None:
-        if self.__debug and not self.__closed:
+        if (
+                not self._is_resourceless and
+                self.__debug and
+                not self.__closed
+        ):
             warnings.warn(
                 f'\n\n{(sep := ("=" * 40))}\n'
                 f'{self.__class__.__name__} object {self.__repr} '

{omlish-0.0.0.dev298.dist-info → omlish-0.0.0.dev299.dist-info}/METADATA

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

{omlish-0.0.0.dev298.dist-info → omlish-0.0.0.dev299.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=vK2SteFsTmtDVM8ABHvsQ7GEMFh1KSe1ufItMzu4J98,3478
+omlish/__about__.py,sha256=tghPJ3r3hoOBraig8kr81p5Jv_kgJPAvrhVaVK8Li7o,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -87,7 +87,7 @@ omlish/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B2W6ie
 omlish/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 omlish/argparse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse/all.py,sha256=NeeMM5MIebY7XDAHaCxUzeesEoUYwsf5i9PrBUcO1cI,1057
-omlish/argparse/cli.py,sha256=vVLlhJPt0PKaNfIBrXTzz9cHyy2dFEY8hlQ3GvtKbwc,8704
+omlish/argparse/cli.py,sha256=KftfiN0fBOdybCWoTW4l967r8OrXe_WtjOQWARcHTv0,8746
 omlish/asyncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/asyncs/all.py,sha256=MjW0P9K8XBrw6AaH2X_qD5Y7hEZOF0cktqFv5BDGH-k,649
 omlish/asyncs/bridge.py,sha256=oFCqwGY9u9JYB-tee7GS0gjtIFp19rdZD2Z0YPRjj9k,9738
@@ -473,7 +473,7 @@ omlish/lang/contextmanagers.py,sha256=pN8X4ZCagqU9_xWumi8gZPdMIWlInA-_zQrkl7o5VP
 omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
-omlish/lang/functions.py,sha256=bg2IxTFmd_J22qF3XWIRBvSIpLwPRiH_KxGXcm0QVrc,5944
+omlish/lang/functions.py,sha256=51CoKtH_-CXUsKvtCexaR3OLZOtIwSdv4f4DtGBZdpA,6029
 omlish/lang/generators.py,sha256=5tbjVAywiZH6oAdj1sJLRMtIkC9y3rAkecLT7Z3m7_g,5251
 omlish/lang/imports.py,sha256=aC1u2eTrxHhhxShKbJvXswe3aJ7K76vT4YK8LrsvRWU,10476
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
@@ -720,28 +720,29 @@ omlish/specs/proto/_antlr/Protobuf3Listener.py,sha256=hjzAJjcj4xWRim-68v-6QwIsPV
 omlish/specs/proto/_antlr/Protobuf3Parser.py,sha256=VmkUyJx3WxIgAecOa1BGwbO9fVNysZt5-arQ-wDubpk,132411
 omlish/specs/proto/_antlr/Protobuf3Visitor.py,sha256=zEVBXly2k9Cqmgdb45QwpLR-fZCEq8hpp2WQj-s7Wps,8782
 omlish/specs/proto/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/sql/__init__.py,sha256=AFcSRUcz9sYMqlOsv8oZWai3Oi1PLygJbZ2YSzWUvhc,459
+omlish/sql/__init__.py,sha256=DXK3EjPKXKS0WUV-bIVtzH0GsmOqCYrNLFkvDJGCORM,501
 omlish/sql/abc.py,sha256=3hrCjB4jnPVMef_YXClCblzYUZ9l9yaxJJdd5_Nu9GM,4043
 omlish/sql/dbapi.py,sha256=DfMxCyltpMj6hUiLti1omUvJyMGbrkGxcz2ywolOpPA,2979
 omlish/sql/dbs.py,sha256=65e388987upJpsFX8bNL7uhiYv2sCsmk9Y04V0MXdsI,1873
 omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
 omlish/sql/qualifiedname.py,sha256=c3GQzxh9sNyE_TP32PnlCun_F2bKXvX1ohtt6esTsjo,2269
 omlish/sql/alchemy/__init__.py,sha256=mZiu0F4Y_5qQpl-xz4xnb0feVGZTDp3I4R6k7SVY_7M,760
-omlish/sql/alchemy/apiadapter.py,sha256=NjgOE8UMPlgENf7KKEsK8ZG8ECe6Ey4Hm8yXt5t-wLs,2588
+omlish/sql/alchemy/apiadapter.py,sha256=QrkvlzqMl_S2nxOPQ8-g1UaWRSTZNna1-8XouOn8xdY,2696
 omlish/sql/alchemy/asyncs.py,sha256=MwZwWIaZsUCQLcTA8mdHUPZmR-pXEVSAsvd15FCm3W4,3692
 omlish/sql/alchemy/duckdb.py,sha256=kr7pIhiBLNAuZrcigHDtFg9zHkVcrRW3LfryO9VJ4mk,3749
 omlish/sql/alchemy/exprs.py,sha256=gO4Fj4xEY-PuDgV-N8hBMy55glZz7O-4H7v1LWabfZY,323
 omlish/sql/alchemy/secrets.py,sha256=WEeaec1ejQcE3Yaa7p5BSP9AMGEzy1lwr7QMSRL0VBw,180
 omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,403
-omlish/sql/api/__init__.py,sha256=YbObVEd09r_vVkcPLrx9qXCeV4Xdh23KmjYnCziOqQc,884
-omlish/sql/api/_queries.py,sha256=9BXQIGocBntbQ3B4raDg9G7UEr5qOYDdrB6netG1CRU,456
+omlish/sql/api/__init__.py,sha256=Ee-DgQPo_fUqlYL3NBzk6kmj_cXlnZIua5jk85UHWHI,951
+omlish/sql/api/_queries.py,sha256=FqIrtU6JdzQD4S4zv9tdDuzCLHSgJjK8WSfT7Ag4umI,530
+omlish/sql/api/asquery.py,sha256=8eBoJyyu0kHW3k3yytEcT-B6UAI_slKB0QtSK_WQS7g,1203
 omlish/sql/api/base.py,sha256=E_t54OFr0BX604vOfQZGxh_n6EdOBF2Tvnrg25dMKXo,1314
 omlish/sql/api/columns.py,sha256=UBol4bfwZ1nhcjv2gE1JhUMzRFeqtiCDo2T9CUGYb64,1943
 omlish/sql/api/dbapi.py,sha256=bDVqmljmLMdurMhIy3vx-dJvK1KiZ7XBhZ2Zx6W9aBs,2627
 omlish/sql/api/errors.py,sha256=YtC2gz5DqRTT3uCJniUOufVH1GEnFIc5ElkYLK3BHwM,230
-omlish/sql/api/funcs.py,sha256=RRkDmlr3vCAO38nY15LMYvEF8jwQ4kTVCc0J4PkstSE,707
-omlish/sql/api/queries.py,sha256=xybadpIULwFSmDinFVi1qlAJEliQa4jn7ARcEtyp19Y,1385
-omlish/sql/api/resources.py,sha256=tO5RqH_G6AuqulGoy08jdgpksIv6TRdOHNWhZTxwarc,2062
+omlish/sql/api/funcs.py,sha256=kOMMzODkJHyKVmGKFS-6GIgil5I6ha1qjqA3IecgCvI,819
+omlish/sql/api/queries.py,sha256=OVsVqNyXXJQVDPfV3GFE2gwnHyGEenS65rTQRTNGx1Y,735
+omlish/sql/api/resources.py,sha256=DTVQmKjhaLi27jHWYkF20VhwGvIazZWxyKzF0Wn9-dc,2228
 omlish/sql/api/rows.py,sha256=Jo3AA_6Wt7tlwLO6-rp0arzYFqZXSxPudGPkW2xCYgQ,1346
 omlish/sql/parsing/Minisql.g4,sha256=Jw8xT-8UI6ySHAgStyCg5QX9NTCinvTenLJReWiZIJU,4578
 omlish/sql/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -842,9 +843,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev298.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev298.dist-info/METADATA,sha256=SO0WnQXYeBKoFzXETXZ0osCsvkqYtx2KSJj0nSHWq4g,4416
-omlish-0.0.0.dev298.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omlish-0.0.0.dev298.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev298.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev298.dist-info/RECORD,,
+omlish-0.0.0.dev299.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev299.dist-info/METADATA,sha256=T9HA9WB2SuPxxk-DiWerqiu1KkDizRIPRBitUe0csao,4416
+omlish-0.0.0.dev299.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omlish-0.0.0.dev299.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev299.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev299.dist-info/RECORD,,