ezKit 1.12.29__py3-none-any.whl → 1.12.31__py3-none-any.whl

ezKit/database.py

@@ -705,7 +705,7 @@ class DatabaseAsyncSession:
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_create(db: DatabaseAsyncSession, schema: Type[DeclarativeBase], data: list) -> dict:
+async def async_create_and_count(db: DatabaseAsyncSession, schema: Type[DeclarativeBase], data: list) -> dict:
 
     # 插入数据
     result = await db.operater(insert(schema), data)
@@ -720,7 +720,7 @@ async def db_async_create(db: DatabaseAsyncSession, schema: Type[DeclarativeBase
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
+async def async_read_and_count(db: DatabaseAsyncSession, table_name: str, data: dict, statement_prefix: str, statement_end: str = "") -> dict:
 
     # 初始返回结果 (适用于 count 等于 0)
     result = {"count": 0, "data": None, "pageIndex": data["pageIndex"], "pageSize": 0}
@@ -759,8 +759,6 @@ async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, s
             {statement_prefix}
             {where_clause}
             {statement_end}
-            LIMIT :limit
-            OFFSET :offset;
         """
     ).bindparams(*bind_params)
 
@@ -782,7 +780,7 @@ async def db_async_read(db: DatabaseAsyncSession, table_name: str, data: dict, s
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_update(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
+async def async_update_and_count(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
 
     # 构建 WHERE
 
@@ -832,7 +830,7 @@ async def db_async_update(db: DatabaseAsyncSession, table_name: str, data: dict)
 # --------------------------------------------------------------------------------------------------
 
 
-async def db_async_delete(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
+async def async_delete_and_count(db: DatabaseAsyncSession, table_name: str, data: dict) -> dict:
 
     # 构建 WHERE
 

ezKit/fastapix.py

@@ -0,0 +1,78 @@
+# FastAPI Extensions
+# pylint: disable=W0613
+
+import logging
+import sys
+from typing import Any
+
+from fastapi import FastAPI, Request
+from fastapi.exceptions import RequestValidationError
+from fastapi.responses import JSONResponse
+from loguru import logger
+from pydantic import ValidationError
+from starlette.exceptions import HTTPException as StarletteHTTPException
+
+# 移除默认控制台日志器
+logger.remove()
+
+# 日志输出到控制台
+logger.add(sys.stdout, level="INFO", format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan> - <level>{message}</level>")
+
+# 日志输出到文件
+logger.add(
+    sink="logs/runtime.log",  # 日志文件
+    rotation="10 MB",  # 文件达到 10MB 自动轮转
+    retention="7 days",  # 保留 7 天日志
+    compression="zip",  # 超过的日志自动压缩
+    level="INFO",  # 记录等级
+    encoding="utf-8",  # 文件编码
+    enqueue=True,  # 多线程、多进程安全
+    diagnose=True,  # 显示变量值
+    backtrace=True,  # 捕获堆栈追踪
+)
+
+
+def Response(code: int = 200, data: Any = None, message: str | None = None, status_code: int = 200):
+    return JSONResponse(content={"code": code, "data": data, "message": message}, status_code=status_code)
+
+
+def exceptions(app: FastAPI):
+
+    @app.exception_handler(StarletteHTTPException)
+    async def http_exception_handler(request: Request, exc: StarletteHTTPException):
+        logger.warning(f"HTTP Exception: {exc.detail}")
+        return Response(status_code=exc.status_code, code=exc.status_code, message=exc.detail)
+
+    # 参数验证错误
+    @app.exception_handler(RequestValidationError)
+    async def validation_exception_handler(request: Request, exc: RequestValidationError):
+        logger.warning(f"Request Validation Error: {exc.errors()}")
+        return Response(code=422, data=exc.errors(), message="Request Validation Error")
+
+    # 参数验证错误
+    @app.exception_handler(ValidationError)
+    async def pydantic_validation_error_handler(request: Request, exc: ValidationError):
+        logger.warning(f"Pydantic Validation Error: {exc.errors()}")
+        return Response(code=422, data=exc.errors(), message="Pydantic Validation Error")
+
+    # 服务器内部错误
+    @app.exception_handler(Exception)
+    async def global_exception_handler(request: Request, exc: Exception):
+        logger.exception("Unhandled Exception")
+        return Response(code=500, data=None, message="Server Internal Error")
+
+
+# 兼容 FastAPI/Uvicorn 的 logging（重要）
+class InterceptHandler(logging.Handler):
+    """Intercept Handler"""
+
+    def emit(self, record):
+        logger_opt = logger.opt(depth=6, exception=record.exc_info)
+        logger_opt.log(record.levelname, record.getMessage())
+
+    def write(self, message: str):
+        if message.strip():
+            logger.info(message.strip())
+
+    def flush(self):
+        pass

{ezkit-1.12.29.dist-info → ezkit-1.12.31.dist-info}/METADATA

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

{ezkit-1.12.29.dist-info → ezkit-1.12.31.dist-info}/RECORD

@@ -3,9 +3,10 @@ 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=5MsIYDhyN6VtQ8MJy7pbMGqeaXguy9DzRHgJ6NJD5Gs,30126
+ezKit/database.py,sha256=W3xV_0o317oRaxZJWt_XithwzfL5HcTiGOyqpj07qNk,30101
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=wLLzJ-YWCdAUqdLzsHM-jfnfZJL9pHtZoG_O_bVNI_A,1334
+ezKit/fastapix.py,sha256=59wqVLqJxNVesZTAwAqkzkiMQHKQQbVUijFP-IDu4ws,2935
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
 ezKit/mongo.py,sha256=vsRCjJ2uWbNp-1bnGKICPohNYx25El8XnHp10o-lsM4,2397
@@ -16,8 +17,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.29.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.29.dist-info/METADATA,sha256=8eEFRDzl6V1laRNNs2E1maD3xcSGOXBlNBVTr9s2geQ,317
-ezkit-1.12.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.29.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.29.dist-info/RECORD,,
+ezkit-1.12.31.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.31.dist-info/METADATA,sha256=8Ikl0M9e8okfWrbNyado9vHBAloM8KpLQTWynydtP_8,317
+ezkit-1.12.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.31.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.31.dist-info/RECORD,,