reydb 1.3.5__py3-none-any.whl → 1.3.7__py3-none-any.whl

reydb/rconfig.py

@@ -38,7 +38,7 @@ ConfigValueT = TypeVar('T', bound=ConfigValue) # Any.
 DatabaseEngineT = TypeVar('DatabaseEngineT', 'rengine.DatabaseEngine', 'rengine.DatabaseEngineAsync')
 
 
-class DatabaseORMTableConfig(rorm.Model, table=True):
+class DatabaseORMTableConfig(rorm.Table):
     """
     Database `config` table ORM model.
     """

reydb/rconn.py

@@ -223,7 +223,6 @@ class DatabaseConnectionAsync(DatabaseConnectionSuper['rengine.DatabaseEngineAsy
 
         # Close.
         await self.close()
-        await self.engine.dispose()
 
 
     async def get_conn(self) -> AsyncConnection:

reydb/rdb.py

@@ -10,8 +10,9 @@
 
 
 from typing import Any, TypeVar, Generic, overload
-from collections.abc import Sequence
+from collections.abc import Iterable, Sequence
 from reykit.rbase import Null, throw
+from reykit.rtask import ThreadPool, async_gather
 
 from .rbase import DatabaseBase
 from .rengine import DatabaseEngine, DatabaseEngineAsync
@@ -52,8 +53,8 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
         username: str,
         password: str,
         database: str,
-        pool_size: int = 5,
-        max_overflow: int = 10,
+        max_pool: int = 15,
+        max_keep: int = 5,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = 3600,
         echo: bool = False,
@@ -79,8 +80,8 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
         username : Remote server database username.
         password : Remote server database password.
         database : Remote server database name.
-        pool_size : Number of connections `keep open`.
-        max_overflow : Number of connections `allowed overflow`.
+        max_pool : Maximum number of connections in the pool.
+        max_keep : Maximum number of connections keeped.
         pool_timeout : Number of seconds `wait create` connection.
         pool_recycle : Number of seconds `recycle` connection.
             - `None | Literal[-1]`: No recycle.
@@ -136,28 +137,118 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
     __getitem__ = __getattr__
 
 
-    def __contains__(self, database: str) -> bool:
+    def __contains__(self, name: str) -> bool:
         """
         Whether the exist this database engine.
 
         Parameters
         ----------
-        database : Database name.
+        name : Database engine name.
         """
 
         # Judge.
-        result = database in self.__engine_dict
+        result = name in self.__engine_dict
 
         return result
 
 
+    def __iter__(self) -> Iterable[str]:
+        """
+        Iterable of database engine names.
+        """
+
+        # Generate.
+        names = iter(self.__engine_dict)
+
+        return names
+
+
 class Database(DatabaseSuper[DatabaseEngine]):
     """
     Database type.
     """
 
 
+    def warm_all(self, num: int | None = None) -> None:
+        """
+        Pre create connection to warm all pool.
+
+        Parameters
+        ----------
+        num : Create number.
+            - `None`: Use `self.max_keep` value.
+        """
+
+        # Parameter.
+        engines = set(
+            [
+                self[name]
+                for name in self
+            ]
+        )
+
+        # Warm.
+
+        ## Create.
+        func = lambda engine: engine.connect().close()
+        pool = ThreadPool(func, _max_workers=num)
+        for engine in engines:
+            engine_num = num or engine.max_keep
+            for _ in range(engine_num):
+                pool.one(engine.engine)
+
+        ## Wait.
+        pool.join()
+
+
 class DatabaseAsync(DatabaseSuper[DatabaseEngineAsync]):
     """
     Asynchronous database type.
     """
+
+
+    async def warm_all(self, num: int | None = None) -> None:
+        """
+        Asynchronous pre create connection to warm all pool.
+
+        Parameters
+        ----------
+        num : Create number.
+            - `None`: Use `self.max_keep` value.
+        """
+
+        # Parameter.
+        engines = set(
+            [
+                self[name]
+                for name in self
+            ]
+        )
+
+        # Warm.
+        coroutines = [
+            engine.warm(num)
+            for engine in engines
+        ]
+        await async_gather(*coroutines)
+
+
+    async def dispose_all(self) -> None:
+        """
+        Dispose asynchronous connections of all database.
+        """
+
+        # Parameter.
+        engines = set(
+            [
+                self[name]
+                for name in self
+            ]
+        )
+
+        # Dispose.
+        coroutines = [
+            engine.dispose()
+            for engine in engines
+        ]
+        await async_gather(*coroutines)

reydb/rengine.py

@@ -9,11 +9,13 @@
 """
 
 
-from typing import TypeVar, Generic, overload
+from typing import TypeVar, Generic
 from urllib.parse import quote as urllib_quote
 from pymysql.constants.CLIENT import MULTI_STATEMENTS
 from sqlalchemy import Engine, create_engine as sqlalchemy_create_engine
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine as sqlalchemy_create_async_engine
+from reykit.rbase import throw
+from reykit.rtask import ThreadPool, async_gather
 from reykit.rtext import join_data_text
 
 from . import rbase, rbuild, rconfig, rconn, rerror, rexec, rinfo, rorm
@@ -86,8 +88,8 @@ class DatabaseEngineSuper(
         username: str,
         password: str,
         database: str,
-        pool_size: int = 5,
-        max_overflow: int = 10,
+        max_pool: int = 15,
+        max_keep: int = 5,
         pool_timeout: float = 30.0,
         pool_recycle: int | None = 3600,
         echo: bool = False,
@@ -103,10 +105,10 @@ class DatabaseEngineSuper(
         username : Remote server database username.
         password : Remote server database password.
         database : Remote server database name.
-        pool_size : Number of connections `keep open`.
-        max_overflow : Number of connections `allowed overflow`.
-        pool_timeout : Number of seconds `wait create` connection.
-        pool_recycle : Number of seconds `recycle` connection.
+        max_pool : Maximum number of connections in the pool.
+        max_keep : Maximum number of connections keeped.
+        pool_timeout : Number of seconds wait create connection.
+        pool_recycle : Number of seconds recycle connection.
             - `None | Literal[-1]`: No recycle.
             - `int`: Use this value.
         echo : Whether report SQL execute information, not include ORM execute.
@@ -114,6 +116,8 @@ class DatabaseEngineSuper(
         """
 
         # Parameter.
+        if max_keep > max_pool:
+            throw(ValueError, max_keep, max_pool)
         if type(port) == str:
             port = int(port)
 
@@ -123,8 +127,8 @@ class DatabaseEngineSuper(
         self.host = host
         self.port: int | None = port
         self.database = database
-        self.pool_size = pool_size
-        self.max_overflow = max_overflow
+        self.max_pool = max_pool
+        self.max_keep = max_keep
         self.pool_timeout = pool_timeout
         if pool_recycle is None:
             self.pool_recycle = -1
@@ -238,10 +242,11 @@ class DatabaseEngineSuper(
         """
 
         # Parameter.
+        max_overflow = self.max_pool - self.max_keep
         engine_params = {
             'url': self.url,
-            'pool_size': self.pool_size,
-            'max_overflow': self.max_overflow,
+            'pool_size': self.max_keep,
+            'max_overflow': max_overflow,
             'pool_timeout': self.pool_timeout,
             'pool_recycle': self.pool_recycle,
             'connect_args': {'client_flag': MULTI_STATEMENTS}
@@ -270,10 +275,10 @@ class DatabaseEngineSuper(
         # Count.
         _overflow: int = self.engine.pool._overflow
         if _overflow < 0:
-            keep_n = self.pool_size + _overflow
+            keep_n = self.max_keep + _overflow
             overflow_n = 0
         else:
-            keep_n = self.pool_size
+            keep_n = self.max_keep
             overflow_n = _overflow
 
         return keep_n, overflow_n
@@ -532,8 +537,8 @@ class DatabaseEngine(
             self.username,
             self.password,
             self.database,
-            self.pool_size,
-            self.max_overflow,
+            self.max_pool,
+            self.max_keep,
             self.pool_timeout,
             self.pool_recycle,
             self.echo,
@@ -543,6 +548,31 @@ class DatabaseEngine(
         return db
 
 
+    def warm(self, num: int | None = None) -> None:
+        """
+        Pre create connection to warm pool.
+
+        Parameters
+        ----------
+        num : Create number.
+            - `None`: Use `self.max_keep` value.
+        """
+
+        # Parameter.
+        if num is None:
+            num = self.max_keep
+
+        # Warm.
+
+        ## Create.
+        func = lambda: self.engine.connect().close()
+        pool = ThreadPool(func, _max_workers=num)
+        pool * 5
+
+        ## Wait.
+        pool.join()
+
+
 class DatabaseEngineAsync(
     DatabaseEngineSuper[
         AsyncEngine,
@@ -576,8 +606,8 @@ class DatabaseEngineAsync(
             self.username,
             self.password,
             self.database,
-            self.pool_size,
-            self.max_overflow,
+            self.max_pool,
+            self.max_keep,
             self.pool_timeout,
             self.pool_recycle,
             self.echo,
@@ -587,6 +617,37 @@ class DatabaseEngineAsync(
         return db
 
 
+    async def warm(self, num: int | None = None) -> None:
+        """
+        Asynchronous pre create connection to warm pool.
+
+        Parameters
+        ----------
+        num : Create number.
+            - `None`: Use `self.max_keep` value.
+        """
+
+        # Parameter.
+        if num is None:
+            num = self.max_keep
+
+        # Warm.
+
+        ## Create.
+        coroutines = [
+            self.engine.connect()
+            for _ in range(num)
+        ]
+        conns = await async_gather(*coroutines)
+
+        ## Close.
+        coroutines = [
+            conn.close()
+            for conn in conns
+        ]
+        await async_gather(*coroutines)
+
+
     async def dispose(self) -> None:
         """
         Dispose asynchronous connections.

reydb/rerror.py

@@ -32,7 +32,7 @@ __all__ = (
 DatabaseEngineT = TypeVar('DatabaseEngineT', 'rdb.Database', 'rdb.DatabaseEngineAsync')
 
 
-class DatabaseORMTableError(rorm.Model, table=True):
+class DatabaseORMTableError(rorm.Table):
     """
     Database `error` table ORM model.
     """

reydb/rexec.py

@@ -1227,7 +1227,6 @@ class DatabaseExecuteAsync(DatabaseExecuteSuper['rconn.DatabaseConnectionAsync']
         if self.conn.autocommit:
             await self.conn.commit()
             await self.conn.close()
-            await self.conn.engine.dispose()
 
         return result
 

reydb/rorm.py

@@ -29,7 +29,7 @@ from sqlalchemy.sql._typing import _ColumnExpressionArgument
 from sqlalchemy.ext.asyncio import AsyncSessionTransaction
 from sqlalchemy.dialects.mysql import Insert, types as types_mysql
 from sqlalchemy.exc import SAWarning
-from sqlmodel import SQLModel, Session, Table
+from sqlmodel import SQLModel, Session, Table as STable
 from sqlmodel.main import SQLModelMetaclass, FieldInfo, default_registry
 from sqlmodel.ext.asyncio.session import AsyncSession
 from sqlmodel.sql._expression_select_cls import SelectOfScalar as Select
@@ -57,6 +57,8 @@ __all__ = (
     'DatabaseORMModelField',
     'DatabaseORMModel',
     'DatabaseORMModelMethod',
+    'DatabaseORMModelTableMeta',
+    'DatabaseORMModelTable',
     'DatabaseORMSuper',
     'DatabaseORM',
     'DatabaseORMAsync',
@@ -99,7 +101,7 @@ class DatabaseORMBase(DatabaseBase):
 
 class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
     """
-    Database ORM base meta type.
+    Database ORM meta type.
     """
 
 
@@ -181,7 +183,7 @@ class DatabaseORMModelMeta(DatabaseORMBase, SQLModelMetaclass):
             '__annotations__' in attrs
             and hasattr(cls, '__table__')
         ):
-            table: Table = cls.__table__
+            table: STable = cls.__table__
             for index in table.indexes:
                 index_name = '_'.join(
                     column.key
@@ -383,7 +385,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
 
 
     @classmethod
-    def _get_table(cls_or_self) -> Table:
+    def _get_table(cls_or_self) -> STable:
         """
         Return mapping database table instance.
 
@@ -393,7 +395,7 @@ class DatabaseORMModel(DatabaseORMBase, SQLModel, metaclass=model_metaclass):
         """
 
         # Get.
-        table: Table = cls_or_self.__table__
+        table: STable = cls_or_self.__table__
 
         return table
 
@@ -511,6 +513,54 @@ class DatabaseORMModelMethod(DatabaseORMBase):
         return instance
 
 
+class DatabaseORMModelTableMeta(DatabaseORMModelMeta):
+    """
+    Database ORM table meta type.
+    """
+
+
+    def __new__(
+        cls,
+        name: str,
+        bases: tuple[Type],
+        attrs: dict[str, Any],
+        **kwargs: Any
+    ) -> Type:
+        """
+        Create type.
+
+        Parameters
+        ----------
+        name : Type name.
+        bases : Type base types.
+        attrs : Type attributes and methods dictionary.
+        kwargs : Type other key arguments.
+        """
+
+        # Parameter.
+        if '__annotations__' in attrs:
+            kwargs['table'] = True
+
+        # Super.
+        new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
+
+        return new_cls
+
+
+class DatabaseORMModelTable(DatabaseORMModel, metaclass=DatabaseORMModelTableMeta):
+    """
+    Database ORM model table type.
+    Based on `sqlalchemy` and `sqlmodel` package.
+
+    Examples
+    --------
+    >>> class Foo(DatabaseORMModelTable):
+    ...     __name__ = 'Table name, default is class name.'
+    ...     __comment__ = 'Table comment.'
+    ...     ...
+    """
+
+
 class DatabaseORMSuper(DatabaseORMBase, Generic[DatabaseEngineT, DatabaseORMSessionT]):
     """
     Database ORM super type.
@@ -1151,7 +1201,6 @@ class DatabaseORMSessionAsync(
 
         # Close.
         await self.close()
-        await self.orm.engine.dispose()
 
 
     def get_sess(self) -> AsyncSession:
@@ -1262,7 +1311,6 @@ class DatabaseORMSessionAsync(
             if self.autocommit:
                 await self.commit()
                 await self.close()
-                await self.orm.engine.dispose()
 
             return result
 
@@ -1604,7 +1652,6 @@ class DatabaseORMStatementAsync(DatabaseORMStatementSuper[DatabaseORMSessionAsyn
 
             await self.sess.commit()
             await self.sess.close()
-            await self.sess.orm.engine.dispose()
 
         return result
 
@@ -1959,6 +2006,7 @@ metadata = default_registry.metadata
 
 ## Database ORM model type.
 Model = DatabaseORMModel
+Table = DatabaseORMModelTable
 
 ## Database ORM model field type.
 Field = DatabaseORMModelField

{reydb-1.3.5.dist-info → reydb-1.3.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: reydb
-Version: 1.3.5
+Version: 1.3.7
 Summary: Database method set.
 Project-URL: homepage, https://github.com/reyxbo/reydb/
 Author-email: Rey <reyxbo@163.com>

reydb-1.3.7.dist-info/RECORD

@@ -0,0 +1,16 @@
+reydb/__init__.py,sha256=BnJsTzcwqeQ8-5Boqsehgcpc1eSDkv41v0kdb10gAgM,643
+reydb/rall.py,sha256=5GI0yuwF72XypNZ1DYIxKizo2Z5pR88Uv0nUpHKYhCk,379
+reydb/rbase.py,sha256=S3ip2PxvLn2Spgv5G_xd7xgC-U4wjEoAZ7Up25ZQvLk,8223
+reydb/rbuild.py,sha256=6ZkU3LGkIk04KTPtd8fgTC4pX93p1tvbOhZWWEi-v5A,40846
+reydb/rconfig.py,sha256=uMzmOzs4ZJVmSmvH4X4Kj6TA2JjRUZHfyn6enGMS0Tc,18149
+reydb/rconn.py,sha256=ujyTAqR7FLr758EHDr04e0MTHDGDQEF_-YkfkYc8XRI,6986
+reydb/rdb.py,sha256=IhZLyXWZ5tiTWe2oq-nEkzTJW2ClvgT2-37OK-eOTXU,6063
+reydb/rengine.py,sha256=4tEIWxhtQ220_DZYb180hXhUwcxKGnPcv0yLaH1l0X4,17048
+reydb/rerror.py,sha256=K681wWDpFrsTV7puoO1LIBLr0E-yqFxFn09k6kKCYHI,14779
+reydb/rexec.py,sha256=bVPT8kueKnK5HWLtYklE5Vgc4crL7QxBEE3S0MQgRB4,52647
+reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
+reydb/rorm.py,sha256=yoK0DItEZvHHyjWpQwUES0VNRr1jvgcfKYoqf5CmBfU,51091
+reydb-1.3.7.dist-info/METADATA,sha256=o1nWPZWLozuaIwgS15QG8rzwCbtq0RcGrhd-ljtdQEM,1653
+reydb-1.3.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.3.7.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.3.7.dist-info/RECORD,,

reydb-1.3.5.dist-info/RECORD

@@ -1,16 +0,0 @@
-reydb/__init__.py,sha256=BnJsTzcwqeQ8-5Boqsehgcpc1eSDkv41v0kdb10gAgM,643
-reydb/rall.py,sha256=5GI0yuwF72XypNZ1DYIxKizo2Z5pR88Uv0nUpHKYhCk,379
-reydb/rbase.py,sha256=S3ip2PxvLn2Spgv5G_xd7xgC-U4wjEoAZ7Up25ZQvLk,8223
-reydb/rbuild.py,sha256=6ZkU3LGkIk04KTPtd8fgTC4pX93p1tvbOhZWWEi-v5A,40846
-reydb/rconfig.py,sha256=DFGTyoixqlSMGeWyd1os9K7YxnyY3RfgvPqQzZQlMQM,18161
-reydb/rconn.py,sha256=K_k6cJ94yrPIFaSZ06enpguTWVPhDu67LHan41C1bRA,7023
-reydb/rdb.py,sha256=LblF7igyr5y1lyrSRZIKcYI9M9rzWG-mdcJYWINlARw,4014
-reydb/rengine.py,sha256=qkpEsfHleia-bT7DBgERpSlZfszB5mLbRACtG-H2D-s,15640
-reydb/rerror.py,sha256=M7RPXwywLYl5Vew7jfXxUxVnBrM1b_T6V9Izt4B8zI0,14791
-reydb/rexec.py,sha256=Bbjqh0e3dE_NRnSfKfyfyyzAvXKdzXT5JLuzufHuH_s,52693
-reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
-reydb/rorm.py,sha256=UHZVNHkQ31RyJ5Ia9wmJ8ammIz59KKYOKh9HX6VEHX4,50002
-reydb-1.3.5.dist-info/METADATA,sha256=mxZmvHnUjHkt1iyQSfuaah-57VMDfbkwEvN0TDBqKZ0,1653
-reydb-1.3.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.3.5.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.3.5.dist-info/RECORD,,