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

ezKit/database.py

@@ -602,12 +602,15 @@ class DatabaseAsyncSession:
         """Initiation"""
         self.AsyncSessionLocal = session
 
-    # 执行器
-    async def operater(self, stmt, params, **kwargs) -> Result | None:
+    # 执行器 (CRUD都可以执行. 即可以执行原生SQL, 也可以执行ORM)
+    #   statement: SQL 或者 insert(schema)等
+    #   params: List[dict]
+    async def operater(self, statement, params: Any | None = None, **kwargs) -> Result | None:
 
         async with self.AsyncSessionLocal() as session:
+
             try:
-                result = await session.execute(stmt, params, **kwargs)
+                result = await session.execute(statement, params, **kwargs)
                 await session.commit()
                 return result
             except Exception as e:
@@ -615,40 +618,17 @@ class DatabaseAsyncSession:
                 logger.exception(e)
                 return None
 
-    # 精确返回一个标量结果
-    async def operate_return_scalar_one(self, stmt, params, **kwargs) -> Any | None:
-        result = await self.operater(stmt, params, **kwargs)
+    # 精确返回一个标量结果 (适用于只返回一行数据的select, 比如 count 查询)
+    async def operate_return_scalar_one(self, statement, params: Any | None = None, **kwargs) -> Any | None:
+        result = await self.operater(statement, params, **kwargs)
         if result is None:
             return None
         return result.scalar_one()
 
-    # 返回所有结果
-    async def operate_return_mappings_all(self, stmt, params, **kwargs) -> List[Any]:
-        result = await self.operater(stmt, params, **kwargs)
+    # 返回所有结果 (适用于所有select)
+    async def operate_return_mappings_all(self, statement, params: Any | None = None, **kwargs) -> List[Any]:
+        result = await self.operater(statement, params, **kwargs)
         if result is None:
             return []
         rows = result.mappings().all()
         return [dict(row) for row in rows]
-
-    # 创建数据
-    async def create_with_schema(self, schema: Type[Any], data: List[dict]) -> int:
-
-        if not utils.isTrue(data, list):
-            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))
-                stmt = insert(schema)
-                await session.execute(stmt, data)
-                await session.commit()
-                return len(data)
-            except Exception as e:
-                await session.rollback()
-                logger.exception(e)
-                return 0

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

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

{ezkit-1.12.21.dist-info → ezkit-1.12.23.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=EIk3fk8ygScpA858gD2piCHD9Tzu7zpu-3jYQ40CPsk,22229
+ezKit/database.py,sha256=ZvyxBr-_3XNTuyJTM_5HUJqeyAmLI-ftDAKTyab5wsw,21732
 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.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,,
+ezkit-1.12.23.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.23.dist-info/METADATA,sha256=_uyFQwYed7tO-PoyfSnn5cEAQAz7lHU5thsZaegrOfo,317
+ezkit-1.12.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.23.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.23.dist-info/RECORD,,