mdbq 3.3.4__py3-none-any.whl → 3.3.5__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -1253,8 +1253,8 @@ class MysqlDatasQuery:
             '三级来源索引': 'smallint',
         }
         # df.to_csv('/Users/xigua/Downloads/ll.csv', index=False, header=True, encoding='utf-8_sig')
-        min_date = df['日期'].min()
-        max_date = df['日期'].max()
+        min_date = df['日期'].min().strftime("%Y-%m-%d")
+        max_date = df['日期'].max().strftime("%Y-%m-%d")
         now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
         print(f'{now} 正在更新: mysql ({host}:{port}) {db_name}/{table_name} -> {min_date}~{max_date}')
         m_engine.df_to_mysql(

mdbq/mysql/mysql.py

@@ -128,7 +128,7 @@ class MysqlUpload:
 
         return wrapper
 
-    def keep_connect(self, _config, max_try: int=5):
+    def keep_connect(self, _db_name, _config, max_try: int=5):
         attempts = 1
         while attempts <= max_try:
             try:
@@ -137,8 +137,8 @@ class MysqlUpload:
             except Exception as e:
                 print(f'连接失败，正在重试: {attempts}/{max_try} {e}')
                 attempts += 1
-                time.sleep(10)
-        print(f'连接失败，重试次数超限')
+                time.sleep(20)
+        print(f'{_db_name}: 连接失败，重试次数超限，当前设定次数: {max_try}')
         return None
 
     def cover_doc_dtypes(self, dict_data):
@@ -215,7 +215,7 @@ class MysqlUpload:
             return
 
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -236,7 +236,7 @@ class MysqlUpload:
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -382,7 +382,7 @@ class MysqlUpload:
                     print(f'{table_name} 将数据按年/月保存(cut_data)，但在转换日期时报错 -> {e}')
 
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -403,7 +403,7 @@ class MysqlUpload:
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -749,7 +749,7 @@ class MysqlUpload:
                 [dtypes.update({k: inside_v}) for inside_k, inside_v in set_typ.items() if k == inside_k]
 
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -770,7 +770,7 @@ class MysqlUpload:
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -1049,7 +1049,7 @@ class MysqlUpload:
             print(f'未指定文件名: filename')
             return
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         # try:
@@ -1061,7 +1061,7 @@ class MysqlUpload:
                 return
         self.config.update({'database': db_name})
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -1094,7 +1094,7 @@ class MysqlUpload:
         df = pd.DataFrame()
 
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         try:
@@ -1116,7 +1116,7 @@ class MysqlUpload:
         # 读取数据
         self.config.update({'database': db_name})
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         try:
@@ -1240,7 +1240,7 @@ class OptimizeDatas:
 
         return wrapper
 
-    def keep_connect(self, _config, max_try: int=5):
+    def keep_connect(self, _db_name, _config, max_try: int=5):
         attempts = 1
         while attempts <= max_try:
             try:
@@ -1249,8 +1249,8 @@ class OptimizeDatas:
             except Exception as e:
                 print(f'连接失败，正在重试: {attempts}/{max_try} {e}')
                 attempts += 1
-                time.sleep(10)
-        print(f'连接失败，重试次数超限')
+                time.sleep(20)
+        print(f'{_db_name}: 连接失败，重试次数超限，当前设定次数: {max_try}')
         return None
 
     def optimize_list(self):
@@ -1300,7 +1300,7 @@ class OptimizeDatas:
                 #     continue
                 self.config.update({'database': self.db_name})  # 添加更新 config 字段
                 # self.connection = pymysql.connect(**self.config)
-                self.connection = self.keep_connect(_config=self.config, max_try=5)
+                self.connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=5)
                 if not self.connection:
                     return
                 with self.connection.cursor() as cursor:
@@ -1455,7 +1455,7 @@ class OptimizeDatas:
     def database_list(self):
         """ 获取所有数据库 """
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -1467,7 +1467,7 @@ class OptimizeDatas:
     def table_list(self, db_name):
         """ 获取指定数据库的所有数据表 """
         # connection = pymysql.connect(**self.config)  # 连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=5)
         if not connection:
             return
         try:
@@ -1486,7 +1486,7 @@ class OptimizeDatas:
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
         # connection = pymysql.connect(**self.config)  # 重新连接数据库
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         with connection.cursor() as cursor:
@@ -1501,7 +1501,7 @@ class OptimizeDatas:
         """
         self.config.update({'database': db_name})  # 添加更新 config 字段
         # connection = pymysql.connect(**self.config)
-        connection = self.keep_connect(_config=self.config, max_try=5)
+        connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=5)
         if not connection:
             return
         try:
@@ -1537,7 +1537,7 @@ class OptimizeDatas:
             for key, table_name in table_dict.items():
                 self.config.update({'database': self.db_name})  # 添加更新 config 字段
                 # self.connection = pymysql.connect(**self.config)
-                self.connection = self.keep_connect(_config=self.config, max_try=5)
+                self.connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=5)
                 if not self.connection:
                     return
                 with self.connection.cursor() as cursor:

{mdbq-3.3.4.dist-info → mdbq-3.3.5.dist-info}/METADATA

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

{mdbq-3.3.4.dist-info → mdbq-3.3.5.dist-info}/RECORD

@@ -5,7 +5,7 @@ mdbq/aggregation/aggregation.py,sha256=-yzApnlqSN2L0E1YMu5ml-W827qpKQvWPCOI7jj2k
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=YTGyrF9vcRgfkQbpT-e-JdJ7c7VF1dDHgyx9YZRES8w,10934
 mdbq/aggregation/optimize_data.py,sha256=RXIv7cACCgYyehAxMjUYi_S7rVyjIwXKWMaM3nduGtA,3068
-mdbq/aggregation/query_data.py,sha256=4C9BmMUV4x1YvezIySO5Nh8tqGqg1z4GVnuYDGU5OJs,167595
+mdbq/aggregation/query_data.py,sha256=_5mnSFHV6xAFs_1YF_H2zMOdJeMavgga4lZQ_qpqxPQ,167637
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
@@ -26,7 +26,7 @@ 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=pTeZD0KgVNJnRLaMXP11wz8lBBq2_xkAqIuoRmnEMWA,85259
+mdbq/mysql/mysql.py,sha256=ZK6E-idQWrURtoimc0uG8B1tnhtSFQXDJHfu8sWeJg4,85675
 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
@@ -44,7 +44,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=BKVa0xbTkyhIH5kQgOdyPDtwFPScbMNAFYup_-fFF9Y,24809
-mdbq-3.3.4.dist-info/METADATA,sha256=5HCgLOtVbO2JXkq0HhNkTOo2wqWf4MFVh78NWT_ruPk,243
-mdbq-3.3.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-3.3.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.3.4.dist-info/RECORD,,
+mdbq-3.3.5.dist-info/METADATA,sha256=ndDUyzoqoEH--Mhw_0Z7xXEPTwWuLyBkT8jsfUx8AxA,243
+mdbq-3.3.5.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.3.5.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.3.5.dist-info/RECORD,,