cppackage 0.1.0__tar.gz → 0.2.1__tar.gz

{cppackage-0.1.0 → cppackage-0.2.1}/CPpackage/db/config.py

@@ -5,7 +5,7 @@ _db_config = {
     'user': os.getenv('CPPACKAGE_DB_USER'),
     'password': os.getenv('CPPACKAGE_DB_PASSWORD'),
     'database': os.getenv('CPPACKAGE_DB_NAME'),
-    'port': int(os.getenv('CPPACKAGE_DB_PORT', '3306')),
+    'port': int(os.getenv('CPPACKAGE_DB_PORT')),
 }
 
 def set_db_config(host=None, user=None, password=None, database=None, port=None):

cppackage-0.2.1/CPpackage/db/sql_model.py

@@ -0,0 +1,165 @@
+import pymysql
+import time
+from pymysql import Error
+
+# 条件导入：支持直接运行和包模式
+try:
+    from .config import get_db_config
+except (ImportError, ValueError):
+    # 直接运行时失败，尝试绝对路径
+    import sys
+    import os
+    sys.path.insert(0, os.path.dirname(__file__))
+    from config import get_db_config
+
+
+# ===================== 数据库连接 =====================
+
+def _get_connection(database=None, port=None):
+    cfg = get_db_config()
+
+    db = database if database else cfg.get('database')
+    prt = port if port else cfg.get('port', 3306)
+
+    return pymysql.connect(
+        host=cfg.get('host'),
+        user=cfg.get('user'),
+        password=cfg.get('password'),
+        database=db,
+        port=prt,
+        charset="utf8mb4",
+        autocommit=False
+    )
+
+
+# ===================== 基础操作 =====================
+
+def sel_data(sql, params=None, port=None, database=None):
+
+    try:
+        with _get_connection(database, port) as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(sql, params)
+                return cursor.fetchall()
+
+    except pymysql.MySQLError as e:
+        print("查询失败:", e)
+        return None
+
+
+
+def del_data(sql, params=None, port=None, database=None):
+
+    try:
+        with _get_connection(database, port) as conn:
+            with conn.cursor() as cursor:
+                cursor.execute(sql, params)
+                conn.commit()
+
+    except pymysql.MySQLError as e:
+        print("删除失败:", e)
+
+
+# ===================== 表结构管理 =====================
+
+def get_table_columns(table_name, database):
+
+    sql = """
+    SELECT COLUMN_NAME
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA=%s
+      AND TABLE_NAME=%s
+    ORDER BY ORDINAL_POSITION
+    """
+
+    with _get_connection(database) as conn:
+        with conn.cursor() as cursor:
+            cursor.execute(sql, (database, table_name))
+            return [row[0] for row in cursor.fetchall()]
+
+
+def add_columns(table_name, database, columns):
+
+    with _get_connection(database) as conn:
+        with conn.cursor() as cursor:
+
+            for col in columns:
+                sql = f"""
+                ALTER TABLE `{table_name}`
+                ADD COLUMN `{col}` TEXT 
+                """
+                cursor.execute(sql)
+                print(f"新增字段: {col}")
+
+            conn.commit()
+
+ # 表结构校验
+def check_and_sync_columns(df, table_name, database, max_new=5):
+
+    df_cols = set(df.columns)
+
+    db_cols = set(get_table_columns(table_name, database))
+
+    new_cols = df_cols - db_cols
+    missing_cols = db_cols - df_cols
+    print("新增字段:", new_cols if new_cols else "无")
+    print("缺失字段(忽略):", missing_cols if missing_cols else "无")
+
+    # 超限
+    if len(new_cols) > max_new:
+        raise Exception(f"新增字段超过{max_new}个: {new_cols}")
+
+    # 自动补
+    if 0 < len(new_cols) <= max_new:
+
+        print("开始同步字段...")
+        add_columns(table_name, database, new_cols)
+
+        # 二次校验
+        new_db_cols = set(get_table_columns(table_name, database))
+
+        if not df_cols.issubset(new_db_cols):
+            raise Exception("字段同步失败")
+
+        print("字段同步成功")
+
+    return True
+
+
+# ===================== DataFrame 入库 =====================
+
+def update_datas(df, table_name, database):
+
+    conn = None
+
+    try:
+        # 表结构校验
+        check_and_sync_columns(df, table_name, database)
+        conn = _get_connection(database)
+        cursor = conn.cursor()
+        cols = list(df.columns)
+        col_str = ",".join([f"`{c}`" for c in cols])
+        value_tpl = "(" + ",".join(["%s"] * len(cols)) + ")"
+        values_str = ",".join([value_tpl] * len(df))
+        update_clause = ",".join(
+            [f"`{c}`=VALUES(`{c}`)" for c in cols if c != "id"]
+        )
+        sql = f"""
+        INSERT INTO `{table_name}` ({col_str})
+        VALUES {values_str}
+        ON DUPLICATE KEY UPDATE {update_clause}
+        """
+        data = [tuple(row) for row in df.values]
+        flat_data = [v for row in data for v in row]
+        cursor.execute(sql, flat_data)
+        conn.commit()
+        print(f"成功插入/更新 {cursor.rowcount} 条记录")
+    except Exception as e:
+        if conn:
+            conn.rollback()
+        print("入库失败:", e)
+    finally:
+        if conn:
+            conn.close()
+
+

{cppackage-0.1.0 → cppackage-0.2.1}/CPpackage.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cppackage
-Version: 0.1.0
+Version: 0.2.1
 Summary: 超品集团自用的Python包
 Home-page: https://github.com/example/CPpackage
 Author: team-数智组
@@ -20,6 +20,16 @@ License-File: LICENSE
 Requires-Dist: pymysql
 Requires-Dist: pandas
 Requires-Dist: numpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # CPpackage
 
@@ -37,15 +47,16 @@ pip install CPpackage
 
 ```python
 # 导入包
-from CPpackage.db import set_db_config
-from CPpackage.db.sql_model import sel_data, update_data, updata, update_datas, del_data, deldata, deldata_time, update_test
+from CPpackage.db.config import set_db_config
+from CPpackage.db.sql_model import sel_data, del_data , get_table_columns,add_columns,check_and_sync_columns,update_datas
 
 # 配置数据库连接（也可通过环境变量CPPACKAGE_DB_*配置）
 set_db_config(host='your_host', user='your_user', password='your_password', database='your_database', port=3306)
 
-# 查询示例
-rows = sel_data('SELECT 1')
-print(rows)
+# 更新数据函数，在完成数据库信息配置后，df为pd.dataframe格式的数据
+# 更新过程会先经过check_and_sync_columns函数完成表格校验
+update_datas(df, table_name, database)
+
 ```
 
 ## 项目结构

{cppackage-0.1.0 → cppackage-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: cppackage
-Version: 0.1.0
+Version: 0.2.1
 Summary: 超品集团自用的Python包
 Home-page: https://github.com/example/CPpackage
 Author: team-数智组
@@ -20,6 +20,16 @@ License-File: LICENSE
 Requires-Dist: pymysql
 Requires-Dist: pandas
 Requires-Dist: numpy
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # CPpackage
 
@@ -37,15 +47,16 @@ pip install CPpackage
 
 ```python
 # 导入包
-from CPpackage.db import set_db_config
-from CPpackage.db.sql_model import sel_data, update_data, updata, update_datas, del_data, deldata, deldata_time, update_test
+from CPpackage.db.config import set_db_config
+from CPpackage.db.sql_model import sel_data, del_data , get_table_columns,add_columns,check_and_sync_columns,update_datas
 
 # 配置数据库连接（也可通过环境变量CPPACKAGE_DB_*配置）
 set_db_config(host='your_host', user='your_user', password='your_password', database='your_database', port=3306)
 
-# 查询示例
-rows = sel_data('SELECT 1')
-print(rows)
+# 更新数据函数，在完成数据库信息配置后，df为pd.dataframe格式的数据
+# 更新过程会先经过check_and_sync_columns函数完成表格校验
+update_datas(df, table_name, database)
+
 ```
 
 ## 项目结构

{cppackage-0.1.0 → cppackage-0.2.1}/readme.md

@@ -14,15 +14,16 @@ pip install CPpackage
 
 ```python
 # 导入包
-from CPpackage.db import set_db_config
-from CPpackage.db.sql_model import sel_data, update_data, updata, update_datas, del_data, deldata, deldata_time, update_test
+from CPpackage.db.config import set_db_config
+from CPpackage.db.sql_model import sel_data, del_data , get_table_columns,add_columns,check_and_sync_columns,update_datas
 
 # 配置数据库连接（也可通过环境变量CPPACKAGE_DB_*配置）
 set_db_config(host='your_host', user='your_user', password='your_password', database='your_database', port=3306)
 
-# 查询示例
-rows = sel_data('SELECT 1')
-print(rows)
+# 更新数据函数，在完成数据库信息配置后，df为pd.dataframe格式的数据
+# 更新过程会先经过check_and_sync_columns函数完成表格校验
+update_datas(df, table_name, database)
+
 ```
 
 ## 项目结构

{cppackage-0.1.0 → cppackage-0.2.1}/setup.py

@@ -10,7 +10,7 @@ with open('readme.md', 'r', encoding='utf-8') as f:
 # 包的基本信息
 setup(
     name='cppackage',
-    version='0.1.0',
+    version='0.2.1',
     description='超品集团自用的Python包',
     long_description=long_description,
     long_description_content_type='text/markdown',

cppackage-0.1.0/CPpackage/db/sql_model.py

@@ -1,105 +0,0 @@
-import pymysql
-import time
-from pymysql import Error
-from .config import get_db_config
-
-def _get_connection(database=None, port=None):
-    cfg = get_db_config()
-    db = database if database is not None else cfg.get('database')
-    prt = port if port is not None else cfg.get('port', 3306)
-    return pymysql.connect(
-        host=cfg.get('host'),
-        user=cfg.get('user'),
-        password=cfg.get('password'),
-        database=db,
-        port=prt,
-    )
-
-def sel_data(sql, port=None, database=None):
-    try:
-        conn = _get_connection(database=database, port=port)
-        cursor = conn.cursor()
-        cursor.execute(sql)
-        result = cursor.fetchall()
-        cursor.close()
-        conn.close()
-        return result
-    except pymysql.MySQLError as e:
-        print(f"An error occurred: {e}")
-
-def update_data(sql, values, port=None, database=None):
-    conn = _get_connection(database=database, port=port)
-    cursor = conn.cursor()
-    cursor.execute(sql, values)
-    conn.commit()
-    cursor.close()
-    conn.close()
-
-def updata(data, databases, table):
-    s = ""
-    st1 = ""
-    for i in data.columns.values:
-        s = s + "`" + i + "`,"
-        st1 = st1 + "%s,"
-    s = s[:-1]
-    st1 = st1[:-1]
-    all_data = []
-    for _, k in data.iterrows():
-        all_data.append(tuple(k.to_list()))
-    sql = 'INSERT INTO %s (%s) VALUES (%s)' % (table, s, st1)
-    update_datas(sql, tuple(all_data), database=databases)
-    time.sleep(2)
-
-def deldata(all_del_list, id_name, table_name, database):
-    str11 = ""
-    for te in all_del_list:
-        if "str" in str(type(te)):
-            str11 = str11 + "'" + str(te) + "',"
-        else:
-            str11 = str11 + str(te) + ","
-    str11 = str11[:-1]
-    delsql = 'DELETE from `%s` where %s in (%s)' % (table_name, id_name, str11)
-    del_data(delsql, database=database)
-
-def deldata_time(id_name, table_name, id, database, time_name, start_time, end_time):
-    delsql = 'DELETE from `%s` where %s = %s and `%s`>= "%s" and  `%s`<= "%s"' % (
-        table_name, id_name, id, time_name, start_time, time_name, end_time
-    )
-    del_data(delsql, database=database)
-
-def update_datas(sql, values, port=None, database=None):
-    with _get_connection(database=database, port=port) as conn:
-        with conn.cursor() as cursor:
-            cursor.executemany(sql, values)
-            conn.commit()
-
-def del_data(sql, port=None, database=None):
-    try:
-        conn = _get_connection(database=database, port=port)
-        cursor = conn.cursor()
-        cursor.execute(sql)
-        conn.commit()
-        cursor.close()
-        conn.close()
-    except pymysql.MySQLError as e:
-        print(f"An error occurred: {e}")
-
-def update_test(df, table_name, databases):
-    try:
-        conn = _get_connection(database=databases)
-        cursor = conn.cursor()
-        columns = ', '.join(df.columns)
-        values_template = ', '.join([f'({", ".join(["%s"] * len(df.columns))})'] * len(df))
-        update_clause = ', '.join([f'{col} = VALUES({col})' for col in df.columns if col != 'id'])
-        sql = f"INSERT INTO {table_name} ({columns}) VALUES {values_template} " \
-                  f"ON DUPLICATE KEY UPDATE {update_clause}"
-        values = [tuple(row) for row in df.values]
-        flat_values = [item for sublist in values for item in sublist]
-        cursor.execute(sql, flat_values)
-        conn.commit()
-        print(f"成功插入/更新 {cursor.rowcount} 条记录")
-    except Error as e:
-        print(f"数据库错误: {e}")
-    finally:
-        if conn:
-            conn.close()