ezKit 1.9.0__tar.gz → 1.9.1__tar.gz

{ezkit-1.9.0/ezKit.egg-info → ezkit-1.9.1}/PKG-INFO

@@ -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 → ezkit-1.9.1}/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-1.9.0 → ezkit-1.9.1}/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-1.9.0 → ezkit-1.9.1}/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-1.9.0 → ezkit-1.9.1}/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 → ezkit-1.9.1/ezKit.egg-info}/PKG-INFO

@@ -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 → ezkit-1.9.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.9.0',
+    version='1.9.1',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',