cppackage 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

CPpackage/db/__init__.py

@@ -1,2 +1,2 @@
-from .sql_model import sel_data, update_data, updata, update_datas, del_data, deldata, deldata_time, update_test
+from .sql_model import sel_data, update_datas, del_data
 from .config import set_db_config, get_db_config

CPpackage/db/sql_model.py

@@ -32,7 +32,7 @@ def _get_connection(database=None, port=None):
     )
 
 
-# ===================== 基础操作 =====================
+# ===================== 查询操作 =====================
 
 def sel_data(sql, params=None, port=None, database=None):
 
@@ -45,9 +45,16 @@ def sel_data(sql, params=None, port=None, database=None):
     except pymysql.MySQLError as e:
         print("查询失败:", e)
         return None
+    
+# ===================== 增量更新 =====================
+def incremental_update(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, params=None, port=None, database=None):
 
     try:
@@ -94,12 +101,10 @@ def add_columns(table_name, database, columns):
             conn.commit()
 
  # 表结构校验
-def check_and_sync_columns(df, table_name, database, max_new=5):
+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))
-
+    db_cols= 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 "无")
@@ -114,13 +119,6 @@ def check_and_sync_columns(df, table_name, database, max_new=5):
 
         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
@@ -128,38 +126,40 @@ def check_and_sync_columns(df, table_name, database, max_new=5):
 
 # ===================== DataFrame 入库 =====================
 
-def update_datas(df, table_name, database):
+def update_datas(df,db_cols, 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()
+    for i in range(2):
+        try:
+            # 表结构校验,df为抓取数据表，db_cols为数据库现有字段
+            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} 条记录")
+            break
+        except Exception as e:
+            if conn:
+                conn.rollback()
+            print("入库失败:", e)
+            if '1054, "Unknown column' in str(e):
+                check_and_sync_columns(df,db_cols,table_name,database)
+        finally:
+            if conn:
+                conn.close()
 
 

{cppackage-0.2.1.dist-info → cppackage-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cppackage
-Version: 0.2.1
+Version: 0.2.3
 Summary: 超品集团自用的Python包
 Home-page: https://github.com/example/CPpackage
 Author: team-数智组
@@ -40,7 +40,7 @@ CPpackage是超品集团内部使用的Python包，核心功能集中在MySQL数
 ## 安装
 
 ```bash
-pip install CPpackage
+pip install cppackage
 ```
 
 ## 使用方法
@@ -48,13 +48,16 @@ pip install CPpackage
 ```python
 # 导入包
 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
+from CPpackage.db.sql_model import sel_data, del_data , incremental_update, 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)
 
-# 更新数据函数，在完成数据库信息配置后，df为pd.dataframe格式的数据
 # 更新过程会先经过check_and_sync_columns函数完成表格校验
+check_and_sync_columns(df, table_name, database, max_new=5)
+# 更新数据函数，在完成数据库信息配置后，df为pd.dataframe格式的数据
 update_datas(df, table_name, database)
 
 ```

cppackage-0.2.3.dist-info/RECORD

@@ -0,0 +1,12 @@
+CPpackage/__init__.py,sha256=KpVaXkIzkNDl-dfSX8Rr7z9XFlipxx1nZ_GzS4Qls4I,173
+CPpackage/core/__init__.py,sha256=92mF0310uQ5ujlgd-LCMs5kZVzfGRdcl67GHIRWhHcA,504
+CPpackage/db/__init__.py,sha256=WhrLqsjq97KKHF7YV-HcZf9pRtHuqKhRjXDNPCBVbjY,107
+CPpackage/db/config.py,sha256=wygya2246ph0LY90xikQBVoRxS8vlI-RpWWNGOiUZ5s,723
+CPpackage/db/sql_model.py,sha256=HZV8Zl7ywgBNc9l41rr9tBi7itczsWVrSA1cXw3eYBk,4872
+CPpackage/utils/__init__.py,sha256=sAespT0aoLr3O0WF27DwHLYF60VZgPA1tiT0JJ8s8zI,264
+cppackage-0.2.3.dist-info/licenses/LICENSE,sha256=6Pj597LnvlRtq3Vgjkfp6zgBeBh7wl8jKE-nCFg4vZI,1065
+cppackage-0.2.3.dist-info/METADATA,sha256=s3w4BGnzsiAbda4sy8c_fNcXaQqIqGJ-YKJDG6yR9bo,2516
+cppackage-0.2.3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+cppackage-0.2.3.dist-info/entry_points.txt,sha256=SAzF2klkNyeNCqXuiNkDirN999l7v8CGCrHR0StD_oo,50
+cppackage-0.2.3.dist-info/top_level.txt,sha256=FQrfWDbJistWQIrHW_Aoxoy_UWSzjOByWVcVS5ig9Tk,10
+cppackage-0.2.3.dist-info/RECORD,,

cppackage-0.2.1.dist-info/RECORD

@@ -1,12 +0,0 @@
-CPpackage/__init__.py,sha256=KpVaXkIzkNDl-dfSX8Rr7z9XFlipxx1nZ_GzS4Qls4I,173
-CPpackage/core/__init__.py,sha256=92mF0310uQ5ujlgd-LCMs5kZVzfGRdcl67GHIRWhHcA,504
-CPpackage/db/__init__.py,sha256=Uw09n27c0k2lM61oYw0GMpnbIafPKiY9EAMudxBn7IY,164
-CPpackage/db/config.py,sha256=wygya2246ph0LY90xikQBVoRxS8vlI-RpWWNGOiUZ5s,723
-CPpackage/db/sql_model.py,sha256=qj8NQctWkIJbdnLYDfg2mpOKl-STlz1lbaeiV9D-JY0,4433
-CPpackage/utils/__init__.py,sha256=sAespT0aoLr3O0WF27DwHLYF60VZgPA1tiT0JJ8s8zI,264
-cppackage-0.2.1.dist-info/licenses/LICENSE,sha256=6Pj597LnvlRtq3Vgjkfp6zgBeBh7wl8jKE-nCFg4vZI,1065
-cppackage-0.2.1.dist-info/METADATA,sha256=UBo6vBIsitJAUXFX4j3RSnF44QlnIof9LnZ0frzQ8eQ,2429
-cppackage-0.2.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-cppackage-0.2.1.dist-info/entry_points.txt,sha256=SAzF2klkNyeNCqXuiNkDirN999l7v8CGCrHR0StD_oo,50
-cppackage-0.2.1.dist-info/top_level.txt,sha256=FQrfWDbJistWQIrHW_Aoxoy_UWSzjOByWVcVS5ig9Tk,10
-cppackage-0.2.1.dist-info/RECORD,,