ezKit 1.12.24__py3-none-any.whl → 1.12.26__py3-none-any.whl

ezKit/database.py

@@ -9,6 +9,7 @@
 
 import csv
 import json
+from copy import deepcopy
 from datetime import date, datetime
 from typing import Any, Dict, List, Optional, Tuple, Type
 
@@ -121,11 +122,13 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
 
     try:
 
+        _data = deepcopy(data)
+
         sql_parts = []
         param_dict = {}
         bind_params = []
 
-        for field, value in data.items():
+        for field, value in _data.items():
 
             # 特殊处理日期字段
             if field == "date" or field.startswith("date__"):
@@ -195,32 +198,34 @@ def build_sqlalchemy_select_where(data: dict) -> tuple | None:
 
     try:
 
+        _data = deepcopy(data)
+
         # 获取分页参数 (从 data 中取出 pageIndex 和 pageSize, 剩余的为查询参数)
 
-        pageIndex = data.pop("pageIndex", 1)
-        pageSize = data.pop("pageSize", 10)
+        pageIndex = _data.pop("pageIndex", 1)
+        pageSize = _data.pop("pageSize", 10)
 
         limit, offset = get_limit_offset(pageIndex, pageSize)
 
         # 构建 WHERE
 
-        build_result = build_sqlalchemy_where_clause(data)
+        build_result = build_sqlalchemy_where_clause(_data)
 
         if build_result is None:
             logger.error("Build SQLAlchemy WHERE clause error")
             return None
 
-        where_clause, sql_params, bind_params = build_result
+        where_clause, statement_params, bind_params = build_result
 
         # 添加 WHERE 前缀
         if isinstance(where_clause, str) and where_clause.strip():
             where_clause = f"WHERE {where_clause.strip()}"
 
         # 分页参数
-        sql_params["limit"] = limit
-        sql_params["offset"] = offset
+        statement_params["limit"] = limit
+        statement_params["offset"] = offset
 
-        return where_clause, sql_params, bind_params
+        return where_clause, statement_params, bind_params
 
     except Exception as e:
         logger.exception(e)
@@ -238,17 +243,17 @@ def build_sqlalchemy_update(tablename: str, where_data: dict, update_data: dict)
         logger.error("Build SQLAlchemy WHERE clause error")
         return None
 
-    where_clause, sql_params, bind_params = build_result
+    where_clause, statement_params, bind_params = build_result
 
     # 构建 UPDATE SQL 语句 (SET 中 key 的 value 的 key 添加后缀 _value, 避免与 where 冲突)
     sql: str = f"UPDATE {tablename} SET " + ", ".join([f"{k} = :{k}_value" for k in update_data.keys()]) + f" WHERE {where_clause}"
 
     # 合并数据 (key 添加后缀 _value, 与 SQL 保持一致)
     for k in update_data.keys():
-        sql_params[f"{k}_value"] = update_data[k]
+        statement_params[f"{k}_value"] = update_data[k]
 
     # 返回 statement 和 params
-    return text(sql).bindparams(*bind_params), sql_params
+    return text(sql).bindparams(*bind_params), statement_params
 
 
 # --------------------------------------------------------------------------------------------------

ezKit/errors.py

@@ -0,0 +1,39 @@
+# 内部错误: 1000
+internal_error = {
+    "type": {
+        "code": 1001,
+        "message": "type error",
+    },
+}
+
+# HTTP错误: 2000
+http_error = {
+    "request_data": {
+        "code": 2001,
+        "message": "HTTP request data error",
+    },
+}
+
+# 数据库错误: 3000
+database_error = {
+    "create": {
+        "code": 3001,
+        "message": "Database create data error",
+    },
+    "read": {
+        "code": 3002,
+        "message": "Database read data error",
+    },
+    "update": {
+        "code": 3003,
+        "message": "Database create data error",
+    },
+    "delete": {
+        "code": 3004,
+        "message": "Database delete data error",
+    },
+    "build_sqlalchemy_where": {
+        "code": 3005,
+        "message": "Database build SQLAlchemy WHERE error",
+    },
+}

{ezkit-1.12.24.dist-info → ezkit-1.12.26.dist-info}/METADATA

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

{ezkit-1.12.24.dist-info → ezkit-1.12.26.dist-info}/RECORD

@@ -3,8 +3,9 @@ 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=5-hKwdRmjkvjaMR-c0Y71YL4RP8RZQMwcvTSRkDR12M,23625
+ezKit/database.py,sha256=yxi8HZw9ijbfKYhCl8OApoLDwLW7tYjPPucsTw6D_Is,23761
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
+ezKit/errors.py,sha256=cZ6mxKvFIPhyStgpI-xJ0d9RKaHgYDfEVAd0DTTmOo4,791
 ezKit/http.py,sha256=zhNxJF-x91UqGncXWxVXnhZVpFo_wmmpGnMXVT11y9E,1832
 ezKit/markdown_to_html.template,sha256=21G2sSVGJn6aJvHd0NN4zY5YiDteKe4UtW36AzBwSdk,22274
 ezKit/mongo.py,sha256=vsRCjJ2uWbNp-1bnGKICPohNYx25El8XnHp10o-lsM4,2397
@@ -15,8 +16,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.24.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.24.dist-info/METADATA,sha256=hMehrY5rKRa8oHbzOJarQMHyPfyHVeJ3JlFFhNdYNbo,317
-ezkit-1.12.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.24.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.24.dist-info/RECORD,,
+ezkit-1.12.26.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.26.dist-info/METADATA,sha256=vw83wZI4gd6TraXXqL1fUswqghGHX0h_Ehs0SYmNYnQ,317
+ezkit-1.12.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.26.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.26.dist-info/RECORD,,