mdbq 1.0.9__tar.gz → 1.1.1__tar.gz

{mdbq-1.0.9 → mdbq-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 1.0.9
+Version: 1.1.1
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-1.0.9 → mdbq-1.1.1}/mdbq/aggregation/mysql_types.py

@@ -155,7 +155,7 @@ def mysql_all_dtypes(db_name=None, table_name=None, path=None):
     if not path:
         path = set_support.SetSupport(dirname='support').dirname
 
-    username, password, host, port = get_myconf.select_config_values(target_service='company', database='mysql')
+    username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
     config = {
         'host': host,
         'port': port,

{mdbq-1.0.9 → mdbq-1.1.1}/mdbq/aggregation/query_data.py

@@ -373,6 +373,7 @@ class GroupBy:
             print(f'<{table_name}>: Groupby 类尚未配置，数据为空')
             return pd.DataFrame({})
 
+    @try_except
     def performance(self, bb_tg=True):
          # print(self.data_tgyj)
         tg, syj, idbm, pic, cost = (

{mdbq-1.0.9 → mdbq-1.1.1}/mdbq/mysql/mysql.py

@@ -131,21 +131,24 @@ class MysqlUpload:
             print(f'{now}正在更新 mysql ({self.host}:{self.port}) {db_name}/{table_name}')
             datas = df.to_dict(orient='records')
             for data in datas:
-                cols = ', '.join(f"`{item}`" for item in data.keys())  # 列名转义
-                # data.update({item: f"{data[item]}" for item in data.keys()})  # 全部值转字符, 不是必须的
-                values = ', '.join([f"'{item}'" for item in data.values()])  # 值要加单引号 ''
-                condition = []
-                for k, v in data.items():
-                    condition += [f"`{k}` = '{v}'"]
-                condition = ' AND '.join(condition)  # 构建查询条件
-                # print(condition)
-
-                sql = f"SELECT {cols} FROM `{table_name}` WHERE {condition}"
-                cursor.execute(sql)
-                result = cursor.fetchall()  # 获取查询结果, 如果有结果返回 list，没有则返回空元组 tuple
-                if not result:  # 数据不存在则插入
-                    sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
+                try:
+                    cols = ', '.join(f"`{item}`" for item in data.keys())  # 列名转义
+                    # data.update({item: f"{data[item]}" for item in data.keys()})  # 全部值转字符, 不是必须的
+                    values = ', '.join([f"'{item}'" for item in data.values()])  # 值要加单引号 ''
+                    condition = []
+                    for k, v in data.items():
+                        condition += [f"`{k}` = '{v}'"]
+                    condition = ' AND '.join(condition)  # 构建查询条件
+                    # print(condition)
+
+                    sql = f"SELECT {cols} FROM `{table_name}` WHERE {condition}"
                     cursor.execute(sql)
+                    result = cursor.fetchall()  # 获取查询结果, 如果有结果返回 list，没有则返回空元组 tuple
+                    if not result:  # 数据不存在则插入
+                        sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values});"
+                        cursor.execute(sql)
+                except Exception as e:
+                    print(f'mysql -> df_to_mysql 报错: {e}')
         connection.commit()  # 提交事务
 
     def convert_dtypes(self, df, db_name, table_name):
@@ -180,6 +183,18 @@ class MysqlUpload:
 
     def convert_dtype_to_sql(self, df, col, dtype):
         """ 按照以下规则转换DataFrame列的数据类型为 MYSQL 专有的数据类型 """
+
+        def find_longest_decimal_value(number_list):
+            # 取列表中小数位数最长的值
+            longest_value = None
+            max_decimals = 0
+            for num in number_list:
+                decimal_places = len(str(num).split('.')[1])
+                if decimal_places > max_decimals:
+                    max_decimals = decimal_places
+                    longest_value = num
+            return longest_value
+
         # 最优先处理 ID 类型, 在 mysql 里面, 有些列数字过长不能存储为 int 类型
         if 'id' in col or 'ID' in col or 'Id' in col or '摘要' in col or '商家编码' in col or '单号' in col or '款号' in col:
             return 'mediumtext'
@@ -204,9 +219,9 @@ class MysqlUpload:
                 return 'mediumtext'
             return 'INT'
         elif dtype == 'float64':
-            # step = len(str(max(df[col].tolist())))  # 数字长度包含小数点
-            int_step = len(str(max(df[col].tolist())).split('.')[0])   # 整数位数长度
-            f_step = len(str(max(df[col].tolist())).split('.')[1])  # 小数位数长度
+            res = find_longest_decimal_value(df[col].tolist())  # 取小数位数最长的值
+            int_step = len(str(res).split('.')[0])   # 整数位数长度
+            f_step = len(str(res).split('.')[1])  # 小数位数长度
             if int_step >= 12:
                 return 'mediumtext'  # mysql 中不要使用 float 和 double 类型，会影响计算结果
             elif int_step >= 8 and f_step >= 0:
@@ -686,7 +701,7 @@ if __name__ == '__main__':
     username, password, host, port = get_myconf.select_config_values(target_service='company', database='mysql')
     print(username, password, host, port)
 
-    file = '/Users/xigua/Downloads/余额查询.csv'
+    file = '/Users/xigua/数据中心/原始文件2/京东报表/JD商品明细spu/2024-08/spu_2024-08-18_全部渠道_商品明细.csv'
     one_file_to_mysql(
         file=file,
         db_name='test',
@@ -695,5 +710,3 @@ if __name__ == '__main__':
         database='mysql'
     )
 
-
-

{mdbq-1.0.9 → mdbq-1.1.1}/mdbq.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 1.0.9
+Version: 1.1.1
 Home-page: https://pypi.org/project/mdbsql
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-1.0.9 → mdbq-1.1.1}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='1.0.9',
+      version='1.1.1',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',