ezKit 1.12.39__py3-none-any.whl → 1.12.41__py3-none-any.whl

ezKit/auth.py

@@ -0,0 +1,15 @@
+import bcrypt
+
+
+def hash_password(password: str) -> str:
+    try:
+        return bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+    except Exception as _:
+        return ""
+
+
+def verify_password(plain_password: str, hashed_password: str) -> bool:
+    try:
+        return bcrypt.checkpw(plain_password.encode(), hashed_password.encode())
+    except Exception as _:
+        return False

ezKit/database.py

@@ -25,7 +25,7 @@ from .errors import database_error, sqlalchemy_error
 
 # --------------------------------------------------------------------------------------------------
 
-Base = declarative_base()
+Base: DeclarativeBase = declarative_base()
 
 # --------------------------------------------------------------------------------------------------
 
@@ -123,6 +123,78 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
     - 返回: (SQL 子句字符串, 参数 dict, bindparams 列表)
     """
 
+    # try:
+
+    #     _data = deepcopy(data)
+
+    #     sql_parts = []
+    #     param_dict = {}
+    #     bind_params = []
+
+    #     for field, value in _data.items():
+
+    #         # 特殊处理日期字段
+    #         if field == "date" or field.startswith("date__"):
+    #             field = field.replace("date", "datetime::date", 1)
+
+    #         if "__" in field:
+
+    #             base, op = field.split("__", 1)
+
+    #             # 避免字段名冲突
+    #             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}%"
+    #             elif op == "ge":
+    #                 sql_parts.append(f"{base} >= :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "gt":
+    #                 sql_parts.append(f"{base} > :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "le":
+    #                 sql_parts.append(f"{base} <= :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "lt":
+    #                 sql_parts.append(f"{base} < :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "ne":
+    #                 sql_parts.append(f"{base} != :{param_key}")
+    #                 param_dict[param_key] = value
+    #             elif op == "in" and isinstance(value, list):
+    #                 sql_parts.append(f"{base} IN :{param_key}")
+    #                 param_dict[param_key] = value
+    #                 bind_params.append(bindparam(param_key, expanding=True))
+    #             elif op == "between" and isinstance(value, list) and len(value) == 2:
+    #                 sql_parts.append(f"{base} BETWEEN :{param_key}_start AND :{param_key}_end")
+    #                 param_dict[f"{param_key}_start"] = value[0]
+    #                 param_dict[f"{param_key}_end"] = value[1]
+
+    #         else:
+
+    #             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)
+
+    #     return where_clause, param_dict, bind_params
+
+    # except Exception as e:
+    #     logger.exception(e)
+    #     return None
+
     try:
 
         _data = deepcopy(data)
@@ -134,37 +206,22 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
         for field, value in _data.items():
 
             # 特殊处理日期字段
-            if field == "date" or field.startswith("date__"):
-                field = field.replace("date", "datetime::date", 1)
+            is_date_field = field == "date" or field.startswith("date__")
+            base_field = field.replace("date", "datetime::date", 1) if is_date_field else field
 
-            if "__" in field:
+            if "__" in base_field:
 
-                base, op = field.split("__", 1)
+                base, op = base_field.split("__", 1)
 
                 # 避免字段名冲突
-                param_key = f"{base}_{op}"
-
-                # 特殊处理日期字段
-                if param_key.startswith("datetime::date"):
-                    param_key = param_key.replace("datetime::date", "datetime_date", 1)
+                param_key = f"{base.replace('.', '_')}_{op}"
 
                 if op == "like":
                     sql_parts.append(f"{base} LIKE :{param_key}")
                     param_dict[param_key] = f"%{value}%"
-                elif op == "ge":
-                    sql_parts.append(f"{base} >= :{param_key}")
-                    param_dict[param_key] = value
-                elif op == "gt":
-                    sql_parts.append(f"{base} > :{param_key}")
-                    param_dict[param_key] = value
-                elif op == "le":
-                    sql_parts.append(f"{base} <= :{param_key}")
-                    param_dict[param_key] = value
-                elif op == "lt":
-                    sql_parts.append(f"{base} < :{param_key}")
-                    param_dict[param_key] = value
-                elif op == "ne":
-                    sql_parts.append(f"{base} != :{param_key}")
+                elif op in ("ge", "gt", "le", "lt", "ne"):
+                    operator = {"ge": ">=", "gt": ">", "le": "<=", "lt": "<", "ne": "!="}[op]
+                    sql_parts.append(f"{base} {operator} :{param_key}")
                     param_dict[param_key] = value
                 elif op == "in" and isinstance(value, list):
                     sql_parts.append(f"{base} IN :{param_key}")
@@ -174,21 +231,12 @@ def build_sqlalchemy_where_clause(data: dict) -> Optional[Tuple[str, Dict[str, A
                     sql_parts.append(f"{base} BETWEEN :{param_key}_start AND :{param_key}_end")
                     param_dict[f"{param_key}_start"] = value[0]
                     param_dict[f"{param_key}_end"] = value[1]
-
             else:
-
-                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_key = base_field.replace(".", "_")
+                sql_parts.append(f"{base_field} = :{param_key}")
                 param_dict[param_key] = value
 
         where_clause = " AND ".join(sql_parts)
-
         return where_clause, param_dict, bind_params
 
     except Exception as e:

{ezkit-1.12.39.dist-info → ezkit-1.12.41.dist-info}/METADATA

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

{ezkit-1.12.39.dist-info → ezkit-1.12.41.dist-info}/RECORD

@@ -1,9 +1,10 @@
 ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ezKit/_file.py,sha256=0qRZhwYuagTgTGrhm-tzAMvEQT4HTJA_xZKqF2bo0ho,1207
+ezKit/auth.py,sha256=HO19O4qOz68e0YwOP04habxMCAk42B3D7LW7yKgm9ZA,398
 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=z5NM8pusBCEPF8Gize2cvp-XWUimP_CIsrEhBeciTmQ,30240
+ezKit/database.py,sha256=GUU7g3XMT7IGQgyLSPhgES1gmkMM63ekvPHh17an2CM,32281
 ezKit/dockerhub.py,sha256=j-wQO-71BsOgExHZhYynuy2k_hCX3on-vg0TH7QCit4,1996
 ezKit/errors.py,sha256=92PggwPQfTS3Vg4og7GHYnO9CTSM7zmuh2w3kx_tSBE,1425
 ezKit/fastapix.py,sha256=-nz565ASKvp3nGs9J4wORTHxlhMozqCwv8zREWpmYtI,3382
@@ -17,8 +18,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.39.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezkit-1.12.39.dist-info/METADATA,sha256=KKF9rhoorhoEcup3b6vhxAvyE2SZGVnifoiwpGP-_fg,317
-ezkit-1.12.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ezkit-1.12.39.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezkit-1.12.39.dist-info/RECORD,,
+ezkit-1.12.41.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezkit-1.12.41.dist-info/METADATA,sha256=4d8g9pPedTnlzUjyW29TPj9wniRuqxuJeLPSYkeooe4,317
+ezkit-1.12.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ezkit-1.12.41.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezkit-1.12.41.dist-info/RECORD,,