mdbq 4.1.0__py3-none-any.whl → 4.1.2__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.1.0'
+VERSION = '4.1.2'

mdbq/auth/auth_backend.py

@@ -82,12 +82,6 @@ ROLE_PERMISSIONS = {
         "read", "write", "create", "update", "database", 
         "file_upload", "file_download", "api_read"
     ],
-
-    "vi_user": [
-        # 降级的用户权限
-        "read", "database", 
-        "file_upload", "file_download", "api_read"
-    ],
     
     "viewer": [
         # 只读权限
@@ -224,7 +218,7 @@ class StandaloneAuthManager:
                     password_hash VARCHAR(128) NOT NULL,
                     password_plain TEXT NOT NULL,
                     salt VARCHAR(64) NOT NULL,
-                    role ENUM('super_admin', 'admin', 'manager', 'editor', 'user', 'vi_user', 'viewer', 'api_user', 'auditor') NOT NULL DEFAULT 'user',
+                    role ENUM('super_admin', 'admin', 'manager', 'editor', 'user', 'viewer', 'api_user', 'auditor') NOT NULL DEFAULT 'user',
                     permissions JSON DEFAULT (JSON_ARRAY()),
                     is_active TINYINT(1) NOT NULL DEFAULT 1,
                     created_at TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
@@ -477,7 +471,6 @@ class StandaloneAuthManager:
                 return {'success': False, 'message': '密码至少需要6个字符'}
             
             # 邮箱格式验证
-            import re
             email_pattern = r'^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
             if not re.match(email_pattern, email):
                 return {'success': False, 'message': '请输入有效的邮箱地址'}

mdbq/mysql/deduplicator.py

@@ -168,7 +168,7 @@ class MySQLDeduplicator:
             self._dedup_end_date = today.strftime("%Y-%m-%d")
         
         if self._dedup_start_date and self._dedup_end_date:
-            logger.info('去重日期范围', {'开始': self._dedup_start_date, '结束': self._dedup_end_date})
+            logger.debug('去重日期范围', {'开始': self._dedup_start_date, '结束': self._dedup_end_date})
 
         # 排除列处理，直接合并去重
         self.exclude_columns = list(set((exclude_columns or []) + ['id', '更新时间']))
@@ -515,7 +515,7 @@ class MySQLDeduplicator:
                         dup_count_row = cursor.fetchone()
                         dup_count = dup_count_row['cnt'] if dup_count_row and 'cnt' in dup_count_row else 0
                         if dup_count == 0:
-                            logger.info('没有重复数据', {"库": database, "表": table, "数据量": total_count, "数据日期": date_val})
+                            logger.debug('没有重复数据', {"库": database, "表": table, "数据量": total_count, "数据日期": date_val})
                             cursor.execute(drop_temp_sql)
                             conn.commit()
                             return (0, 0)
@@ -626,7 +626,7 @@ class MySQLDeduplicator:
                     dup_count_row = cursor.fetchone()
                     dup_count = dup_count_row['cnt'] if dup_count_row and 'cnt' in dup_count_row else 0
                     if dup_count == 0:
-                        logger.info('没有重复数据', {"库": database, "表": table, "数据量": total_count})
+                        logger.debug('没有重复数据', {"库": database, "表": table, "数据量": total_count})
                         cursor.execute(drop_temp_sql)
                         conn.commit()
                         return (0, 0)
@@ -722,7 +722,7 @@ class MySQLDeduplicator:
             if not self._check_table_exists(database, table):
                 logger.warning('表不存在', {"库": database, "表": table, "warning": "跳过"})
                 return (0, 0)
-            logger.info('单表开始', {
+            logger.debug('单表开始', {
                 "库": database, 
                 "表": table, 
                 # "参数": {
@@ -763,7 +763,7 @@ class MySQLDeduplicator:
                 if start_date and end_date:
                     all_dates = [d for d in all_dates if str(start_date) <= str(d) <= str(end_date)]
                 if not all_dates:
-                    logger.info('无可处理日期', {"库": database, "表": table})
+                    logger.debug('无可处理日期', {"库": database, "表": table})
                     return (0, 0)
                 total_dup = 0
                 total_del = 0
@@ -794,7 +794,7 @@ class MySQLDeduplicator:
                             logger.warning('分区处理失败', {"库": database, "表": table, "日期": date_val, "异常": err, "func": sys._getframe().f_code.co_name})
                         total_dup += dup_count
                         total_del += affected_rows
-                logger.info('单表完成', {"库": database, "表": table, "结果[重复, 删除]": (total_dup, total_del), '日期范围': f"{start_date} - {end_date}", "唯一列": columns})
+                logger.debug('单表完成', {"库": database, "表": table, "结果[重复, 删除]": (total_dup, total_del), '日期范围': f"{start_date} - {end_date}", "唯一列": columns})
                 # 自动重排id列（仅当有实际删除时且reorder_id为True）
                 if reorder_id and total_del > 0:
                     try:
@@ -858,7 +858,7 @@ class MySQLDeduplicator:
             if not target_tables:
                 logger.info('数据库中没有表', {"库": database, "操作": "跳过"})
                 return results
-            logger.info('库统计', {"库": database, "表数量": len(target_tables), "表列表": target_tables})
+            logger.debug('库统计', {"库": database, "表数量": len(target_tables), "表列表": target_tables})
             if parallel and self.max_workers > 1:
                 with concurrent.futures.ThreadPoolExecutor(
                         max_workers=self.max_workers
@@ -1073,9 +1073,9 @@ class MySQLDeduplicator:
             if hasattr(self, 'pool') and self.pool and not self._closed:
                 self.pool.close()
                 self._closed = True
-                logger.info("数据库连接池已关闭")
+                logger.debug("数据库连接池已关闭")
             else:
-                logger.info('连接池已关闭或不存在')
+                logger.debug('连接池已关闭或不存在')
         except Exception as e:
             logger.error(f"关闭连接池时出错", {'error_type': type(e).__name__, 'error': str(e)})
 
@@ -1172,7 +1172,7 @@ class MySQLDeduplicator:
                 with conn.cursor() as cursor:
                     cursor.execute(f"SHOW CREATE TABLE {table_quoted}")
                     create_table_sql = cursor.fetchone()['Create Table']
-            logger.info('开始id重排', {"库": database, "表": table, "重排列": id_column, "试运行": dry_run, "DDL警告": "MySQL DDL操作不可回滚，建议提前备份！"})
+            logger.debug('开始id重排', {"库": database, "表": table, "重排列": id_column, "试运行": dry_run, "DDL警告": "MySQL DDL操作不可回滚，建议提前备份！"})
             if dry_run:
                 logger.info('dry_run模式，打印原表结构', {"库": database, "表": table, "建表语句": create_table_sql})
                 return True
@@ -1370,7 +1370,7 @@ def main():
         # recent_month=1,
         # date_range=['2025-06-09', '2025-06-10'],
         exclude_columns=['更新时间'],
-        exclude_databases=['cookie文件', '日志', '视频数据', '云电影', 'api_monitor_logs', 'redis统计', 'standalone_auth', 'website_data'],
+        exclude_databases=['cookie文件', '日志', '视频数据', '云电影'],
         # exclude_tables={
         #     '推广数据2': [
         #         '地域报表_城市_2025_04', 

mdbq/mysql/uploader.py

@@ -199,7 +199,7 @@ class MySQLUploader:
                 try:
                     result = func(self, *args, **kwargs)
                     if attempt > 0:
-                        logger.info('操作成功(重试后)', {'operation': operation, 'attempts': attempt + 1})
+                        logger.debug('操作成功(重试后)', {'operation': operation, 'attempts': attempt + 1})
                     return result
                 except (pymysql.OperationalError, pymysql.err.MySQLError) as e:
                     last_exception = e
@@ -217,7 +217,7 @@ class MySQLUploader:
                         time.sleep(wait_time)
                         try:
                             self.pool = self._create_connection_pool()
-                            logger.info('成功重新建立数据库连接')
+                            logger.debug('成功重新建立数据库连接')
                         except Exception as reconnect_error:
                             logger.error('重连失败', {'error': str(reconnect_error)})
                     else:
@@ -251,7 +251,7 @@ class MySQLUploader:
             try:
                 self.pool = self._create_connection_pool()
                 conn = self.pool.connection()
-                logger.info('重建连接池后获取连接成功')
+                logger.debug('重建连接池后获取连接成功')
                 return conn
             except Exception as e2:
                 logger.error('重建连接池后依然获取连接失败', {'error': str(e2)})
@@ -296,7 +296,7 @@ class MySQLUploader:
                 with conn.cursor() as cursor:
                     cursor.execute(sql)
                 conn.commit()
-                logger.info('数据库已创建', {'库': db_name})
+                logger.debug('数据库已创建', {'库': db_name})
         except Exception as e:
             logger.error('无法创建数据库', {'库': db_name, '错误': str(e)})
             if conn is not None:
@@ -602,7 +602,7 @@ class MySQLUploader:
                 with conn.cursor() as cursor:
                     cursor.execute(sql)
                 conn.commit()
-                logger.info('数据表及索引已创建', {'库': db_name, '表': table_name, '索引': indexes, '唯一约束': unique_keys})
+                logger.debug('数据表及索引已创建', {'库': db_name, '表': table_name, '索引': indexes, '唯一约束': unique_keys})
         except Exception as e:
             logger.error('建表失败', {'库': db_name, '表': table_name, '错误': str(e), '异常类型': type(e).__name__})
             if conn is not None:
@@ -909,7 +909,7 @@ class MySQLUploader:
                         return
                     cursor.execute(sql_create)
                 conn.commit()
-                logger.info('已为列创建索引', {'库': db_name, '表': table_name, '列': column})
+                logger.debug('已为列创建索引', {'库': db_name, '表': table_name, '列': column})
         except Exception as e:
             logger.error('创建索引失败', {'库': db_name, '表': table_name, '列': column, '错误': str(e)})
             raise
@@ -953,7 +953,7 @@ class MySQLUploader:
                 with conn.cursor() as cursor:
                     cursor.execute(sql)
                 conn.commit()
-            logger.info('添加唯一约束列成功', {'库': db_name, '表': table_name, '列': unique_cols})
+            logger.debug('添加唯一约束列成功', {'库': db_name, '表': table_name, '列': unique_cols})
         except Exception as e:
             logger.warning('唯一约束列添加失败', {'库': db_name, '表': table_name, '列': unique_cols, '错误': str(e)})
 
@@ -1343,7 +1343,7 @@ class MySQLUploader:
             validated_indexes = self._validate_indexes_format(indexes, db_name, table_name)
             validated_unique_keys = self._validate_unique_keys_format(unique_keys, db_name, table_name)
             
-            logger.info("开始上传", {
+            logger.debug("开始上传", {
                 '库': db_name,
                 '表': table_name,
                 '批次': batch_id,
@@ -1548,7 +1548,7 @@ class MySQLUploader:
             batch_id, transaction_mode,
             update_on_duplicate
         )
-        logger.info('插入完成', {
+        logger.debug('插入完成', {
             '库': db_name,
             '表': table_name,
             '总计': len(data),

{mdbq-4.1.0.dist-info → mdbq-4.1.2.dist-info}/METADATA

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

{mdbq-4.1.0.dist-info → mdbq-4.1.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=UqHfTBXjnn3SF52tR6mC_eYSYdxboYUuHdD7FYSn0kc,17
+mdbq/__version__.py,sha256=t0Fz3FVzbu8dTQm35pWtvOg5K2EJnfXWvbSU90YalwU,17
 mdbq/auth/__init__.py,sha256=pnPMAt63sh1B6kEvmutUuro46zVf2v2YDAG7q-jV_To,24
-mdbq/auth/auth_backend.py,sha256=07OTh0e1LDO_Ws-an1EvzIve8mvfBNCKJn_xjrOD-rw,99920
+mdbq/auth/auth_backend.py,sha256=u8qwMNjAdDliaaFzfulVqQIoFrIJhe980OdYwTIVKJg,99750
 mdbq/auth/crypto.py,sha256=fcZRFCnrKVVdWDUx_zds51ynFYwS9DBvJOrRQVldrfM,15931
 mdbq/auth/rate_limiter.py,sha256=1m_Paxp8pDNpmyoFGRpFMVOJpbmeIvfVcfiQ2oH72qM,32850
 mdbq/js/__init__.py,sha256=hpMi3_ZKwIWkzc0LnKL-SY9AS-7PYFHq0izYTgEvxjc,30
@@ -11,11 +11,11 @@ mdbq/log/mylogger.py,sha256=DyBftCMNLe1pTTXsa830pUtDISJxpJHFIradYtE3lFA,26418
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=rHvQCnQRKhQ49AZBke-Z4v28hyOLmHt4MylIuB0H6yA,33516
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/deduplicator.py,sha256=Sfv5vgMk703luYeNwm-p5kOiKJ3fa6bm1ltc2Q6pOv4,73144
+mdbq/mysql/deduplicator.py,sha256=2fugLyKs_xkvYvoG0C0hRYbJ_w8-4oa1FJ_vavoD7Qo,73084
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
 mdbq/mysql/s_query.py,sha256=nwhyqbxq-V0sGUJbdjiUDEwjpDxiKrzG0PjV6wkrWU4,50474
 mdbq/mysql/unique_.py,sha256=MaztT-WIyEQUs-OOYY4pFulgHVcXR1BfCy3QUz0XM_U,21127
-mdbq/mysql/uploader.py,sha256=xodmN3f5pT1T2yJu01ckgYb_THE__rm81kgNJfqtinc,111530
+mdbq/mysql/uploader.py,sha256=FG_4btNwTjbCqZFeIigCfar7r-OOA7VkyuJsOOC9WLw,111539
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=X66sVdvVgzoNzmgVJyPtd7bjEvctEKtLPblEPF65EWc,46940
 mdbq/other/error_handler.py,sha256=4p5haAXSY-P78stp4Xwo_MwAngWYqyKj5ogWIuYXMeY,12631
@@ -35,7 +35,7 @@ mdbq/route/routes.py,sha256=QVGfTvDgu0CpcKCvk1ra74H8uojgqTLUav1fnVAqLEA,29433
 mdbq/selenium/__init__.py,sha256=AKzeEceqZyvqn2dEDoJSzDQnbuENkJSHAlbHAD0u0ZI,10
 mdbq/selenium/get_driver.py,sha256=1NTlVUE6QsyjTrVVVqTO2LOnYf578ccFWlWnvIXGtic,20903
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-4.1.0.dist-info/METADATA,sha256=pgGi7sn574SavY6o8zpGQnL2cceJ2KZsrm2J_7WR4WQ,363
-mdbq-4.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-mdbq-4.1.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.1.0.dist-info/RECORD,,
+mdbq-4.1.2.dist-info/METADATA,sha256=PsddxgvUrLRPSZGLVd4b64UA19gU-LjiHkK2FV1_OVM,363
+mdbq-4.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+mdbq-4.1.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.1.2.dist-info/RECORD,,