reydb 1.2.20__py3-none-any.whl → 1.2.22__py3-none-any.whl

reydb/rconfig.py

@@ -79,7 +79,7 @@ class DatabaseConfigSuper(DatabaseBase, Generic[DatabaseEngineT]):
             if type(self) == DatabaseConfig:
                 self.build_db()
             elif type(self) == DatabaseConfigAsync:
-                engine.sync_database.config.build_db()
+                engine.sync_engine.config.build_db()
             self._checked = True
 
 

reydb/rdb.py

@@ -9,14 +9,20 @@
 """
 
 
-from typing import TypeVar, Generic, Self, Type
-from functools import wraps as functools_wraps
-from reykit.rbase import CallableT, warn
+from typing import Any, TypeVar, Generic, overload
+from reykit.rbase import Null, throw
 
 from .rbase import DatabaseBase
 from .rengine import DatabaseEngine, DatabaseEngineAsync
 
 
+__all__ = (
+    'DatabaseSuper',
+    'Database',
+    'DatabaseAsync'
+)
+
+
 DatabaseEngineT = TypeVar('DatabaseEngineT', DatabaseEngine, DatabaseEngineAsync)
 
 
@@ -35,46 +41,70 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
         self.__engine_dict: dict[str, DatabaseEngineT] = {}
 
 
-    @classmethod
-    def _wrap_add(
-        cls_or_self,
-        engine_type: Type[DatabaseEngine] | Type[DatabaseEngineAsync],
-        type_hint: CallableT
-    ) -> CallableT:
+    @overload
+    def __call__(
+        self,
+        name: str | None = None,
+        *,
+        host: str,
+        port: int | str,
+        username: str,
+        password: str,
+        database: str,
+        pool_size: int = 5,
+        max_overflow: int = 10,
+        pool_timeout: float = 30.0,
+        pool_recycle: int | None = 3600,
+        echo: bool = False,
+        **query: str
+    ) -> DatabaseEngineT: ...
+
+    def __call__(
+        self,
+        name: str | None = None,
+        **kwargs: Any
+    ) -> DatabaseEngineT:
         """
-        Decorator, create and add database engine.
+        Build instance attributes.
 
         Parameters
         ----------
-        engine_type : Database engine type.
-        type_hint : Type hint.
-
-        Returns
-        -------
-        Decorated method.
+        name : Database engine name, useed for index.
+            - `None`: Use database name.
+        host : Remote server database host.
+        port : Remote server database port.
+        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.
+            - `None | Literal[-1]`: No recycle.
+            - `int`: Use this value.
+        echo : Whether report SQL execute information, not include ORM execute.
+        query : Remote server database parameters.
         """
 
+        # Parameter.
+        match self:
+            case Database():
+                engine_type = DatabaseEngine
+            case DatabaseAsync():
+                engine_type = DatabaseEngineAsync
 
-        @functools_wraps(engine_type.__init__)
-        def func(self: Self, *args, **kwargs):
-
-            # Build.
-            engine: DatabaseEngineT = engine_type(*args, **kwargs)
-
-            # Warning.
-            if engine.database in self.__engine_dict:
-                warn(f'database engine "{engine.database}" re registered.')
-
-            # Add.
-            self.__engine_dict[engine.database] = engine
+        # Create.
+        engine = engine_type(**kwargs)
 
-            return engine
+        # Add.
+        if name is None:
+            name = engine.database
+        self.__engine_dict[name] = engine
 
-
-        return func
+        return engine
 
 
-    def __getitem__(self, database: str) -> DatabaseEngineT:
+    def __getattr__(self, database: str) -> DatabaseEngineT:
         """
         Get added database engine.
 
@@ -84,12 +114,17 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
         """
 
         # Get.
-        engine = self.__engine_dict[database]
+        engine = self.__engine_dict.get(database, Null)
+
+        # Throw exception.
+        if engine == Null:
+            text = f"lack of database engine '{database}'"
+            throw(AssertionError, text=text)
 
         return engine
 
 
-    __getattr__ = __getitem__
+    __getitem__ = __getattr__
 
 
     def __contains__(self, database: str) -> bool:
@@ -113,13 +148,7 @@ class Database(DatabaseSuper[DatabaseEngine]):
     """
 
 
-    __call__ = DatabaseSuper._wrap_add(DatabaseEngine, DatabaseEngine.__init__)
-
-
 class DatabaseAsync(DatabaseSuper[DatabaseEngineAsync]):
     """
     Asynchronous database type.
     """
-
-
-    __call__ = DatabaseSuper._wrap_add(DatabaseEngineAsync, DatabaseEngineAsync.__init__)

reydb/rengine.py

@@ -520,7 +520,7 @@ class DatabaseEngine(
 
 
     @property
-    def async_database(self) -> 'DatabaseEngineAsync':
+    def async_engine(self) -> 'DatabaseEngineAsync':
         """
         Same engine `DatabaseEngineAsync` instance.
         """
@@ -564,7 +564,7 @@ class DatabaseEngineAsync(
 
 
     @property
-    def sync_database(self) -> DatabaseEngine:
+    def sync_engine(self) -> DatabaseEngine:
         """
         Same engine `Database` instance.
         """

{reydb-1.2.20.dist-info → reydb-1.2.22.dist-info}/METADATA

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

{reydb-1.2.20.dist-info → reydb-1.2.22.dist-info}/RECORD

@@ -2,15 +2,15 @@ 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=oOYGqhFzWVPx57D-Bbw6B2F9VmqGc_Y-aTy-mJd0Cgk,18163
+reydb/rconfig.py,sha256=DFGTyoixqlSMGeWyd1os9K7YxnyY3RfgvPqQzZQlMQM,18161
 reydb/rconn.py,sha256=K_k6cJ94yrPIFaSZ06enpguTWVPhDu67LHan41C1bRA,7023
-reydb/rdb.py,sha256=X3ZScVFnPAm6Cqmsx13CCumQH3ZwEQcL4UqpoY42APg,2708
-reydb/rengine.py,sha256=CoUh0n5ZG1oRdbcTqCl-s8R8ePXJtIxDg79E6dGx2dU,15644
+reydb/rdb.py,sha256=KAxSDuRgAnNuwS8xie7kTvwLWM9m97suF8qhC_q9yT4,3698
+reydb/rengine.py,sha256=qkpEsfHleia-bT7DBgERpSlZfszB5mLbRACtG-H2D-s,15640
 reydb/rerror.py,sha256=M7RPXwywLYl5Vew7jfXxUxVnBrM1b_T6V9Izt4B8zI0,14791
 reydb/rexec.py,sha256=hZe5SRbqo_aTpuB1vI2HXVx1FjtwvKGLRom3uzjTuqI,52949
 reydb/rinfo.py,sha256=c5otyOikGMVnLFhPbtlgmnFBRR3NMP7xcmMW-LQdaQk,18314
 reydb/rorm.py,sha256=mnfVf6fulTJ84EyjFqYijdAwdwaybBVvyZKNG4EhbwU,50065
-reydb-1.2.20.dist-info/METADATA,sha256=3WSGgIL7ScE69ImeI9ma3zezy-rgNmZ0dxe1a1WPr1k,1647
-reydb-1.2.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.20.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.20.dist-info/RECORD,,
+reydb-1.2.22.dist-info/METADATA,sha256=pW3SVZyNIILKtdjf7dnRzGkQcAAKzmBi8LPfPCuBlE0,1647
+reydb-1.2.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.2.22.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.2.22.dist-info/RECORD,,