mdbq 3.7.11__py3-none-any.whl → 3.7.13__py3-none-any.whl

mdbq/config/default.py

@@ -2,8 +2,8 @@
 import os
 import sys
 import json
-import platform
-import getpass
+# import platform
+# import getpass
 import socket
 import logging
 from mdbq.mysql import mysql

mdbq/config/myconfig.py

@@ -1,14 +1,16 @@
 # -*- coding: UTF-8 –*-
 import os
+import sys
 import json
-from mdbq.config import set_support
+# from mdbq.config import set_support
 """
 用来读取本地配置文件
 """
+support_path = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'support')
 
 
 def main():
-    support_path = set_support.SetSupport(dirname='support').dirname
+    # support_path = set_support.SetSupport(dirname='support').dirname
     file = os.path.join(support_path, 'my_config.txt')
     if not os.path.isfile(file):
         print(f'缺少配置文件，无法读取配置文件： {file}')
@@ -20,7 +22,7 @@ def main():
 
 def write_back(datas):
     """ 将数据写回本地 """
-    support_path = set_support.SetSupport(dirname='support').dirname
+    # support_path = set_support.SetSupport(dirname='support').dirname
     file = os.path.join(support_path, 'my_config.txt')
     with open(file, 'w+', encoding='utf-8') as f:
         json.dump(datas, f, ensure_ascii=False, sort_keys=False, indent=4)

mdbq/mysql/mysql.py

@@ -172,8 +172,6 @@ class MysqlUpload:
                 __res_dict.update({k: 'INT'})
             elif count_float > 0:
                 if count_int + count_float > 10:
-                    # if count_float > 5:
-                    #     v = round(float(v), 4)
                     if count_float >= 6:
                         __res_dict.update({k: 'decimal(14,6)'})
                     else:
@@ -207,8 +205,6 @@ class MysqlUpload:
         if '数据主体' not in dict_data.keys():
             logger.info(f'dict_data 中"数据主体"键不能为空')
             return
-
-        # connection = pymysql.connect(**self.config)  # 连接数据库
         connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -229,7 +225,6 @@ class MysqlUpload:
                 logger.info(f"创建Database: {db_name}")
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
-        # connection = pymysql.connect(**self.config)  # 重新连接数据库
         connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -282,7 +277,6 @@ class MysqlUpload:
                 for up_col in remove_by_key:
                     condition += [f'`{up_col}` = "{dict_data[up_col]}"']
                 condition = ' AND '.join(condition)
-                # logger.info(condition)
                 sql = f"SELECT {se_key} FROM `{table_name}` WHERE {condition}"
                 cursor.execute(sql)
                 result = cursor.fetchall()
@@ -299,7 +293,6 @@ class MysqlUpload:
                 cols = ', '.join([cols, '数据主体'])
                 binary_data = dict_data['数据主体']
                 sql = f"INSERT INTO `{table_name}` ({cols}) VALUES ({values}, %s)"
-                # logger.info(sql)
                 cursor.execute(sql, binary_data)
             else:
                 sql = f"""INSERT INTO `{table_name}` (数据主体) VALUES (%s);"""
@@ -319,17 +312,14 @@ class MysqlUpload:
                         column_name = 'id'
                         sql = (f'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS '
                                f'WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s')
-                        # cursor.execute(f"SHOW COLUMNS FROM `{table_name}` LIKE 'id'")
                         cursor.execute(sql, (db_name, table_name, column_name))
                         result = cursor.fetchone()
                         if result:
-                            # cursor.execute(f"ALTER TABLE `{table_name}` DROP COLUMN id;")  # 删除 id  列
                             sql = f"ALTER TABLE `{table_name}` DROP COLUMN {column_name}"  # 删除 id  列
                             cursor.execute(sql)
                         cursor.execute(
                             f"ALTER TABLE `{table_name}` ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
                         cursor.execute(f"ALTER TABLE `{table_name}` AUTO_INCREMENT = 1")  # 设置自增从 1 开始
-                        # logger.info(f'重置自增id')
                     else:
                         logger.info(f'{table_name} 存在复合主键: 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                 except Exception as e:
@@ -1434,7 +1424,7 @@ class OptimizeDatas:
                 connection = pymysql.connect(**_config)  # 连接数据库
                 return connection
             except Exception as e:
-                logger.error(f'连接失败，正在重试: {attempts}/{max_try} {e}')
+                logger.error(f'{_db_name}连接失败，正在重试: {self.host}:{self.port}  {attempts}/{max_try} {e}')
                 attempts += 1
                 time.sleep(30)
         logger.error(f'{_db_name}: 连接失败，重试次数超限，当前设定次数: {max_try}')
@@ -1479,16 +1469,12 @@ class OptimizeDatas:
         logger.info(f'mysql({self.host}: {self.port}) {self.db_name} 数据库优化中(日期长度: {self.days} 天)...')
         for table_dict in tables:
             for key, table_name in table_dict.items():
-                # if '店铺指标' not in table_name:
-                #     continue
                 self.config.update({'database': self.db_name})  # 添加更新 config 字段
-                # self.connection = pymysql.connect(**self.config)
                 self.connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=10)
                 if not self.connection:
                     return
                 with self.connection.cursor() as cursor:
                     sql = f"SELECT 1 FROM `{table_name}` LIMIT 1"
-                    # logger.info(sql)
                     cursor.execute(sql)
                     result = cursor.fetchone()
                     if not result:
@@ -1509,7 +1495,6 @@ class OptimizeDatas:
                         max_result = cursor.fetchone()
                         cursor.execute(sql_min)
                         min_result = cursor.fetchone()
-                        # logger.info(min_result['min_date'], max_result['max_date'])
                         # 匹配修改为合适的起始和结束日期
                         if self.start_date < pd.to_datetime(min_result['min_date']):
                             self.start_date = pd.to_datetime(min_result['min_date'])
@@ -1537,17 +1522,14 @@ class OptimizeDatas:
                             column_name = 'id'
                             sql = (f'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS '
                                    f'WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s AND COLUMN_NAME = %s')
-                            # cursor.execute(f"SHOW COLUMNS FROM `{table_name}` LIKE 'id'")
                             cursor.execute(sql, (self.db_name, table_name, column_name))
                             result = cursor.fetchone()
                             if result:
-                                # cursor.execute(f"ALTER TABLE `{table_name}` DROP COLUMN id;")  # 删除 id  列
                                 sql = f"ALTER TABLE `{table_name}` DROP COLUMN {column_name}"  # 删除 id  列
                                 cursor.execute(sql)
                             cursor.execute(
                                 f"ALTER TABLE `{table_name}` ADD column id INT AUTO_INCREMENT PRIMARY KEY FIRST;")
                             cursor.execute(f"ALTER TABLE `{table_name}` AUTO_INCREMENT = 1")  # 设置自增从 1 开始
-                            # logger.info(f'重置自增id')
                         else:
                             logger.info(f'{table_name} 存在复合主键: {[item['PrimaryKey'] for item in result]}, 无法重置自增id')
                     except Exception as e:
@@ -1634,7 +1616,6 @@ class OptimizeDatas:
 
     def database_list(self):
         """ 获取所有数据库 """
-        # connection = pymysql.connect(**self.config)  # 连接数据库
         connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -1646,7 +1627,6 @@ class OptimizeDatas:
 
     def table_list(self, db_name):
         """ 获取指定数据库的所有数据表 """
-        # connection = pymysql.connect(**self.config)  # 连接数据库
         connection = self.keep_connect(_db_name=self.db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -1664,7 +1644,6 @@ class OptimizeDatas:
             connection.close()  # 断开连接
 
         self.config.update({'database': db_name})  # 添加更新 config 字段
-        # connection = pymysql.connect(**self.config)  # 重新连接数据库
         connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -1679,7 +1658,6 @@ class OptimizeDatas:
         获取指定数据表的数据, 按天获取
         """
         self.config.update({'database': db_name})  # 添加更新 config 字段
-        # connection = pymysql.connect(**self.config)
         connection = self.keep_connect(_db_name=db_name, _config=self.config, max_try=10)
         if not connection:
             return
@@ -1715,7 +1693,6 @@ class OptimizeDatas:
         for table_dict in tables:
             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(_db_name=self.db_name, _config=self.config, max_try=10)
                 if not self.connection:
                     return

mdbq/redis/getredis.py

@@ -23,7 +23,7 @@ if platform.system() == 'Windows':
 else:
     D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
     if not os.path.exists(D_PATH):
-        os.makedir(D_PATH)
+        os.makedirs(D_PATH)
 
 m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
 

{mdbq-3.7.11.dist-info → mdbq-3.7.13.dist-info}/METADATA

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

{mdbq-3.7.11.dist-info → mdbq-3.7.13.dist-info}/RECORD

@@ -7,8 +7,8 @@ mdbq/aggregation/query_data.py,sha256=jGKnHm9vRlKCZeIdP15lgpASKaQgoQjPZyd2IsTJY6
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=hJs815hGFwm_X5bP2i9XugG2w2ZY_F0n3-Q0hVpIPPw,4892
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/config/default.py,sha256=tbfjR5lMkvNmwdivtnBxnKVqH5PwFpPM9jaZ9JIOkv4,5088
-mdbq/config/myconfig.py,sha256=Akt-7KqSUBdoHQa4_Mw6YC4pA75219d-21iDO30iaD8,894
+mdbq/config/default.py,sha256=LEDVIBR6aEG5iTKgNzNHOPEujVxp6MF-1i7TwqMM2BI,5092
+mdbq/config/myconfig.py,sha256=IEJOYoSiDivplE6N-1UWuVKUj6zLa4EOsuj3aONb85g,1000
 mdbq/config/products.py,sha256=FbBIqmyaiq9h03FIeE9W2bwbLm2_5pr6xyzPV-u7Ges,5689
 mdbq/config/set_support.py,sha256=eM2scqDzGNR2kkbYmguRB2ucrqeX0KMh5OMIaGsLem4,877
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
@@ -18,7 +18,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/log/spider_logging.py,sha256=cTI9BHePz9Q4QThc_OBxTLqX5tF9iPwIQ-dASpf6zCA,2142
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=Iz0_qzzx-5Y-1LVVfEqC31AdT5iWzoRc8xKepSlrIzM,97315
+mdbq/mysql/mysql.py,sha256=bsv-khT7fyoYxEJMbJPks-V1tYvwX-mNHsoTNXfWiKk,95884
 mdbq/mysql/s_query.py,sha256=pj5ioJfUT81Su9S-km9G49gF5F2MmXXfw_oAIUzhN28,8794
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -31,10 +31,10 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
-mdbq/redis/getredis.py,sha256=8ONSVHEeEY6C68OxAMAR4jB-CtA3mZyd-v6vs94zlnU,25732
+mdbq/redis/getredis.py,sha256=eK5eGpJFS50urJdludRuNhCVcvWvn98Bw_8eZN1oTN0,25733
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=HK6x0MnpUN1jUSWnLQ_UEH2QSYcLFBGhhUBD3FVwrzY,21840
-mdbq-3.7.11.dist-info/METADATA,sha256=m4cGGBG08vTZBtCsCiwjp4UH0-GXnkqEvlHJRAQBL6U,244
-mdbq-3.7.11.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-3.7.11.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.7.11.dist-info/RECORD,,
+mdbq-3.7.13.dist-info/METADATA,sha256=4pQx2WlX2uZDe5YOqTsnHfdXymjn1HhLkJP7Ocn5SdU,244
+mdbq-3.7.13.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mdbq-3.7.13.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.7.13.dist-info/RECORD,,