ezKit 1.12.3__py3-none-any.whl → 1.12.5__py3-none-any.whl

ezKit/database.py

@@ -13,10 +13,12 @@ from typing import Any, Type
 import pandas as pd
 from loguru import logger
 from sqlalchemy import CursorResult, Index, create_engine, text
-from sqlalchemy.orm import DeclarativeBase, Session
+from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
 
 from . import utils
 
+Base = declarative_base()
+
 
 class Database:
     """Database"""
@@ -71,6 +73,17 @@ class Database:
 
     # ----------------------------------------------------------------------------------------------
 
+    def initialization_table(self, table: str):
+        """初始化表"""
+
+        # 初始化所有表
+        #   db.metadata_init(Base)
+        # 初始化指定表
+        #   database.metadata_init(Base, tables=[Base.metadata.tables['ashare']])
+        self.metadata_init(Base, tables=[Base.metadata.tables[table]])
+
+    # ----------------------------------------------------------------------------------------------
+
     def create_index(self, index_name, table_field) -> bool:
         # 创建索引
         #   https://stackoverflow.com/a/41254430
@@ -349,33 +362,37 @@ class Database:
 
     # ----------------------------------------------------------------------------------------------
 
-    def create_with_dict_or_list(self, TS: Type, data: dict | list):
-        """将 dict 或 list 类型的数据添加到表中. TS: Table Schema"""
+    def create_data(self, TS: Type, data: list) -> bool:
+        """创建数据. TS: Table Schema"""
 
         info: str = "create data"
 
-        try:
+        if not utils.isTrue(data, list):
+            logger.error(f"{info} [data type is not a list]")
 
-            logger.info(f"{info} ......")
+        logger.info(f"{info} ......")
+
+        with Session(self.engine) as session:
+
+            try:
 
-            with Session(self.engine) as session:
+                for item in data:
 
-                if utils.isTrue(data, dict):
-                    logger.info(f"{info} [data type is dict]")
-                    session.add(TS(**data))  # type: ignore
+                    if not utils.isTrue(item, dict):
+                        logger.error(f"{info} [data type error]")
+                        session.rollback()
+                        return False
 
-                if utils.isTrue(data, list):
-                    logger.info(f"{info} [data type is list]")
-                    for item in data:
-                        session.add(TS(**item))
+                    session.add(TS(**item))
 
                 session.commit()
 
-            logger.success(f"{info} [success]")
+                logger.success(f"{info} [success]")
 
-            return True
+                return True
 
-        except Exception as e:
-            logger.error(f"{info} [failed]")
-            logger.exception(e)
-            return False
+            except Exception as e:
+                session.rollback()
+                logger.error(f"{info} [failed]")
+                logger.exception(e)
+                return False

{ezkit-1.12.3.dist-info → ezkit-1.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ezKit
-Version: 1.12.3
+Version: 1.12.5
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezkit-1.12.3.dist-info → ezkit-1.12.5.dist-info}/RECORD

@@ -3,7 +3,7 @@ ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
 ezKit/bottle.py,sha256=43h4v1kzz6qrLvCt5IMN0H-gFtaT0koG9wETqteXsps,181666
 ezKit/bottle_extensions.py,sha256=27rogmfK7mL2qUSjXH79IMGZbCVULtYEikql_N9O6Zs,1165
 ezKit/cipher.py,sha256=7jBarRH7ukSYzkz-Anl8B8JzluhnRz4CLHidPRRj_cg,2939
-ezKit/database.py,sha256=bcDdLJnOW-YnojxZzAXCK0PZzI7vclRsaVNZ4xj6GBA,13182
+ezKit/database.py,sha256=aRJGiBOv4_W69MQnwaF0W1wClUFF7HQYYThAvjsRRrk,13679
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
@@ -15,8 +15,8 @@ ezKit/token.py,sha256=Ac-i9xfq4TqpGyfCzakjrh4NYzxHiN2sCQrMk1tzVi8,1716
 ezKit/utils.py,sha256=VyAw2yEs15VER9RCpMgskx1l0zrSpRlV34X___eOia0,42416
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.3.dist-info/METADATA,sha256=nWJk1HCy_-WEmxnAUE7g2bXUaerZeHB249yXiRoj4-k,316
-ezkit-1.12.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.3.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.3.dist-info/RECORD,,
+ezkit-1.12.5.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.5.dist-info/METADATA,sha256=QzYy8GO4rrQpJq82RZ-zmnFtu5xg2gA88Wiup4DJYkM,316
+ezkit-1.12.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.5.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.5.dist-info/RECORD,,