omlish 0.0.0.dev238__py3-none-any.whl → 0.0.0.dev239__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev238'
-__revision__ = '0ab60b1d75e5b0b298707ba55797958e528c69b5'
+__version__ = '0.0.0.dev239'
+__revision__ = 'f241f36977bf74d1ea680d415782228917ec3669'
 
 
 #

omlish/dataclasses/static.py

@@ -1,3 +1,8 @@
+"""
+TODO:
+ - metaclass, to forbid __subclasscheck__ / __instancecheck__? Clash with dc.Meta, don't want that lock-in, not
+   necessary for functionality, just a helpful misuse prevention.
+"""
 import abc
 import copy
 import dataclasses as dc
@@ -12,6 +17,14 @@ from .impl.api import dataclass
 
 
 class Static(lang.Abstract):
+    """
+    Dataclass mixin for dataclasses in which all fields have class-level defaults and are not intended for any
+    instance-level overrides - effectively making their subclasses equivalent to instances. For dataclasses which make
+    sense as singletons (such as project specs or manifests), for which dynamic instantiation is not the usecase, this
+    can enable more natural syntax. Inheritance is permitted - equivalent to a `functools.partial` or composing
+    `**kwargs`, as long as there is only ever one unambiguous underlying non-static dataclass to be instantiated.
+    """
+
     __static_dataclass_class__: ta.ClassVar[type]
     __static_dataclass_instance__: ta.ClassVar[ta.Any]
 
@@ -23,7 +36,7 @@ class Static(lang.Abstract):
                 raise TypeError(f'Static base class {cls} must not implement {a}')
 
         if cls.__init__ is not Static.__init__:
-            # This is necessary to make type-checking work (by allowing it to accept zero). This isn't strictly
+            # This is necessary to make type-checking work (by allowing it to accept zero args). This isn't strictly
             # necessary, but since it's useful to do sometimes it might as well be done everywhere to prevent clashing.
             raise TypeError(f'Static.__init__ should be first in mro of {cls}')
 
@@ -144,8 +157,8 @@ class Static(lang.Abstract):
                 )
 
         if not is_abstract:
-            # This is the only time the Statices are ever actually instantiated, and it's only to produce the
-            # kwargs passed to the underlying dataclass.
+            # This is the only time the Statics are ever actually instantiated, and it's only to produce the kwargs
+            # passed to the underlying dataclass.
             tmp_inst = cls()
             inst_kw = dc.asdict(tmp_inst)  # type: ignore[call-overload]  # noqa
             inst = sdc_cls(**inst_kw)

omlish/lang/__init__.py

@@ -137,9 +137,6 @@ from .imports import (  # noqa
     can_import,
     get_real_module_name,
     import_all,
-    import_attr,
-    import_module,
-    import_module_attr,
     lazy_import,
     proxy_import,
     proxy_init,
@@ -235,6 +232,12 @@ from .typing import (  # noqa
 
 ##
 
+from ..lite.imports import (  # noqa
+    import_attr,
+    import_module,
+    import_module_attr,
+)
+
 from ..lite.timeouts import (  # noqa
     DeadlineTimeout,
     InfiniteTimeout,

omlish/lang/imports.py

@@ -87,49 +87,6 @@ def proxy_import(
 ##
 
 
-def import_module(dotted_path: str) -> types.ModuleType:
-    if not dotted_path:
-        raise ImportError(dotted_path)
-    mod = __import__(dotted_path, globals(), locals(), [])
-    for name in dotted_path.split('.')[1:]:
-        try:
-            mod = getattr(mod, name)
-        except AttributeError:
-            raise AttributeError(f'Module {mod!r} has no attribute {name!r}') from None
-    return mod
-
-
-def import_module_attr(dotted_path: str) -> ta.Any:
-    module_name, _, class_name = dotted_path.rpartition('.')
-    mod = import_module(module_name)
-    try:
-        return getattr(mod, class_name)
-    except AttributeError:
-        raise AttributeError(f'Module {module_name!r} has no attr {class_name!r}') from None
-
-
-def import_attr(dotted_path: str) -> ta.Any:
-    parts = dotted_path.split('.')
-    mod: ta.Any = None
-    mod_pos = 0
-    while mod_pos < len(parts):
-        mod_name = '.'.join(parts[:mod_pos + 1])
-        try:
-            mod = importlib.import_module(mod_name)
-        except ImportError:
-            break
-        mod_pos += 1
-    if mod is None:
-        raise ImportError(dotted_path)
-    obj = mod
-    for att_pos in range(mod_pos, len(parts)):
-        obj = getattr(obj, parts[att_pos])
-    return obj
-
-
-##
-
-
 SPECIAL_IMPORTABLE: ta.AbstractSet[str] = frozenset([
     '__init__.py',
     '__main__.py',

omlish/lite/imports.py

@@ -0,0 +1,47 @@
+# ruff: noqa: UP006 UP007
+import types
+import typing as ta
+
+
+##
+
+
+def import_module(dotted_path: str) -> types.ModuleType:
+    if not dotted_path:
+        raise ImportError(dotted_path)
+    mod = __import__(dotted_path, globals(), locals(), [])
+    for name in dotted_path.split('.')[1:]:
+        try:
+            mod = getattr(mod, name)
+        except AttributeError:
+            raise AttributeError(f'Module {mod!r} has no attribute {name!r}') from None
+    return mod
+
+
+def import_module_attr(dotted_path: str) -> ta.Any:
+    module_name, _, class_name = dotted_path.rpartition('.')
+    mod = import_module(module_name)
+    try:
+        return getattr(mod, class_name)
+    except AttributeError:
+        raise AttributeError(f'Module {module_name!r} has no attr {class_name!r}') from None
+
+
+def import_attr(dotted_path: str) -> ta.Any:
+    importlib = __import__('importlib')
+    parts = dotted_path.split('.')
+    mod: ta.Any = None
+    mod_pos = 0
+    while mod_pos < len(parts):
+        mod_name = '.'.join(parts[:mod_pos + 1])
+        try:
+            mod = importlib.import_module(mod_name)
+        except ImportError:
+            break
+        mod_pos += 1
+    if mod is None:
+        raise ImportError(dotted_path)
+    obj = mod
+    for att_pos in range(mod_pos, len(parts)):
+        obj = getattr(obj, parts[att_pos])
+    return obj

omlish/manifests/types.py

@@ -7,7 +7,7 @@ import typing as ta
 @dc.dataclass(frozen=True)
 class ManifestOrigin:
     module: str
-    attr: str
+    attr: ta.Optional[str]  # None if inline
 
     file: str
     line: int

omlish/sql/abc.py

@@ -26,6 +26,13 @@ class DbapiColumnDescription_(ta.NamedTuple):  # noqa
     scale: int | None
     null_ok: bool | None
 
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'DbapiColumnDescription_':
+        if isinstance(obj, cls):
+            return obj
+        else:
+            return cls(*obj[:len(cls._fields)])
+
 
 class DbapiConnection(ta.Protocol):
     def close(self) -> object: ...

omlish/sql/api/base.py

@@ -0,0 +1,89 @@
+"""
+TODO:
+ - sync vs async
+"""
+import abc
+import typing as ta
+
+from ... import lang
+from .columns import Column
+from .columns import Columns
+from .queries import Query
+from .rows import Row
+
+
+##
+
+
+class Closer(lang.Abstract):
+    def close(self) -> None:
+        pass
+
+
+class SelfCloser(Closer):
+    def __enter__(self) -> ta.Self:
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+
+
+##
+
+
+class Querier(SelfCloser, lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def adapter(self) -> 'Adapter':
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def query(self, query: Query) -> 'Rows':  # ta.Raises[QueryError]
+        raise NotImplementedError
+
+
+##
+
+
+class Rows(SelfCloser, lang.Abstract):
+    @property
+    @abc.abstractmethod
+    def columns(self) -> Columns:
+        raise NotImplementedError
+
+    @ta.final
+    def __iter__(self) -> ta.Self:
+        return self
+
+    @abc.abstractmethod
+    def __next__(self) -> Row:  # ta.Raises[StopIteration]
+        raise NotImplementedError
+
+
+##
+
+
+class Conn(Querier, lang.Abstract):  # noqa
+    pass
+
+
+##
+
+
+class Db(Querier, lang.Abstract):  # noqa
+    @abc.abstractmethod
+    def connect(self) -> Conn:
+        raise NotImplementedError
+
+    def query(self, query: Query) -> Rows:
+        with self.connect() as conn:
+            return conn.query(query)
+
+
+##
+
+
+class Adapter(lang.Abstract):
+    @abc.abstractmethod
+    def scan_type(self, c: Column) -> type:
+        raise NotImplementedError

omlish/sql/api/columns.py

@@ -0,0 +1,90 @@
+import dataclasses as dc
+import typing as ta
+
+from ... import lang
+from .errors import DuplicateColumnNameError
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Column(lang.Final):
+    name: str
+
+    _: dc.KW_ONLY
+
+    db_type: str | None = None
+    type: type = object
+
+
+##
+
+
+class Columns(lang.Final):
+    def __init__(self, *cs: Column) -> None:
+        super().__init__()
+
+        self._seq = cs
+
+        by_name: dict[str, Column] = {}
+        idxs_by_name: dict[str, int] = {}
+        for i, c in enumerate(cs):
+            if c.name in by_name:
+                raise DuplicateColumnNameError(c.name)
+            by_name[c.name] = c
+            idxs_by_name[c.name] = i
+
+        self._by_name = by_name
+        self._idxs_by_name = idxs_by_name
+
+    #
+
+    _EMPTY: ta.ClassVar['Columns']
+
+    @classmethod
+    def empty(cls) -> 'Columns':
+        return cls._EMPTY
+
+    #
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}<{", ".join(repr(c.name) for c in self._seq)}>'
+
+    #
+
+    def __iter__(self) -> ta.Iterator[Column]:
+        return iter(self._seq)
+
+    def __len__(self) -> int:
+        return len(self._seq)
+
+    def __contains__(self, item: str | int) -> bool:
+        if isinstance(item, str):
+            return item in self._by_name
+        elif isinstance(item, int):
+            return 0 <= item < len(self._by_name)
+        else:
+            raise TypeError(item)
+
+    def __getitem__(self, item) -> Column:
+        if isinstance(item, str):
+            return self._by_name[item]
+        elif isinstance(item, int):
+            return self._seq[item]
+        else:
+            raise TypeError(item)
+
+    def get(self, name: str) -> Column | None:
+        return self._by_name.get(name)
+
+    #
+
+    def index(self, name: str) -> int:
+        return self._idxs_by_name[name]
+
+    def get_index(self, name: str) -> int | None:
+        return self._idxs_by_name.get(name)
+
+
+Columns._EMPTY = Columns()  # noqa

omlish/sql/api/dbapi.py

@@ -0,0 +1,105 @@
+import typing as ta
+
+from ... import check
+from .. import abc as dbapi_abc
+from .base import Adapter
+from .base import Conn
+from .base import Db
+from .base import Rows
+from .columns import Column
+from .columns import Columns
+from .queries import Query
+from .rows import Row
+
+
+##
+
+
+def build_dbapi_columns(desc: ta.Sequence[dbapi_abc.DbapiColumnDescription] | None) -> Columns:
+    if desc is None:
+        return Columns.empty()
+
+    cols: list[Column] = []
+    for desc_col in desc:
+        dbapi_col = dbapi_abc.DbapiColumnDescription_.of(desc_col)
+
+        cols.append(Column(
+            check.non_empty_str(dbapi_col.name),
+        ))
+
+    return Columns(*cols)
+
+
+class DbapiRows(Rows):
+    def __init__(
+            self,
+            cursor: dbapi_abc.DbapiCursor,
+            columns: Columns,
+    ) -> None:
+        super().__init__()
+
+        self._cursor = cursor
+        self._columns = columns
+
+    @property
+    def columns(self) -> Columns:
+        return self._columns
+
+    def __next__(self) -> Row:
+        values = self._cursor.fetchone()
+        if values is None:
+            raise StopIteration
+        return Row(self._columns, values)
+
+
+class DbapiConn(Conn):
+    def __init__(self, conn: dbapi_abc.DbapiConnection) -> None:
+        super().__init__()
+
+        self._conn = conn
+
+    @property
+    def adapter(self) -> Adapter:
+        raise NotImplementedError
+
+    def query(self, query: Query) -> Rows:
+        cursor = self._conn.cursor()
+        try:
+            cursor.execute(query.text)
+            columns = build_dbapi_columns(cursor.description)
+            return DbapiRows(cursor, columns)
+
+        except Exception:  # noqa
+            cursor.close()
+            raise
+
+    def close(self) -> None:
+        self._conn.close()
+
+
+class DbapiDb(Db):
+    def __init__(
+            self,
+            conn_fac: ta.Callable[[], dbapi_abc.DbapiConnection],
+            *,
+            adapter: ta.Optional['DbapiAdapter'] = None,
+    ) -> None:
+        super().__init__()
+
+        self._conn_fac = conn_fac
+        if adapter is None:
+            adapter = DbapiAdapter()
+        self._adapter = adapter
+
+    def connect(self) -> Conn:
+        dbapi_conn = self._conn_fac()
+        return DbapiConn(dbapi_conn)
+
+    @property
+    def adapter(self) -> Adapter:
+        return self._adapter
+
+
+class DbapiAdapter(Adapter):
+    def scan_type(self, c: Column) -> type:
+        raise NotImplementedError

omlish/sql/api/errors.py

@@ -0,0 +1,24 @@
+class Error(Exception):
+    pass
+
+
+##
+
+
+class ColumnError(Error):
+    pass
+
+
+class DuplicateColumnNameError(ColumnError):
+    pass
+
+
+class MismatchedColumnCountError(ColumnError):
+    pass
+
+
+##
+
+
+class QueryError(Error):
+    pass

omlish/sql/api/funcs.py

@@ -0,0 +1,73 @@
+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/sql/api/queries.py

@@ -0,0 +1,63 @@
+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)

omlish/sql/api/rows.py

@@ -0,0 +1,48 @@
+import dataclasses as dc
+import typing as ta
+
+from ... import lang
+from .columns import Column
+from .columns import Columns
+from .errors import MismatchedColumnCountError
+
+
+T = ta.TypeVar('T')
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Row(lang.Final, ta.Generic[T]):
+    columns: Columns
+    values: ta.Sequence[T]
+
+    def __post_init__(self) -> None:
+        if len(self.columns) != len(self.values):
+            raise MismatchedColumnCountError(self.columns, self.values)
+
+    #
+
+    def __iter__(self) -> ta.Iterator[tuple[Column, T]]:
+        return iter(zip(self.columns, self.values))
+
+    def __len__(self) -> int:
+        return len(self.values)
+
+    def __contains__(self, item: str | int) -> bool:
+        raise TypeError('Row.__contains__ is ambiguous - use .columns.__contains__ or .values.__contains__')
+
+    def __getitem__(self, item) -> T:
+        if isinstance(item, str):
+            return self.values[self.columns.index(item)]
+        elif isinstance(item, int):
+            return self.values[item]
+        else:
+            raise TypeError(item)
+
+    def get(self, name: str) -> T | None:
+        if (idx := self.columns.get_index(name)) is not None:
+            return self.values[idx]
+        else:
+            return None

{omlish-0.0.0.dev238.dist-info → omlish-0.0.0.dev239.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev238
+Version: 0.0.0.dev239
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev238.dist-info → omlish-0.0.0.dev239.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=vQTAIvR8OblSq-uP2GUfnbei0RnmAnM5j0T1-OToh9E,8253
-omlish/__about__.py,sha256=-JHhiSxa1m9XW-39IA3EWqH7y7ZB6GG03v7p93wDeA0,3380
+omlish/__about__.py,sha256=dhV7tjR3sPPz2ozLplkOZw50zalCsL4TwcGBjPkQCMU,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -187,7 +187,7 @@ omlish/daemons/spawning.py,sha256=cx00xeqSrfhlFbjCtKqaBHvMuHwB9hdjuKNHzAAo_dw,40
 omlish/daemons/targets.py,sha256=00KmtlknMhQ5PyyVAhWl3rpeTMPym0GxvHHq6mYPZ7c,3051
 omlish/daemons/waiting.py,sha256=RfgD1L33QQVbD2431dkKZGE4w6DUcGvYeRXXi8puAP4,1676
 omlish/dataclasses/__init__.py,sha256=b7EZCIfHnEHCHWwgD3YXxkdsU-uYd9iD4hM36RgpI1g,1598
-omlish/dataclasses/static.py,sha256=35tPuneXUXZztFTzjNkW6DnQbZgKJUf68GmjzXV-WkQ,6903
+omlish/dataclasses/static.py,sha256=6pZG2iTR9NN8pKm-5ukDABnaVlTKFOzMwkg-rbxURoo,7691
 omlish/dataclasses/utils.py,sha256=QWsHxVisS-MUCqh89JQsRdCLgdBVeC6EYK6jRwO9akU,3631
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=zqGBC5gSbjJxaqG_zS1LL1PX-zAfhIua8UqOE4IwO2k,789
@@ -397,7 +397,7 @@ omlish/iterators/iterators.py,sha256=ghI4dO6WPyyFOLTIIMaHQ_IOy2xXaFpGPqveZ5YGIBU
 omlish/iterators/recipes.py,sha256=53mkexitMhkwXQZbL6DrhpT0WePQ_56uXd5Jaw3DfzI,467
 omlish/iterators/tools.py,sha256=Pi4ybXytUXVZ3xwK89xpPImQfYYId9p1vIFQvVqVLqA,2551
 omlish/iterators/unique.py,sha256=0jAX3kwzVfRNhe0Tmh7kVP_Q2WBIn8POo_O-rgFV0rQ,1390
-omlish/lang/__init__.py,sha256=rS9JPXiHchs2_9QG7JCx9pbsYpgpe3ANUumDBb8hSFA,4105
+omlish/lang/__init__.py,sha256=2jxO7QWT0uOvdYdmBFgnqmVh-6I7DofsapgUl3wu1fY,4145
 omlish/lang/cached.py,sha256=tQaqMu1LID0q4NSTk5vPXsgxIBWSFAmjs5AhQoEHoCQ,7833
 omlish/lang/clsdct.py,sha256=sJYadm-fwzti-gsi98knR5qQUxriBmOqQE_qz3RopNk,1743
 omlish/lang/cmp.py,sha256=5vbzWWbqdzDmNKAGL19z6ZfUKe5Ci49e-Oegf9f4BsE,1346
@@ -407,7 +407,7 @@ omlish/lang/descriptors.py,sha256=mZ2h9zJ__MMpw8hByjRbAiONcwfVb6GD0btNnVi8C5w,65
 omlish/lang/exceptions.py,sha256=qJBo3NU1mOWWm-NhQUHCY5feYXR3arZVyEHinLsmRH4,47
 omlish/lang/functions.py,sha256=0ql9EXA_gEEhvUVzMJCjVhEnVtHecsLKmfmAXuQqeGY,4388
 omlish/lang/generators.py,sha256=5LX17j-Ej3QXhwBgZvRTm_dq3n9veC4IOUcVmvSu2vU,5243
-omlish/lang/imports.py,sha256=nKPTHVW5gUpT_Ok8QsPyj7b-ToE7nWN2ev9MsI4pRCA,10465
+omlish/lang/imports.py,sha256=Gdl6xCF89xiMOE1yDmdvKWamLq8HX-XPianO58Jdpmw,9218
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
 omlish/lang/maybes.py,sha256=dAgrUoAhCgyrHRqa73CkaGnpXwGc-o9n-NIThrNXnbU,3416
 omlish/lang/objects.py,sha256=65XsD7UtblRdNe2ID1-brn_QvRkJhBIk5nyZWcQNeqU,4574
@@ -435,6 +435,7 @@ omlish/lite/check.py,sha256=OLwtE2x6nlbGx4vS3Rda7zMHpgqzDSLJminTAX2lqLA,13529
 omlish/lite/configs.py,sha256=Ev_19sbII67pTWzInYjYqa9VyTiZBvyjhZqyG8TtufE,908
 omlish/lite/contextmanagers.py,sha256=ciaMl0D3QDHToM7M28-kwZ-Q48LtwgCxiud3nekgutA,2863
 omlish/lite/dataclasses.py,sha256=t1G5-xOuvE6o6w9RyqHzLT9wHD0HkqBh5P8HUZWxGzs,1912
+omlish/lite/imports.py,sha256=o9WWrNrWg0hKeMvaj91giaovED_9VFanN2MyEHBGekY,1346
 omlish/lite/inject.py,sha256=qBUftFeXMiRgANYbNS2e7TePMYyFAcuLgsJiLyMTW5o,28769
 omlish/lite/json.py,sha256=7-02Ny4fq-6YAu5ynvqoijhuYXWpLmfCI19GUeZnb1c,740
 omlish/lite/logs.py,sha256=CWFG0NKGhqNeEgryF5atN2gkPYbUdTINEw_s1phbINM,51
@@ -469,7 +470,7 @@ omlish/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 omlish/manifests/base.py,sha256=D1WvJYcBR_njkc0gpALpFCWh1h3agb9qgqphnbbPlm4,935
 omlish/manifests/load.py,sha256=9mdsS3egmSX9pymO-m-y2Fhs4p6ruOdbsYaKT1-1Hwg,6655
 omlish/manifests/static.py,sha256=7YwOVh_Ek9_aTrWsWNO8kWS10_j4K7yv3TpXZSHsvDY,501
-omlish/manifests/types.py,sha256=mxL6N44mu06995YF8qzmg6V94EmfRiryzIUQcXVSCbI,275
+omlish/manifests/types.py,sha256=IOt9dOe0r8okCHSL82ryi3sn4VZ6AT80g_QQR6oZtCE,306
 omlish/marshal/__init__.py,sha256=00D3S6qwUld1TUWd67hVHuNcrj3c_FAFSkCVXgGWT-s,2607
 omlish/marshal/base.py,sha256=tJ4iNuD7cW2GpGMznOhkAf2hugqp2pF2em0FaQcekrk,6740
 omlish/marshal/exceptions.py,sha256=jwQWn4LcPnadT2KRI_1JJCOSkwWh0yHnYK9BmSkNN4U,302
@@ -628,7 +629,7 @@ omlish/specs/openapi/__init__.py,sha256=zilQhafjvteRDF_TUIRgF293dBC6g-TJChmUb6T9
 omlish/specs/openapi/marshal.py,sha256=Z-E2Knm04C81N8AA8cibCVSl2ImhSpHZVc7yAhmPx88,2135
 omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/sql/__init__.py,sha256=TpZLsEJKJzvJ0eMzuV8hwOJJbkxBCV1RZPUMLAVB6io,173
-omlish/sql/abc.py,sha256=NfbcIlEvdEu6vn0TolhfYb2SO5uzUmY0kARCbg6uVAU,1879
+omlish/sql/abc.py,sha256=K3AmEPVxzvQrrc1AXdlbM9-9LERGq6lko9slx88kB90,2074
 omlish/sql/dbapi.py,sha256=5ghJH-HexsmDlYdWlhf00nCGQX2IC98_gxIxMkucOas,3195
 omlish/sql/dbs.py,sha256=65e388987upJpsFX8bNL7uhiYv2sCsmk9Y04V0MXdsI,1873
 omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
@@ -639,6 +640,14 @@ omlish/sql/alchemy/duckdb.py,sha256=kr7pIhiBLNAuZrcigHDtFg9zHkVcrRW3LfryO9VJ4mk,
 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=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+omlish/sql/api/base.py,sha256=iPvLwI_noMzazgPlYOZb9xzpXfyb_OfX2WKD9nzWpQc,1506
+omlish/sql/api/columns.py,sha256=UBol4bfwZ1nhcjv2gE1JhUMzRFeqtiCDo2T9CUGYb64,1943
+omlish/sql/api/dbapi.py,sha256=H3bFoWI-ox81APX3xBbjylNWyMUXh78ICMQjRrlDNxw,2426
+omlish/sql/api/errors.py,sha256=YtC2gz5DqRTT3uCJniUOufVH1GEnFIc5ElkYLK3BHwM,230
+omlish/sql/api/funcs.py,sha256=-H6V-o9JPSHFXsxdHtutB4mP2LwJfCzlLbRrPHunmB4,990
+omlish/sql/api/queries.py,sha256=IgB8_sDe40-mKE-ByTmZ4GVOCdLLJDzJGJCevMd8R5s,1207
+omlish/sql/api/rows.py,sha256=MEK9LNYEe8vLEJXQJD63MpnSOiE22cawJL-dUWQD6sU,1246
 omlish/sql/queries/__init__.py,sha256=N8oQFKY99g_MQhrPmvlBAkMeGIRURE9UxMO244mytzY,1332
 omlish/sql/queries/base.py,sha256=_8O3MbH_OEjBnhp2oIJUZ3ClaQ8l4Sj9BdPdsP0Ie-g,224
 omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
@@ -714,9 +723,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=JkNZpyR2tv2CNcTaWJJhpQ9E4F0yPR8P_YfDbZfMtwQ,6182
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev238.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev238.dist-info/METADATA,sha256=Fzwpe0Ssmu0yFpCL5MUoWK0b3rF72OFhaG7rCK_duxU,4176
-omlish-0.0.0.dev238.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev238.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev238.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev238.dist-info/RECORD,,
+omlish-0.0.0.dev239.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev239.dist-info/METADATA,sha256=PAeUaSnrnpMgIXzNGwmmS2lJbNgNdNwF8RdlvS-6S88,4176
+omlish-0.0.0.dev239.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev239.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev239.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev239.dist-info/RECORD,,