mdbq 3.2.18__py3-none-any.whl → 3.3.0__py3-none-any.whl

mdbq/mysql/mysql.py

@@ -180,7 +180,7 @@ class MysqlUpload:
         __res_dict.update({'数据主体': 'longblob'})
         return __res_dict, new_dict_data
 
-    # @try_except
+    @try_except
     def doc_to_sql(self, db_name, table_name, dict_data, set_typ={}, remove_by_key=None, allow_not_null=False, filename=None, reset_id=False):
         """
         db_name:
@@ -316,12 +316,12 @@ class MysqlUpload:
                     else:
                         print(f'{table_name} 存在复合主键: 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                 except Exception as e:
-                    print(f'333 `{table_name}` {e}')
+                    print(f'333 {table_name} {e}')
                     connection.rollback()
             connection.commit()
 
 
-    # @try_except
+    @try_except
     def dict_to_mysql(self, db_name, table_name, dict_data, icm_update=None, main_key=None, unique_main_key=None, index_length=100, set_typ=None, allow_not_null=False, cut_data=None):
         """
         插入字典数据
@@ -656,7 +656,7 @@ class MysqlUpload:
                 __res_dict.update({k: 'varchar(255)'})
         return __res_dict, df
 
-    # @try_except
+    @try_except
     def df_to_mysql(self, df, db_name, table_name, set_typ=None, icm_update=[], move_insert=False, df_sql=False, drop_duplicates=False,
                     filename=None, count=None, reset_id=False, allow_not_null=False, cut_data=None):
         """
@@ -684,10 +684,10 @@ class MysqlUpload:
         self.filename = filename
         if isinstance(df, pd.DataFrame):
             if len(df) == 0:
-                print(f'{db_name}: `{table_name}` 传入的 df 数据长度为0, {self.filename}')
+                print(f'{db_name}: {table_name} 传入的 df 数据长度为0, {self.filename}')
                 return
         else:
-            print(f'{db_name}: `{table_name}` 传入的 df 不是有效的 dataframe 结构, {self.filename}')
+            print(f'{db_name}: {table_name} 传入的 df 不是有效的 dataframe 结构, {self.filename}')
             return
         if not db_name or db_name == 'None':
             print(f'{db_name} 不能为 None')
@@ -813,7 +813,7 @@ class MysqlUpload:
                         else:
                             print(f'{table_name} 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                     except Exception as e:
-                        print(f'333 `{table_name}` {e}')
+                        print(f'333 {table_name} {e}')
                         connection.rollback()
                 connection.commit()  # 提交事务
                 connection.close()
@@ -869,7 +869,7 @@ class MysqlUpload:
                     else:
                         print(f'{table_name} 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                 except Exception as e:
-                    print(f'333 `{table_name}` {e}')
+                    print(f'333 {table_name} {e}')
                     connection.rollback()
                 connection.close()
                 return
@@ -992,7 +992,7 @@ class MysqlUpload:
                     else:
                         print(f'{table_name} 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                 except Exception as e:
-                    print(f'333 `{table_name}` {e}')
+                    print(f'333 {table_name} {e}')
                     connection.rollback()
         connection.commit()  # 提交事务
         connection.close()
@@ -1077,19 +1077,19 @@ class MysqlUpload:
                 columns = [desc[0] for desc in cursor.description]
                 df = pd.DataFrame(rows, columns=columns)  # 转为 df
         except Exception as e:
-            print(f'{e} {db_name} -> `{table_name}` 表不存在')
+            print(f'{e} {db_name} -> {table_name} 表不存在')
             return df
         finally:
             connection.close()
 
         if len(df) == 0:
-            print(f'database: {db_name}, table: `{table_name}` 查询的数据为空')
+            print(f'database: {db_name}, table: {table_name} 查询的数据为空')
         else:
             now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
             cost_time = int(time.time() - before_time)
             if cost_time < 1:
                 cost_time = round(time.time() - before_time, 2)
-            print(f'{now} mysql ({self.host}) 表: `{table_name}` 获取数据长度: {len(df)}, 用时: {cost_time} 秒')
+            print(f'{now} mysql ({self.host}) 表: {table_name} 获取数据长度: {len(df)}, 用时: {cost_time} 秒')
         return df
 
     def upload_pandas(self, update_path, db_name, days=None):
@@ -1302,7 +1302,7 @@ class OptimizeDatas:
                         else:
                             print(f'{table_name} 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                     except Exception as e:
-                        print(f'333 `{table_name}` {e}')
+                        print(f'333 {table_name} {e}')
                         self.connection.rollback()
                 self.connection.close()
         now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -1318,16 +1318,16 @@ class OptimizeDatas:
             for e_key in except_key:
                 if e_key in data.keys():  # 在检查重复数据时，不包含 更新时间 字段
                     del data[e_key]
-            # try:
-            delete_id = data['id']
-            del data['id']
-            data = re.sub(r'\.0+\', ', '\', ', str(data))  # 统一移除小数点后面的 0
-            if data in all_datas:  # 数据出现重复时
-                duplicate_id.append(delete_id)  # 添加 id 到 duplicate_id
-                continue
-            all_datas.append(data)  # 数据没有重复
-            # except Exception as e:
-            #     print(f'{table_name} 函数: mysql - > OptimizeDatas -> delete_duplicate -> {e}')
+            try:
+                delete_id = data['id']
+                del data['id']
+                data = re.sub(r'\.0+\', ', '\', ', str(data))  # 统一移除小数点后面的 0
+                if data in all_datas:  # 数据出现重复时
+                    duplicate_id.append(delete_id)  # 添加 id 到 duplicate_id
+                    continue
+                all_datas.append(data)  # 数据没有重复
+            except Exception as e:
+                print(f'{table_name} 函数: mysql - > OptimizeDatas -> delete_duplicate -> {e}')
         del all_datas
 
         if not duplicate_id:  # 如果没有重复数据，则跳过该数据表
@@ -1340,7 +1340,7 @@ class OptimizeDatas:
                 sql = f"DELETE FROM `{table_name}` WHERE id IN ({placeholders})"
                 cursor.execute(sql, duplicate_id)
                 now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                print(f"{now} `{table_name}` -> {date.strftime('%Y-%m-%d')} before: {len(datas)}, remove: {cursor.rowcount}")
+                print(f"{now} {table_name} -> {date.strftime('%Y-%m-%d')} before: {len(datas)}, remove: {cursor.rowcount}")
             self.connection.commit()  # 提交事务
         except Exception as e:
             print(f'{self.db_name}/{table_name}, {e}')
@@ -1378,7 +1378,7 @@ class OptimizeDatas:
                 sql = f"DELETE FROM `{table_name}` WHERE id IN ({placeholders})"
                 cursor.execute(sql, duplicate_id)
                 now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-                print(f"{now} `{table_name}` -> before: {len(datas)}, "
+                print(f"{now} {table_name} -> before: {len(datas)}, "
                       f"remove: {cursor.rowcount}")
             self.connection.commit()  # 提交事务
         except Exception as e:

mdbq/other/download_sku_picture.py

@@ -953,7 +953,7 @@ def download_sku(service_name='company', database='mysql', db_name='属性设置
     )  # 3. 回传数据库
 
 
-def download_spu(username, password, host, port, col_name='白底图', save_path=os.path.join(upload_path, '商品id_商家编码_图片'), ):
+def download_spu(username, password, host, port, heads=0, col_name='白底图', save_path=os.path.join(upload_path, '商品id_商家编码_图片'), ):
     """
     从 属性设置 3 ->  商品sku属性 数据库中提取图片地址，下载图片
     col_name： 从那一列提取图片下载地址 ，， 白底图
@@ -978,7 +978,8 @@ def download_spu(username, password, host, port, col_name='白底图', save_path
     df['日期'] = df['日期'].astype('datetime64[ns]')
     df.sort_values(by=['商品id', '日期'], ascending=[False, True], ignore_index=True, inplace=True)
     df.drop_duplicates(subset=['商品id'], keep='last', inplace=True, ignore_index=True)
-    df = df.head(30)
+    if heads:
+        df = df.head(int(heads))
     # df = df.head(2)
     if len(df) > 0:
         #  5. 实例化一个下载器类，并下载数据
@@ -995,6 +996,7 @@ if __name__ == '__main__':
         password=password,
         host=host,
         port=port,
+        heads=30,
         col_name='白底图',
         save_path=os.path.join(upload_path, '商品id_商家编码_图片'),
     )

{mdbq-3.2.18.dist-info → mdbq-3.3.0.dist-info}/METADATA

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

{mdbq-3.2.18.dist-info → mdbq-3.3.0.dist-info}/RECORD

@@ -28,12 +28,12 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=1Jsv-Uih9uaJWygirD5SR2vNdEfDn9qVEauisKGnnM0,82038
+mdbq/mysql/mysql.py,sha256=yWxjrh1uygcb5S84CruNaD5w4oF6lNALNLCNjqR04F4,82030
 mdbq/mysql/recheck_mysql.py,sha256=rgTpvDMWYTyEn7UQdlig-pdXDluTgiU8JG6lkMh8DV0,8665
 mdbq/mysql/s_query.py,sha256=MbIprZ4yJDAZ9AahZPzl7hqS695Vs0P-AJNwAtA_EEc,9287
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/other/download_sku_picture.py,sha256=tlGh3oApJyH1vNva2PsMA-mdwl13tHdyLIOLO1FOyfo,45826
+mdbq/other/download_sku_picture.py,sha256=Z2Crtwsv69nMGN8uw7qea_1HghRwil3vfnczBM6Ab80,45879
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/sku_picture.py,sha256=JwSXYlzamVqcKCD2tRH2VqYVZNr8fM6f--kcGlTVRnM,50026
@@ -46,7 +46,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=qg7pet73IgKGmCwxaeUyImJIoeK_pBQT9BBKD7fkBNg,36160
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=yG0wqvKKqAsx_OQXAy-wAJF_DPITL3r_S-9txb5bnHk,22436
-mdbq-3.2.18.dist-info/METADATA,sha256=0Ios6aS-xrAmk0h9zT185FLeKXDAMVk-IRRzL0fIFhI,244
-mdbq-3.2.18.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-3.2.18.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.2.18.dist-info/RECORD,,
+mdbq-3.3.0.dist-info/METADATA,sha256=BMRv2VWFHRMrL3bDCsavULbwJuAuKhW1Lth82P9B9OQ,243
+mdbq-3.3.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.3.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.3.0.dist-info/RECORD,,

{mdbq-3.2.18.dist-info → mdbq-3.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any