omlish 0.0.0.dev296__tar.gz → 0.0.0.dev298__tar.gz

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

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

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev296'
-__revision__ = '8bdb4cc593092b4303a7f5633b09f5c428ba9bc1'
+__version__ = '0.0.0.dev298'
+__revision__ = '9e881abfe892f0f87226c902329ce0b913e28eed'
 
 
 #

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/secrets/all.py

@@ -23,4 +23,5 @@ ref = SecretRef
 
 from ..lang.imports import _register_conditional_import  # noqa
 
+# FIXME: only happens when 'all' is imported lol
 _register_conditional_import('..marshal', '.marshal', __package__)

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/alchemy/apiadapter.py

@@ -25,10 +25,10 @@ class SqlalchemyApiWrapper(api.ContextCloser, ta.Generic[T]):
         self._u = u
         self._auto_close = auto_close
 
-    def close(self) -> None:
+    def _close(self) -> None:
         if self._auto_close and hasattr(self._u, 'close'):
             self._u.close()
-        super().close()
+        super()._close()
 
 
 ##

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/api/__init__.py

@@ -1,7 +1,4 @@
 from .base import (  # noqa
-    Closer,
-    ContextCloser,
-
     Querier,
     Rows,
     Conn,
@@ -33,14 +30,36 @@ from .errors import (  # noqa
 
 from .funcs import (  # noqa
     query,
+    query_all,
     exec,  # noqa
 )
 
 from .queries import (  # noqa
     QueryMode,
     Query,
+
+    as_query,
+)
+
+from .resources import (  # noqa
+    get_resource_debug,
+    set_resource_debug,
+
+    UnclosedResourceWarning,
+    Closer,
+
+    ResourceNotEnteredError,
+    ContextCloser,
 )
 
 from .rows import (  # noqa
     Row,
 )
+
+
+##
+
+
+from ...lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('..queries', '._queries', __package__)

omlish-0.0.0.dev298/omlish/sql/api/_queries.py

@@ -0,0 +1,28 @@
+"""
+TODO:
+ - dialect lol
+"""
+from ..queries import Stmt
+from ..queries.rendering import render
+from .funcs import as_query
+from .queries import Query
+from .queries import QueryMode
+
+
+##
+
+
+@as_query.register
+def _(
+        stmt: Stmt,
+        *,
+        mode: QueryMode | str | None = None,
+) -> Query:
+    rq = render(stmt)
+
+    # FIXME: rq.args
+    return Query(
+        mode=QueryMode.of(mode, QueryMode.QUERY),
+        text=rq.s,
+        args=[],
+    )

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/api/base.py

@@ -9,29 +9,13 @@ from ... import lang
 from .columns import Column
 from .columns import Columns
 from .queries import Query
+from .resources import ContextCloser
 from .rows import Row
 
 
 ##
 
 
-class Closer(lang.Abstract):
-    def close(self) -> None:
-        pass
-
-
-class ContextCloser(Closer):
-    def __enter__(self) -> ta.Self:
-        return self
-
-    @ta.final
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.close()
-
-
-##
-
-
 class Querier(ContextCloser, lang.Abstract):
     @property
     @abc.abstractmethod

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/api/dbapi.py

@@ -41,11 +41,16 @@ class DbapiRows(Rows):
         self._cursor = cursor
         self._columns = columns
 
+    def _close(self) -> None:
+        self._cursor.close()
+        super()._close()
+
     @property
     def columns(self) -> Columns:
         return self._columns
 
     def __next__(self) -> Row:
+        self._check_entered()
         values = self._cursor.fetchone()
         if values is None:
             raise StopIteration
@@ -58,11 +63,16 @@ class DbapiConn(Conn):
 
         self._conn = conn
 
+    def _close(self) -> None:
+        self._conn.close()
+        super()._close()
+
     @property
     def adapter(self) -> Adapter:
         raise NotImplementedError
 
     def query(self, query: Query) -> Rows:
+        self._check_entered()
         cursor = self._conn.cursor()
         try:
             cursor.execute(query.text)
@@ -73,9 +83,6 @@ class DbapiConn(Conn):
             cursor.close()
             raise
 
-    def close(self) -> None:
-        self._conn.close()
-
 
 class DbapiDb(Db):
     def __init__(
@@ -92,6 +99,7 @@ class DbapiDb(Db):
         self._adapter = adapter
 
     def connect(self) -> Conn:
+        self._check_entered()
         dbapi_conn = self._conn_fac()
         return DbapiConn(dbapi_conn)
 

omlish-0.0.0.dev298/omlish/sql/api/funcs.py

@@ -0,0 +1,46 @@
+import typing as ta
+
+from .base import Querier
+from .base import Rows
+from .queries import QueryMode
+from .queries import as_query
+from .rows import Row
+
+
+##
+
+
+def query(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> Rows:
+    q = as_query(obj, *args, mode=QueryMode.QUERY)
+
+    return querier.query(q)
+
+
+#
+
+
+def query_all(
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> list[Row]:
+    with query(querier, obj, *args) as rows:
+        return list(rows)
+
+
+##
+
+
+def exec(  # noqa
+        querier: Querier,
+        obj: ta.Any,
+        *args: ta.Any,
+) -> None:
+    q = as_query(obj, *args, mode=QueryMode.EXEC)
+
+    with querier.query(q):
+        pass

omlish-0.0.0.dev298/omlish/sql/api/queries.py

@@ -0,0 +1,75 @@
+import dataclasses as dc
+import enum
+import functools
+import typing as ta
+
+from ... import check
+from ... import lang
+
+
+##
+
+
+class QueryMode(enum.Enum):
+    QUERY = enum.auto()
+    EXEC = enum.auto()
+
+    @classmethod
+    def of(
+            cls,
+            o: ta.Union[str, 'QueryMode', None],
+            default: ta.Optional['QueryMode'] = None,
+    ) -> 'QueryMode':
+        if o is None:
+            return check.not_none(check.isinstance(default, cls))
+        elif isinstance(o, str):
+            return cls[o.upper()]  # noqa
+        elif isinstance(o, cls):
+            return o
+        else:
+            raise TypeError(o)
+
+
+@dc.dataclass(frozen=True)
+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/sql/api/resources.py

@@ -0,0 +1,98 @@
+import traceback
+import typing as ta
+import warnings
+
+from ... import lang
+
+
+##
+
+
+DEBUG = __debug__
+
+
+def get_resource_debug() -> bool:
+    return DEBUG
+
+
+def set_resource_debug(debug: bool) -> None:
+    global DEBUG
+    DEBUG = debug
+
+
+##
+
+
+class UnclosedResourceWarning(Warning):
+    pass
+
+
+class Closer(lang.Abstract):
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.__closed = False
+
+        self.__debug = DEBUG
+        if self.__debug:
+            self.__repr = repr(self)
+            self.__traceback = traceback.format_stack()[:-1]
+
+    @ta.final
+    def close(self) -> None:
+        self.__closed = True
+        self._close()
+
+    def _close(self) -> None:
+        pass
+
+    def __del__(self) -> None:
+        if self.__debug and not self.__closed:
+            warnings.warn(
+                f'\n\n{(sep := ("=" * 40))}\n'
+                f'{self.__class__.__name__} object {self.__repr} '
+                f'was not properly closed before deletion. Please ensure that `close()` is called before the object is '
+                f'deleted.'
+                f'\n\n'
+                f'{"".join(self.__traceback).rstrip()}'
+                f'\n{sep}\n',
+                UnclosedResourceWarning,
+            )
+
+
+##
+
+
+class ResourceNotEnteredError(Exception):
+    pass
+
+
+class ContextCloser(Closer):
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.__entered = False
+
+    @ta.final
+    def __enter__(self) -> ta.Self:
+        self.__entered = True
+        self._enter()
+        return self
+
+    def _enter(self) -> None:
+        pass
+
+    def _is_entered(self) -> bool:
+        return self.__entered
+
+    def _check_entered(self) -> None:
+        if not self.__entered:
+            try:
+                raise ResourceNotEnteredError(self)  # noqa
+            except Exception:
+                self.close()
+                raise
+
+    @ta.final
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/api/rows.py

@@ -33,7 +33,7 @@ class Row(lang.Final, ta.Generic[T]):
     def __contains__(self, item: str | int) -> bool:
         raise TypeError('Row.__contains__ is ambiguous - use .columns.__contains__ or .values.__contains__')
 
-    def __getitem__(self, item) -> T:
+    def __getitem__(self, item: str | int) -> T:
         if isinstance(item, str):
             return self.values[self.columns.index(item)]
         elif isinstance(item, int):
@@ -46,3 +46,6 @@ class Row(lang.Final, ta.Generic[T]):
             return self.values[idx]
         else:
             return None
+
+    def to_dict(self) -> dict[str, ta.Any]:
+        return {c.name: v for c, v in self}

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/queries/__init__.py

@@ -107,3 +107,11 @@ Q = StdBuilder()
 from ...lang.imports import _register_conditional_import  # noqa
 
 _register_conditional_import('...marshal', '.marshal', __package__)
+
+
+##
+
+
+from ...lang.imports import _trigger_conditional_imports  # noqa
+
+_trigger_conditional_imports(__package__)

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/queries/marshal.py

@@ -26,6 +26,9 @@ from .unary import UnaryOp
 from .unary import UnaryOps
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class OpMarshalerUnmarshaler(msh.Marshaler, msh.Unmarshaler):
     ty: type

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/queries/ops.py

@@ -1,6 +1,9 @@
 import enum
 
 
+##
+
+
 class OpKind(enum.Enum):
     CMP = enum.auto()
     ARITH = enum.auto()

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/queries/rendering.py

@@ -48,6 +48,9 @@ from .unary import UnaryOp
 from .unary import UnaryOps
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RenderedQueryParts(lang.Final):
     p: tp.Part

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish/sql/queries/std.py

@@ -12,6 +12,9 @@ from .stmts import StmtBuilder
 from .unary import UnaryBuilder
 
 
+##
+
+
 class StdBuilder(
     InsertBuilder,
     SelectBuilder,

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

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

{omlish-0.0.0.dev296 → omlish-0.0.0.dev298}/omlish.egg-info/SOURCES.txt

@@ -744,12 +744,14 @@ omlish/sql/alchemy/exprs.py
 omlish/sql/alchemy/secrets.py
 omlish/sql/alchemy/sqlean.py
 omlish/sql/api/__init__.py
+omlish/sql/api/_queries.py
 omlish/sql/api/base.py
 omlish/sql/api/columns.py
 omlish/sql/api/dbapi.py
 omlish/sql/api/errors.py
 omlish/sql/api/funcs.py
 omlish/sql/api/queries.py
+omlish/sql/api/resources.py
 omlish/sql/api/rows.py
 omlish/sql/parsing/Minisql.g4
 omlish/sql/parsing/__init__.py

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

omlish-0.0.0.dev296/omlish/sql/api/funcs.py

@@ -1,73 +0,0 @@
-import typing as ta
-
-from .base import Querier
-from .base import Rows
-from .queries import Query
-from .queries import QueryMode
-
-
-##
-
-
-@ta.overload
-def query(
-        querier: Querier,
-        query: Query,  # noqa
-) -> Rows:
-    ...
-
-
-@ta.overload
-def query(
-        querier: Querier,
-        text: str,
-        *args: ta.Any,
-) -> Rows:
-    ...
-
-
-def query(
-        querier,
-        obj,
-        *args,
-):
-    if isinstance(obj, Query):
-        q = obj
-    else:
-        q = Query.of(obj, *args, mode=QueryMode.QUERY)
-
-    return querier.query(q)
-
-
-##
-
-
-@ta.overload
-def exec(  # noqa
-        querier: Querier,
-        query: Query,  # noqa
-) -> None:
-    ...
-
-
-@ta.overload
-def exec(  # noqa
-        querier: Querier,
-        text: str,
-        *args: ta.Any,
-) -> None:
-    ...
-
-
-def exec(  # noqa
-    querier,
-    obj,
-    *args,
-):
-    if isinstance(obj, Query):
-        q = obj
-    else:
-        q = Query.of(obj, *args, mode=QueryMode.EXEC)
-
-    with querier.query(q):
-        pass

omlish-0.0.0.dev296/omlish/sql/api/queries.py

@@ -1,63 +0,0 @@
-import dataclasses as dc
-import enum
-import typing as ta
-
-from ... import check
-from ... import lang
-
-
-##
-
-
-class QueryMode(enum.Enum):
-    QUERY = enum.auto()
-    EXEC = enum.auto()
-
-
-@dc.dataclass(frozen=True)
-class Query(lang.Final):
-    mode: QueryMode
-    text: str
-    args: ta.Sequence[ta.Any]
-
-    #
-
-    @classmethod
-    @ta.overload
-    def of(
-            cls,
-            query: 'Query',
-    ) -> 'Query':
-        ...
-
-    @classmethod
-    @ta.overload
-    def of(
-            cls,
-            text: str,
-            *args: ta.Any,
-            mode: str | QueryMode = QueryMode.QUERY,
-    ) -> 'Query':
-        ...
-
-    @classmethod  # type: ignore[misc]
-    def of(cls, obj, *args, **kwargs):
-        if isinstance(obj, Query):
-            check.arg(not args)
-            check.arg(not kwargs)
-            return obj
-
-        elif isinstance(obj, str):
-            mode = kwargs.pop('mode', QueryMode.QUERY)
-            if isinstance(mode, str):
-                mode = QueryMode[mode.upper()]
-            check.arg(not kwargs)
-
-            return cls(
-                mode=mode,
-                text=obj,
-                args=args,
-            )
-
-        else:
-            raise TypeError(obj)