ezKit 1.12.20__py3-none-any.whl → 1.12.21__py3-none-any.whl

ezKit/database.py

@@ -10,11 +10,11 @@
 import csv
 import json
 from datetime import date, datetime
-from typing import Any, Dict, Optional, Tuple, Type
+from typing import Any, Dict, List, Optional, Tuple, Type
 
 import pandas as pd
 from loguru import logger
-from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, text
+from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, insert, text
 from sqlalchemy.engine import Result
 from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
@@ -607,7 +607,6 @@ class DatabaseAsyncSession:
 
         async with self.AsyncSessionLocal() as session:
             try:
-                await session.begin()
                 result = await session.execute(stmt, params, **kwargs)
                 await session.commit()
                 return result
@@ -624,7 +623,7 @@ class DatabaseAsyncSession:
         return result.scalar_one()
 
     # 返回所有结果
-    async def operate_return_mappings_all(self, stmt, params, **kwargs) -> list:
+    async def operate_return_mappings_all(self, stmt, params, **kwargs) -> List[Any]:
         result = await self.operater(stmt, params, **kwargs)
         if result is None:
             return []
@@ -632,22 +631,24 @@ class DatabaseAsyncSession:
         return [dict(row) for row in rows]
 
     # 创建数据
-    async def create_with_schema(self, schema: Type, data: list) -> bool:
+    async def create_with_schema(self, schema: Type[Any], data: List[dict]) -> int:
 
         if not utils.isTrue(data, list):
-            return False
+            return 0
 
         async with self.AsyncSessionLocal() as session:
             try:
-                for item in data:
-                    if not utils.isTrue(item, dict):
-                        await session.rollback()
-                        return False
-                    # 这里不使用 await
-                    session.add(schema(**item))
+                # for item in data:
+                #     if not utils.isTrue(item, dict):
+                #         await session.rollback()
+                #         return False
+                #     # 这里不使用 await
+                #     session.add(schema(**item))
+                stmt = insert(schema)
+                await session.execute(stmt, data)
                 await session.commit()
-                return True
+                return len(data)
             except Exception as e:
                 await session.rollback()
                 logger.exception(e)
-                return False
+                return 0

{ezkit-1.12.20.dist-info → ezkit-1.12.21.dist-info}/METADATA

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

{ezkit-1.12.20.dist-info → ezkit-1.12.21.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=dpKNq2MRwrPp2VMftyQICxIndI6XEVXbfRHjZYvKSzI,22141
+ezKit/database.py,sha256=EIk3fk8ygScpA858gD2piCHD9Tzu7zpu-3jYQ40CPsk,22229
 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=U457ahFkxIXuB-qWvS3995xJs-LlkFIX5_ZWVgmL5cY,43130
 ezKit/xftp.py,sha256=-XQXyhMqeigT63P6sXkSS7r4GROXyqqlkzKxITLWG-g,8278
 ezKit/zabbix.py,sha256=PkMnfu7mcuotwwIIsHaC9FsNg-gap6hD1xvm0AwSL1Y,33777
-ezkit-1.12.20.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.20.dist-info/METADATA,sha256=s0CDOfty1OVbhWZYbbkMwDjYS40VVt3Yf-d4A0kRYSw,317
-ezkit-1.12.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.20.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.20.dist-info/RECORD,,
+ezkit-1.12.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.21.dist-info/METADATA,sha256=lhiYJh8L-EANUCp6S0v22zZNRbUlk_c4MDmguaNjEr8,317
+ezkit-1.12.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.21.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.21.dist-info/RECORD,,