ezKit 1.10.5__py3-none-any.whl → 1.10.6__py3-none-any.whl

ezKit/database.py

@@ -100,134 +100,227 @@ class Database():
             outcsv = csv.writer(file)
             outcsv.writerow(data.keys())
             outcsv.writerows(data)
+            logger.success("save to csv success")
             return True
         except Exception as e:
+            logger.error("save to csv failed")
             logger.exception(e)
             return False
 
     # ----------------------------------------------------------------------------------------------
 
-    def execute(
-        self,
-        sql: str | None = None,
-        sql_file: str | None = None,
-        sql_file_kwargs: dict | None = None,
-        csv_file: str | None = None,
-        csv_file_kwargs: dict | None = None
-    ) -> CursorResult[Any] | bool:
-        """"运行"""
+    # def execute(
+    #     self,
+    #     sql: str | None = None,
+    #     sql_file: str | None = None,
+    #     sql_file_kwargs: dict | None = None,
+    #     csv_file: str | None = None,
+    #     csv_file_kwargs: dict | None = None
+    # ) -> CursorResult[Any] | bool:
+    #     """"运行"""
 
-        # ------------------------------------------------------------
+    #     # ------------------------------------------------------------
 
-        # 提取 SQL
-        # 如果 sql 和 sql_file 同时存在, 优先执行 sql
+    #     # 提取 SQL
+    #     # 如果 sql 和 sql_file 同时存在, 优先执行 sql
 
-        sql_object = None
+    #     sql_object = None
 
-        info: str = f"""Extract SQL: {sql}"""
+    #     info: str = f"""Extract SQL: {sql}"""
 
-        try:
+    #     try:
 
-            logger.info(f"{info} ......")
+    #         logger.info(f"{info} ......")
 
-            if utils.isTrue(sql, str):
+    #         if utils.isTrue(sql, str):
 
-                sql_object = sql
+    #             sql_object = sql
 
-            elif sql_file is not None and utils.isTrue(sql_file, str):
+    #         elif sql_file is not None and utils.isTrue(sql_file, str):
 
-                # 判断文件是否存在
-                if isinstance(sql_file, str) and utils.check_file_type(sql_file, "file") is False:
+    #             # 判断文件是否存在
+    #             if isinstance(sql_file, str) and utils.check_file_type(sql_file, "file") is False:
 
-                    logger.error(f"No such file: {sql_file}")
-                    return False
+    #                 logger.error(f"No such file: {sql_file}")
+    #                 return False
 
-                if isinstance(sql_file, str) and utils.isTrue(sql_file, str):
+    #             if isinstance(sql_file, str) and utils.isTrue(sql_file, str):
 
-                    # 读取文件内容
-                    if sql_file_kwargs is not None and utils.isTrue(sql_file_kwargs, dict):
-                        with open(sql_file, "r", encoding="utf-8", **sql_file_kwargs) as _file:
-                            sql_object = _file.read()
-                    else:
-                        with open(sql_file, "r", encoding="utf-8") as _file:
-                            sql_object = _file.read()
+    #                 # 读取文件内容
+    #                 if sql_file_kwargs is not None and utils.isTrue(sql_file_kwargs, dict):
+    #                     with open(sql_file, "r", encoding="utf-8", **sql_file_kwargs) as _file:
+    #                         sql_object = _file.read()
+    #                 else:
+    #                     with open(sql_file, "r", encoding="utf-8") as _file:
+    #                         sql_object = _file.read()
 
-            else:
+    #         else:
 
-                logger.error("SQL or SQL file error")
-                logger.error(f"{info} [failure]")
-                return False
+    #             logger.error("SQL or SQL file error")
+    #             logger.error(f"{info} [failure]")
+    #             return False
 
-            logger.success(f'{info} [success]')
+    #         logger.success(f'{info} [success]')
 
-        except Exception as e:
+    #     except Exception as e:
 
-            logger.error(f"{info} [failure]")
-            logger.exception(e)
-            return False
+    #         logger.error(f"{info} [failure]")
+    #         logger.exception(e)
+    #         return False
 
-        # ------------------------------------------------------------
+    #     # ------------------------------------------------------------
 
-        # 执行 SQL
+    #     # 执行 SQL
 
-        info = f"""Execute SQL: {sql_object}"""
+    #     info = f"""Execute SQL: {sql_object}"""
 
-        try:
+    #     try:
 
-            logger.info(f"{info} ......")
+    #         logger.info(f"{info} ......")
 
-            with self.engine.connect() as connect:
+    #         with self.engine.connect() as connect:
 
-                # 执行SQL
-                if sql_object is None:
-                    return False
+    #             # 执行SQL
+    #             if sql_object is None:
+    #                 return False
 
-                result = connect.execute(text(sql_object))
+    #             result = connect.execute(text(sql_object))
 
-                connect.commit()
+    #             connect.commit()
 
-                if csv_file is None:
-                    # 如果 csv_file 没有定义, 则直接返回结果
-                    logger.success(f'{info} [success]')
-                    return result
+    #             if csv_file is None:
+    #                 # 如果 csv_file 没有定义, 则直接返回结果
+    #                 logger.success(f'{info} [success]')
+    #                 return result
 
-                # 如果 csv_file 有定义, 则保存结果到 csv_file
-                info_of_save = f"Save result to file: {csv_file}"
-                logger.info(f"{info_of_save} .......")
+    #             # 如果 csv_file 有定义, 则保存结果到 csv_file
+    #             info_of_save = f"Save result to file: {csv_file}"
+    #             logger.info(f"{info_of_save} .......")
 
-                # 保存结果
-                if isinstance(csv_file_kwargs, dict) and utils.isTrue(csv_file_kwargs, dict):
-                    with open(csv_file, "w", encoding="utf-8", **csv_file_kwargs) as _file:
-                        result_of_save = self._result_save(_file, result)
-                else:
-                    with open(csv_file, "w", encoding="utf-8") as _file:
-                        result_of_save = self._result_save(_file, result)
+    #             # 保存结果
+    #             if isinstance(csv_file_kwargs, dict) and utils.isTrue(csv_file_kwargs, dict):
+    #                 with open(csv_file, "w", encoding="utf-8", **csv_file_kwargs) as _file:
+    #                     result_of_save = self._result_save(_file, result)
+    #             else:
+    #                 with open(csv_file, "w", encoding="utf-8") as _file:
+    #                     result_of_save = self._result_save(_file, result)
 
-                # 检查保存结果
-                if result_of_save is True:
-                    logger.success(f'{info_of_save} [success]')
-                    logger.success(f'{info} [success]')
-                    return True
+    #             # 检查保存结果
+    #             if result_of_save is True:
+    #                 logger.success(f'{info_of_save} [success]')
+    #                 logger.success(f'{info} [success]')
+    #                 return True
 
-                logger.error(f"{info_of_save} [failure]")
-                logger.error(f"{info} [failure]")
-                return False
+    #             logger.error(f"{info_of_save} [failure]")
+    #             logger.error(f"{info} [failure]")
+    #             return False
 
-        except Exception as e:
+    #     except Exception as e:
 
-            logger.error(f'{info} [failure]')
+    #         logger.error(f'{info} [failure]')
+    #         logger.exception(e)
+    #         return False
+
+    # ----------------------------------------------------------------------------------------------
+
+    def connect_execute(
+        self,
+        sql: str | None = None,
+        read_sql_file: dict | None = None,
+        save_to_csv: dict | None = None
+    ) -> CursorResult[Any] | bool | None:
+
+        info: str = 'Database connect execute'
+
+        logger.info(f"{info} ......")
+
+        sql_statement: str = ""
+
+        # ------------------------------------------------------------------------------------------
+
+        try:
+            # SQL文件优先
+            if isinstance(read_sql_file, dict) and utils.isTrue(read_sql_file, dict):
+                read_sql_file.pop("encoding")
+                read_sql_file_kwargs: dict = {
+                    "mode": "r",
+                    "encoding": "utf-8",
+                    **read_sql_file
+                }
+                with open(encoding="utf-8", **read_sql_file_kwargs) as _file:
+                    sql_statement = _file.read()
+            else:
+                if not (isinstance(sql, str) and utils.check_arguments([(sql, str, "sql")])):
+                    return None
+                sql_statement = sql
+        except Exception as e:
             logger.exception(e)
-            return False
+            return None
+
+        # ------------------------------------------------------------------------------------------
+
+        if not self.connect_test():
+            return None
+
+        # ------------------------------------------------------------------------------------------
+
+        # 创建一个连接
+        with self.engine.connect() as connection:
+
+            # 开始一个事务
+            with connection.begin():  # 事务会自动提交或回滚
+
+                try:
+
+                    # 执行 SQL 查询
+                    result = connection.execute(text(sql_statement))
+
+                    # 执行成功
+                    logger.success(f"{info} [success]")
+
+                    # 返回查询结果
+                    if isinstance(save_to_csv, dict) and utils.isTrue(save_to_csv, dict):
+                        save_to_csv_kwargs: dict = {
+                            "mode": "w",
+                            "encoding": "utf-8",
+                            **save_to_csv
+                        }
+                        with open(encoding="utf-8", **save_to_csv_kwargs) as _file:
+                            return self._result_save(_file, result)
+
+                    return result
+
+                except Exception as e:
+                    # 发生异常时回滚事务
+                    logger.info(f"{info} [failed]")
+                    logger.exception(e)
+                    return None
 
     # ----------------------------------------------------------------------------------------------
 
-    def read_data_with_pandas(self, result_type: str = "df", **kwargs) -> pd.DataFrame | dict | list | None:
-        """读取表中所有数据"""
+    def read_with_pandas(
+        self,
+        method: str = "read_sql",
+        result_type: str = "df",
+        **kwargs
+    ) -> pd.DataFrame | list | dict:
+        """读取数据"""
+
+        # 使用SQL查询数据: 使用 pd.read_sql 的参数
+        # read_data_with_pandas(by="sql", result_type="df", sql="SELECT * FROM table ORDER BY date DESC LIMIT 1")
+
+        # 读取表中的数据: 使用 pd.read_sql_table 的参数
+        # read_data_with_pandas(by="table", result_type="df", table_name="ashare")
+
+        data: pd.DataFrame = pd.DataFrame()
 
-        # 使用 pd.read_sql_table 的参数
-        # read_data_with_pandas(result_type="df", table_name="ashare")
+        if not utils.check_arguments([(method, str, "method")]):
+            return data
+
+        if not utils.check_arguments([(result_type, str, "result_type")]):
+            return data
 
-        info = f"读取 {kwargs.get('table_name', None)} 表中所有数据"
+        info: str = "read data"
 
         try:
 
@@ -236,28 +329,35 @@ class Database():
             # 从 kwargs 中删除 con 键
             kwargs.pop('con', None)
 
-            # 读取数据
-            data: pd.DataFrame = pd.read_sql_table(con=self.engine, **kwargs)
+            match method:
+                case "read_sql":
+                    data = pd.read_sql(con=self.engine, **kwargs)
+                case "read_sql_query":
+                    data = pd.read_sql_query(con=self.engine, **kwargs)
+                case "read_sql_table":
+                    data = pd.read_sql_table(con=self.engine, **kwargs)
+                case _:
+                    logger.error(f"{info} [incorrect method: {method}]")
+                    return data
 
             if data.empty:
-                logger.error(f"{info} [失败]")
-                return None
+                logger.error(f"{info} [failed]")
+                return data
 
-            logger.success(f"{info} [成功]")
-
-            if utils.isTrue(result_type, str) and result_type == "json":
-                return json.loads(data.to_json(orient='records'))
-
-            if utils.isTrue(result_type, str) and result_type == "dict":
-                return data.to_dict()
+            logger.success(f"{info} [success]")
 
-            if utils.isTrue(result_type, str) and result_type == "list":
-                # https://stackoverflow.com/a/26716774
-                return data.to_dict('list')
-
-            return data
+            match result_type:
+                case "json":
+                    return json.loads(data.to_json(orient='records'))
+                case "dict":
+                    return data.to_dict()
+                case "list":
+                    # https://stackoverflow.com/a/26716774
+                    return data.to_dict('list')
+                case _:
+                    return data
 
         except Exception as e:
-            logger.error(f"{info} [失败]")
+            logger.error(f"{info} [failed]")
             logger.exception(e)
-            return None
+            return data

{ezKit-1.10.5.dist-info → ezKit-1.10.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ezKit
-Version: 1.10.5
+Version: 1.10.6
 Summary: Easy Kit
 Author: septvean
 Author-email: septvean@gmail.com

{ezKit-1.10.5.dist-info → ezKit-1.10.6.dist-info}/RECORD

@@ -2,7 +2,7 @@ ezKit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ezKit/bottle.py,sha256=usKK1wVaZw4_D-4VwMYmOIc8jtz4TrpM30nck59HMFw,180178
 ezKit/bottle_extensions.py,sha256=3reEQVZuHklXTl6r7F8kiBFFPb0RaAGc3mYJJnrMDjQ,1129
 ezKit/cipher.py,sha256=0T_StbjiNI4zgrjVgcfU-ffKgu1waBA9UDudAnqFcNM,2896
-ezKit/database.py,sha256=b_4gR_bvyC3IhP6TbmeKdVrif1DNG_NqO3YIyy-XqQE,8891
+ezKit/database.py,sha256=Hc1XWWnBwrnnaV8vOH9DAvZXz1DaEVEXSwKfWakX89I,12584
 ezKit/http.py,sha256=i3Kn5AMAMicDMcDjxKKZU7zqEKTU88Ec9_LwCuBJy-0,1801
 ezKit/mongo.py,sha256=dOm_1wXEPp_e8Ml5Qq78M7FDNrQUAZaThzVIiiLJJwk,2393
 ezKit/qywx.py,sha256=X_H4fzP-iEqeDEbumr7D1bXi6dxczaxfO8iyutzy02s,7171
@@ -11,8 +11,8 @@ ezKit/sendemail.py,sha256=tRXCsJm_RfTJ9xEWe_lTQ5kOs2JxHGPXvq0oWA7prq0,7263
 ezKit/token.py,sha256=HKREyZj_T2S8-aFoFIrBXTaCKExQq4zE66OHXhGHqQg,1750
 ezKit/utils.py,sha256=ILLaptYUSalERbCOhmoq4w0ZNZgj9yurpHEZwjRMZ8w,42387
 ezKit/xftp.py,sha256=XyIdr_2rxRVLqPofG6fIYWhAMVsFwTyp46dg5P9FLW4,7774
-ezKit-1.10.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-ezKit-1.10.5.dist-info/METADATA,sha256=onqUqJ4_5WVpBoLpSOis-Z6uYbmM3GCMPPrAfTvi_yw,191
-ezKit-1.10.5.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ezKit-1.10.5.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
-ezKit-1.10.5.dist-info/RECORD,,
+ezKit-1.10.6.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+ezKit-1.10.6.dist-info/METADATA,sha256=M7MZnhU7VDU0Zx7TG8Lrn_t_IS0E46zcyzVUS3EDRuc,191
+ezKit-1.10.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ezKit-1.10.6.dist-info/top_level.txt,sha256=aYLB_1WODsqNTsTFWcKP-BN0KCTKcV-HZJ4zlHkCFw8,6
+ezKit-1.10.6.dist-info/RECORD,,