reydb 1.2.21__py3-none-any.whl → 1.3.0__py3-none-any.whl

reydb/rdb.py

@@ -9,9 +9,8 @@
 """
 
 
-from typing import TypeVar, Generic, Self, Type
-from functools import wraps as functools_wraps
-from reykit.rbase import CallableT, Null, throw, warn
+from typing import Any, TypeVar, Generic, overload
+from reykit.rbase import Null, throw
 
 from .rbase import DatabaseBase
 from .rengine import DatabaseEngine, DatabaseEngineAsync
@@ -42,43 +41,67 @@ 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
-
-            return engine
+        # Create.
+        engine = engine_type(**kwargs)
 
+        # Add.
+        if name is None:
+            name = engine.database
+        self.__engine_dict[name] = engine
 
-        return func
+        return engine
 
 
     def __getattr__(self, database: str) -> DatabaseEngineT:
@@ -101,6 +124,9 @@ class DatabaseSuper(DatabaseBase, Generic[DatabaseEngineT]):
         return engine
 
 
+    @overload
+    def __getitem__(self, database: str) -> DatabaseEngineT: ...
+
     __getitem__ = __getattr__
 
 
@@ -125,13 +151,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-1.2.21.dist-info → reydb-1.3.0.dist-info}/METADATA

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

{reydb-1.2.21.dist-info → reydb-1.3.0.dist-info}/RECORD

@@ -4,13 +4,13 @@ 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=O3baeNJQo8vqBnLAkn1GSIMn9ORU9-VDO9FPkWZwODA,2975
+reydb/rdb.py,sha256=oDJxOEvDRDWNP7o2eTkbgp0-SYny-VcXQ8zD28OrfGg,3781
 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.21.dist-info/METADATA,sha256=ORyFPj-Ot-KPnH72XKaz1ZHulkKIV06_Mk08zlaqNQs,1647
-reydb-1.2.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-reydb-1.2.21.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
-reydb-1.2.21.dist-info/RECORD,,
+reydb-1.3.0.dist-info/METADATA,sha256=Vdt9YefQibzGOeL5aLD0XU4j7oqsQA5cYE-Vu_GDpuI,1646
+reydb-1.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+reydb-1.3.0.dist-info/licenses/LICENSE,sha256=UYLPqp7BvPiH8yEZduJqmmyEl6hlM3lKrFIefiD4rvk,1059
+reydb-1.3.0.dist-info/RECORD,,