ezKit 1.12.20__tar.gz → 1.12.22__tar.gz

{ezkit-1.12.20/ezKit.egg-info → ezkit-1.12.22}/PKG-INFO

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

{ezkit-1.12.20 → ezkit-1.12.22}/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
@@ -602,13 +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, **kwargs) -> Result | None:
 
         async with self.AsyncSessionLocal() as session:
+
             try:
-                await session.begin()
-                result = await session.execute(stmt, params, **kwargs)
+                result = await session.execute(statement, params, **kwargs)
                 await session.commit()
                 return result
             except Exception as e:
@@ -616,38 +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, **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:
-        result = await self.operater(stmt, params, **kwargs)
+    # 返回所有结果 (适用于所有select)
+    async def operate_return_mappings_all(self, statement, params, **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, data: list) -> bool:
-
-        if not utils.isTrue(data, list):
-            return False
-
-        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))
-                await session.commit()
-                return True
-            except Exception as e:
-                await session.rollback()
-                logger.exception(e)
-                return False

{ezkit-1.12.20 → ezkit-1.12.22/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.12.20 → ezkit-1.12.22}/setup.py

@@ -4,7 +4,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="ezKit",
-    version="1.12.20",
+    version="1.12.22",
     author="septvean",
     author_email="septvean@gmail.com",
     description="Easy Kit",