ezKit 1.12.13__py3-none-any.whl → 1.12.15__py3-none-any.whl

ezKit/database.py

@@ -15,6 +15,8 @@ from typing import Any, Dict, Optional, Tuple, Type
 import pandas as pd
 from loguru import logger
 from sqlalchemy import CursorResult, Engine, Index, bindparam, create_engine, text
+from sqlalchemy.engine import Result
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker
 from sqlalchemy.orm import DeclarativeBase, Session, declarative_base
 
 from . import utils
@@ -125,7 +127,7 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
 
         for field, value in data.items():
 
-            # 特殊处理 PostgreSQL 日期字段
+            # 特殊处理日期字段
             if field == "date" or field.startswith("date__"):
                 field = field.replace("date", "datetime::date", 1)
 
@@ -136,6 +138,10 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                 # 避免字段名冲突
                 param_key = f"{base}_{op}"
 
+                # 特殊处理日期字段
+                if param_key.startswith("datetime::date"):
+                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+
                 if op == "like":
                     sql_parts.append(f"{base} LIKE :{param_key}")
                     param_dict[param_key] = f"%{value}%"
@@ -165,8 +171,15 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
 
             else:
 
-                sql_parts.append(f"{field} = :{field}")
-                param_dict[field] = value
+                param_key = field
+
+                # 特殊处理日期字段
+                if param_key.startswith("datetime::date"):
+                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+
+                sql_parts.append(f"{field} = :{param_key}")
+
+                param_dict[param_key] = value
 
         where_clause = " AND ".join(sql_parts)
 
@@ -575,3 +588,45 @@ class Database:
                 logger.error(f"{info} [failed]")
                 logger.exception(e)
                 return False
+
+
+# ----------------------------------------------------------------------------------------------
+
+
+class DatabaseAsyncSession:
+    """Database Async Session"""
+
+    AsyncSessionLocal: async_sessionmaker[AsyncSession]
+
+    def __init__(self, session: async_sessionmaker[AsyncSession]):
+        """Initiation"""
+        self.AsyncSessionLocal = session
+
+    # 执行器
+    async def operater(self, stmt, params, **kwargs) -> Result | None:
+
+        async with self.AsyncSessionLocal() as session:
+            try:
+                await session.begin()
+                result = await session.execute(stmt, params, **kwargs)
+                await session.commit()
+                return result
+            except Exception as e:
+                await session.rollback()
+                logger.exception(e)
+                return None
+
+    # 精确返回一个标量结果
+    async def operate_return_scalar_one(self, stmt, params, **kwargs) -> Any | None:
+        result = await self.operater(stmt, 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)
+        if result is None:
+            return []
+        rows = result.mappings().all()
+        return [dict(row) for row in rows]

{ezkit-1.12.13.dist-info → ezkit-1.12.15.dist-info}/METADATA

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

{ezkit-1.12.13.dist-info → ezkit-1.12.15.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=5bl0LmLnC7iVqICa9imCiQLufDf2VgDul6-CoCjBlfs,19512
+ezKit/database.py,sha256=6TMzofiGUvU4EPqWCMi8dMUkY9w45zxNaic92aErQDM,21433
 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.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.13.dist-info/METADATA,sha256=P3xB6jEXMjydeLGZfLhpNShaXzB4ZkwbLvdgyE8pSm4,317
-ezkit-1.12.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.13.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.13.dist-info/RECORD,,
+ezkit-1.12.15.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.15.dist-info/METADATA,sha256=DNH4AJqIW5rgiGMn_uRjjrCZo50rhTuLv0tohcmd36o,317
+ezkit-1.12.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.15.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.15.dist-info/RECORD,,