0.12.2 fix imports (again)

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.12.2
+
++ Fix imports in module `sqlalchemy.quart`
+
+## 0.12.1 
+
++ Fix import failure for `AsyncSelectPagination` (module `sqlalchemy`)
+
 ## 0.12.0 "The Color Update"
 
 * Moved `AsyncSelectPagination` to submodule `sqlalchemy.quart`. If you need to use it, specify `suou[quart_sqlalchemy]` in requirements.

docs/api.rst

@@ -29,6 +29,7 @@ API
    suou.lex
    suou.luck
    suou.markdown
+   suou.mat
    suou.migrate
    suou.peewee
    suou.quart 

docs/color.rst

@@ -20,14 +20,27 @@ Web colors
 
 .. autoclass:: RGBColor
 
+   .. automethods::
+   
 
 .. autoclass:: WebColor
 
 
-.. auto
+.. autoclass:: LinearRGBColor
+
+   .. automethods::
 
 
 .. autoclass:: XYZColor
 
+   .. automethods::
+
 
 .. autoclass:: OKLabColor
+
+   .. automethods::
+
+
+.. autoclass:: OKLCHColor
+   
+   .. automethods::

docs/generated/suou.color.rst

@@ -9,7 +9,10 @@
    .. autosummary::
    
       Chalk
+      LinearRGBColor
+      OKLCHColor
+      OKLabColor
       RGBColor
-      SRGBColor
       WebColor
+      XYZColor
    

docs/generated/suou.sqlalchemy.asyncio.rst

@@ -1,4 +1,4 @@
-suou.sqlalchemy.asyncio
+suou.sqlalchemy.asyncio
 =======================
 
 .. automodule:: suou.sqlalchemy.asyncio
@@ -14,7 +14,6 @@ suou.sqlalchemy.asyncio
 
    .. autosummary::
    
-      AsyncSelectPagination
       SQLAlchemy
       SessionWrapper
    

src/suou/__init__.py

@@ -38,7 +38,7 @@ from .http import WantsContentType
 from .color import OKLabColor, chalk, WebColor, RGBColor, LinearRGBColor, XYZColor, OKLCHColor
 from .mat import Matrix
 
-__version__ = "0.12.0"
+__version__ = "0.12.2"
 
 __all__ = (
     'ConfigOptions', 'ConfigParserConfigSource', 'ConfigSource', 'ConfigValue',

src/suou/sqlalchemy/__init__.py

@@ -18,18 +18,14 @@ from __future__ import annotations
 
 from abc import ABCMeta, abstractmethod
 from functools import wraps
-from typing import Any, Callable, Iterable, Never, TypeVar
+from typing import Callable, Iterable, Never, TypeVar
-import warnings
+from sqlalchemy import LargeBinary, Column, create_engine, select
-from sqlalchemy import BigInteger, Boolean, CheckConstraint, Date, Dialect, ForeignKey, LargeBinary, Column, MetaData, SmallInteger, String, create_engine, select, text
+from sqlalchemy.orm import DeclarativeBase, Session
-from sqlalchemy.orm import DeclarativeBase, InstrumentedAttribute, Relationship, Session, declarative_base as _declarative_base, relationship
 from sqlalchemy.types import TypeEngine
 
-from ..snowflake import SnowflakeGen
+from ..itertools import makelist
-from ..itertools import kwargs_prefix, makelist
 from ..signing import HasSigner, UserSigner
-from ..codecs import StringCase
+from ..functools import deprecated
-from ..functools import deprecated, not_implemented
-from ..iding import Siq, SiqGen, SiqType, SiqCache
 from ..classtools import Incomplete, Wanted
 
 
@@ -158,12 +154,18 @@ def require_auth_base(cls: type[DeclarativeBase], *, src: AuthSrc, column: str |
     return decorator
 
 
-from .asyncio import SQLAlchemy, AsyncSelectPagination, async_query
+from .asyncio import SQLAlchemy, async_query
 from .orm import (
     id_column, snowflake_column, match_column, match_constraint, bool_column, declarative_base, parent_children,
     author_pair, age_pair, bound_fk, unbound_fk, want_column, a_relationship, BitSelector, secret_column, username_column
 )
 
+try:
+    from .quart import AsyncSelectPagination
+    AsyncSelectPagination = deprecated('import AsyncSelectPagination from suou.sqlalchemy.quart instead')(AsyncSelectPagination)
+except ImportError:
+    pass
+
 # Optional dependency: do not import into __init__.py
 __all__ = (
     'IdType', 'id_column', 'snowflake_column', 'entity_base', 'declarative_base', 'token_signer',

src/suou/sqlalchemy/asyncio.py

@@ -26,6 +26,10 @@ from sqlalchemy import Select, Table, func, select
 from sqlalchemy.orm import DeclarativeBase, lazyload
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, create_async_engine
 
+try:
+    from .quart import AsyncSelectPagination
+except ImportError:
+    AsyncSelectPagination = None
 
 from suou.exceptions import NotFoundError
 from suou.glue import glue
@@ -103,6 +107,7 @@ class SQLAlchemy:
         Return a pagination. Analogous to flask_sqlalchemy.SQLAlchemy.paginate().
         """
         async with self as session:
+            try:
                 return AsyncSelectPagination(
                     select = select,
                     session = session,
@@ -110,6 +115,8 @@ class SQLAlchemy:
                     per_page=per_page, max_per_page=max_per_page,
                     error_out=self.NotFound if error_out else None, count=count
                 )
+            except Exception:
+                raise RuntimeError('Cannot paginate; required dependencies are not installed')
     async def create_all(self, *, checkfirst = True):
         """
         Initialize database

src/suou/sqlalchemy/quart.py

@@ -3,7 +3,13 @@ SQLAlchemy-Quart bindings
 """
 
 
+from select import select
 from flask_sqlalchemy.pagination import Pagination
+from sqlalchemy import Select, func
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlalchemy.orm import lazyload
+
+from ..exceptions import NotFoundError
 
 
 class AsyncSelectPagination(Pagination):