ezKit 1.10.4__tar.gz → 1.10.5__tar.gz

{ezkit-1.10.4/ezKit.egg-info → ezkit-1.10.5}/PKG-INFO

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

{ezkit-1.10.4 → ezkit-1.10.5}/ezKit/database.py

@@ -6,8 +6,10 @@
 # PostgreSQL 14 Data Types
 #     https://www.postgresql.org/docs/14/datatype.html
 import csv
+import json
 from typing import Any
 
+import pandas as pd
 from loguru import logger
 from sqlalchemy import CursorResult, Index, create_engine, text
 from sqlalchemy.orm import DeclarativeBase
@@ -30,10 +32,14 @@ class Database():
         else:
             pass
 
+    # ----------------------------------------------------------------------------------------------
+
     def initializer(self):
         """ensure the parent proc's database connections are not touched in the new connection pool"""
         self.engine.dispose(close=False)
 
+    # ----------------------------------------------------------------------------------------------
+
     def connect_test(self) -> bool:
         info = "Database connect test"
         try:
@@ -46,6 +52,8 @@ class Database():
             logger.exception(e)
             return False
 
+    # ----------------------------------------------------------------------------------------------
+
     def metadata_init(self, base: DeclarativeBase, **kwargs) -> bool:
         # https://stackoverflow.com/questions/19175311/how-to-create-only-one-table-with-sqlalchemy
         info = "Database init table"
@@ -60,6 +68,8 @@ class Database():
             logger.exception(e)
             return False
 
+    # ----------------------------------------------------------------------------------------------
+
     def create_index(self, index_name, table_field) -> bool:
         # 创建索引
         #   https://stackoverflow.com/a/41254430
@@ -82,6 +92,8 @@ class Database():
             logger.error(e)
             return False
 
+    # ----------------------------------------------------------------------------------------------
+
     # 私有函数, 保存 execute 的结果到 CSV 文件
     def _result_save(self, file, data) -> bool:
         try:
@@ -93,6 +105,8 @@ class Database():
             logger.exception(e)
             return False
 
+    # ----------------------------------------------------------------------------------------------
+
     def execute(
         self,
         sql: str | None = None,
@@ -204,3 +218,46 @@ class Database():
             logger.error(f'{info} [failure]')
             logger.exception(e)
             return False
+
+    # ----------------------------------------------------------------------------------------------
+
+    def read_data_with_pandas(self, result_type: str = "df", **kwargs) -> pd.DataFrame | dict | list | None:
+        """读取表中所有数据"""
+
+        # 使用 pd.read_sql_table 的参数
+        # read_data_with_pandas(result_type="df", table_name="ashare")
+
+        info = f"读取 {kwargs.get('table_name', None)} 表中所有数据"
+
+        try:
+
+            logger.info(f"{info} ......")
+
+            # 从 kwargs 中删除 con 键
+            kwargs.pop('con', None)
+
+            # 读取数据
+            data: pd.DataFrame = pd.read_sql_table(con=self.engine, **kwargs)
+
+            if data.empty:
+                logger.error(f"{info} [失败]")
+                return None
+
+            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()
+
+            if utils.isTrue(result_type, str) and result_type == "list":
+                # https://stackoverflow.com/a/26716774
+                return data.to_dict('list')
+
+            return data
+
+        except Exception as e:
+            logger.error(f"{info} [失败]")
+            logger.exception(e)
+            return None

{ezkit-1.10.4 → ezkit-1.10.5/ezKit.egg-info}/PKG-INFO

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

{ezkit-1.10.4 → ezkit-1.10.5}/setup.py

@@ -3,7 +3,7 @@ from setuptools import find_packages, setup
 
 setup(
     name='ezKit',
-    version='1.10.4',
+    version='1.10.5',
     author='septvean',
     author_email='septvean@gmail.com',
     description='Easy Kit',