omlish 0.0.0.dev298__tar.gz → 0.0.0.dev299__tar.gz

{omlish-0.0.0.dev298/omlish.egg-info → omlish-0.0.0.dev299}/PKG-INFO

@@ -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 → omlish-0.0.0.dev299}/omlish/__about__.py

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

{omlish-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev299/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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-0.0.0.dev298 → omlish-0.0.0.dev299}/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 → omlish-0.0.0.dev299/omlish.egg-info}/PKG-INFO

@@ -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 → omlish-0.0.0.dev299}/omlish.egg-info/SOURCES.txt

@@ -745,6 +745,7 @@ omlish/sql/alchemy/secrets.py
 omlish/sql/alchemy/sqlean.py
 omlish/sql/api/__init__.py
 omlish/sql/api/_queries.py
+omlish/sql/api/asquery.py
 omlish/sql/api/base.py
 omlish/sql/api/columns.py
 omlish/sql/api/dbapi.py

{omlish-0.0.0.dev298 → omlish-0.0.0.dev299}/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.dev298'
+version = '0.0.0.dev299'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',