ezKit 1.9.0__py3-none-any.whl → 1.9.1__py3-none-any.whl

ezKit/database.py

@@ -10,6 +10,7 @@ from typing import Any
 
 from loguru import logger
 from sqlalchemy import CursorResult, Index, create_engine, text
+from sqlalchemy.orm import DeclarativeBase
 
 from . import utils
 
@@ -19,13 +20,13 @@ class Database():
 
     engine = create_engine('sqlite://')
 
-    def __init__(self, engine_url, **engine_options):
+    def __init__(self, target: str, **options):
         """Initiation"""
-        if engine_url is not None and utils.isTrue(engine_url, str):
-            if utils.isTrue(engine_options, dict):
-                self.engine = create_engine(engine_url, **engine_options)
+        if isinstance(target, str) and utils.isTrue(target, str):
+            if utils.isTrue(options, dict):
+                self.engine = create_engine(target, **options)
             else:
-                self.engine = create_engine(engine_url)
+                self.engine = create_engine(target)
         else:
             pass
 
@@ -45,7 +46,7 @@ class Database():
             logger.exception(e)
             return False
 
-    def metadata_init(self, base, **kwargs) -> bool:
+    def metadata_init(self, base: DeclarativeBase, **kwargs) -> bool:
         # https://stackoverflow.com/questions/19175311/how-to-create-only-one-table-with-sqlalchemy
         info = "Database init table"
         try:

ezKit/mongo.py

@@ -11,6 +11,15 @@ class Mongo():
 
     client = MongoClient()
 
+    def __init__(self, target: str | dict):
+        """Initiation"""
+        if isinstance(target, str) and utils.isTrue(target, str):
+            self.client = MongoClient(target)
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
+            self.client = MongoClient(**target)
+        else:
+            pass
+
     def close(self) -> bool:
         """client close"""
         try:

ezKit/redis.py

@@ -16,12 +16,12 @@ class Redis:
     # 这里修改以下参数: host, port, socket_timeout, socket_connect_timeout, charset
     redis = RedisClient.Redis()
 
-    def __init__(self, arguments: str | dict):
+    def __init__(self, target: str | dict):
         """Initiation"""
-        if isinstance(arguments, str) and utils.isTrue(arguments, str):
-            self.redis = RedisClient.from_url(arguments)
-        elif isinstance(arguments, dict) and utils.isTrue(arguments, dict):
-            self.redis = RedisClient.Redis(**arguments)
+        if isinstance(target, str) and utils.isTrue(target, str):
+            self.redis = RedisClient.from_url(target)
+        elif isinstance(target, dict) and utils.isTrue(target, dict):
+            self.redis = RedisClient.Redis(**target)
         else:
             pass
 

ezKit/utils.py

@@ -1340,8 +1340,7 @@ def increment_version(
 
 
 def make_directory(
-    directory: str,
-    debug: bool = False
+    directory: str
 ) -> bool:
     """创建目录"""
     try:

{ezKit-1.9.0.dist-info → ezKit-1.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.9.0
+Version: 1.9.1
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezKit-1.9.0.dist-info → ezKit-1.9.1.dist-info}/RECORD

@@ -3,18 +3,18 @@ ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
 ezKit/bottle_extensions.py,sha256=3reEQVZuHklXTl6r7F8kiBFFPb0RaAGc3mYJJnrMDjQ,1129
 ezKit/cipher.py,sha256=0T_StbjiNI4zgrjVgcfU-ffKgu1waBA9UDudAnqFcNM,2896
 ezKit/cls.py,sha256=_MZRcYVvCfvh6aCrIXAUixY6Q9rS9X5ab4fckrP66yQ,10324
-ezKit/database.py,sha256=dP_8r_dSfWAa9HFL2RP_oWdH8-dy4rBdNxuJlkrVyPk,6878
+ezKit/database.py,sha256=3-kikSVzmAKUFFBf_t6GiGAPqWfx4IsZlZgyAI52JHA,6907
 ezKit/http.py,sha256=i3Kn5AMAMicDMcDjxKKZU7zqEKTU88Ec9_LwCuBJy-0,1801
-ezKit/mongo.py,sha256=xSy17ztK5-Mr0ybSca1bddVqXZQv8xxnfV4UbrAZ0Aw,2048
+ezKit/mongo.py,sha256=5KDDYQnOE3lw4QJlLp-EAuzbKM6VzbU0w0GR9iklldA,2379
 ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
-ezKit/redis.py,sha256=iMwtC90e93qwpxKcAG-k7G_cB6JveEZNNiw9pTfIj9E,1972
+ezKit/redis.py,sha256=5TQ7s8fkc-ArXuHT5gOlkR0EBgm3Z-9yTTtS1BgI5Qk,1951
 ezKit/sendemail.py,sha256=3YyBqFHPDZl9CwgWtmGABubARE_ih8P473mIcEp5VsY,8193
 ezKit/stock.py,sha256=lVzIL1BeB-7Stsm-xToTF7ivZiujozmKKpLErAIN3_A,1730
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
-ezKit/utils.py,sha256=yx9JGGSLLAb8GxVD3DKPcuJIuUSHgO9kwcpgMesrjcE,43030
+ezKit/utils.py,sha256=H130-ITDTmd4jwiie6pdyv20mPOk0KZxBcgmtey4rf4,43005
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.9.0.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.9.0.dist-info/METADATA,sha256=CLHlxCD8ESzGTA97szknsM7Oi82le9Cf4vQaKjUHO7I,190
-ezKit-1.9.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.9.0.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.9.0.dist-info/RECORD,,
+ezKit-1.9.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.9.1.dist-info/METADATA,sha256=Jj9sOr2ut2eUgx6kVPqYkgZPmhQlnQHNltlRFxfqXY4,190
+ezKit-1.9.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.9.1.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.9.1.dist-info/RECORD,,