mdbq 3.11.3__py3-none-any.whl → 3.11.4__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.11.3'
+VERSION = '3.11.4'

mdbq/mysql/uploader.py

@@ -305,12 +305,12 @@ class MySQLUploader:
 
         :param table_name: 基础表名
         :param date_value: 日期值
-        :param partition_by: 分表方式 ('year' 或 'month')
+        :param partition_by: 分表方式 ('year' 或 'month' 或 'none')
         :return: 分表名称
         :raises ValueError: 如果日期格式无效或分表方式无效
         """
         try:
-            date_obj = self._validate_datetime(date_value, True)
+            date_obj = self._validate_datetime(value=date_value, date_type=True, no_log=False)
         except ValueError:
             logger.error('无效的日期格式', {'表': table_name, '日期值': date_value})
             raise ValueError(f"`{table_name}` 无效的日期格式: `{date_value}`")
@@ -449,12 +449,13 @@ class MySQLUploader:
                 conn.rollback()
             raise
 
-    def _validate_datetime(self, value: str, date_type: bool = False) -> Any:
+    def _validate_datetime(self, value: str, date_type: bool = False, no_log: bool = False) -> Any:
         """
         验证并标准化日期时间格式
 
         :param value: 日期时间值
         :param date_type: 是否返回日期类型(True)或字符串(False)
+        :param no_log: 记录日志，默认为False
         :return: 标准化后的日期时间字符串或日期对象
         :raises ValueError: 当日期格式无效时抛出
         """
@@ -482,7 +483,8 @@ class MySQLUploader:
                     return result
             except ValueError:
                 continue
-        logger.error('无效的日期格式', {'值': value})
+        if not no_log:
+            logger.error('无效的日期格式', {'值': value})
         raise ValueError(f"无效的日期格式: `{value}`")
 
     def _validate_value(self, value: Any, column_type: str, allow_null: bool, db_name: str = None, table_name: str = None, col_name: str = None) -> Any:
@@ -538,7 +540,7 @@ class MySQLUploader:
                     return value.strftime('%Y-%m-%d %H:%M:%S')
                 elif isinstance(value, str):
                     try:
-                        return self._validate_datetime(value)
+                        return self._validate_datetime(value=value, date_type=False, no_log=False)
                     except ValueError as e:
                         logger.error('无效日期格式', {
                             '库': db_name, '表': table_name, '列': col_name, '值': value, '错误': str(e)
@@ -653,11 +655,12 @@ class MySQLUploader:
             transaction_mode=transaction_mode
         )
 
-    def _infer_data_type(self, value: Any) -> str:
+    def _infer_data_type(self, value: Any, no_log: bool = False) -> str:
         """
         根据值推断合适的MySQL数据类型
 
         :param value: 要推断的值
+        :param no_log: 记录日志，默认为False
         :return: MySQL数据类型字符串
         """
         if value is None or str(value).lower() in ['', 'none', 'nan']:
@@ -695,7 +698,7 @@ class MySQLUploader:
         elif isinstance(value, str):
             # 尝试判断是否是日期时间
             try:
-                self._validate_datetime(value)
+                self._validate_datetime(value=value, date_type=False, no_log=no_log)
                 return 'DATETIME'
             except ValueError:
                 pass
@@ -799,7 +802,7 @@ class MySQLUploader:
                 sample_values = [row[col] for row in data if col in row and row[col] is not None][:5]
                 inferred_type = None
                 for val in sample_values:
-                    inferred_type = self._infer_data_type(val)
+                    inferred_type = self._infer_data_type(val, no_log=True)  # 推断日期类型不记录日志, 避免日志噪音过多
                     if inferred_type:
                         break
                 if not inferred_type:
@@ -864,7 +867,7 @@ class MySQLUploader:
         :param check_duplicate: 是否检查重复数据，默认为False
         :param duplicate_columns: 用于检查重复的列，可选
         :param allow_null: 是否允许空值，默认为False
-        :param partition_by: 分表方式('year'或'month')，可选
+        :param partition_by: 分表方式('year'、'month'、'None')，可选
         :param partition_date_column: 用于分表的日期列名，默认为'日期'
         :param auto_create: 表不存在时是否自动创建，默认为True
         :param indexes: 需要创建索引的列列表，可选

{mdbq-3.11.3.dist-info → mdbq-3.11.4.dist-info}/METADATA

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

{mdbq-3.11.3.dist-info → mdbq-3.11.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=SerN98H6Mx8rHVh-jf2Nmc7iZHb02NHGVphB1O5jKwE,18
+mdbq/__version__.py,sha256=1DrHdseKlRiF6aYmgAcpC6gl2Za3P3wK0gh0svyeqSQ,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=nxL8hSy8yI1QLlqnkTNHHQSxRfo-6WKL5OA-N4xLB7c,179832
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -11,7 +11,7 @@ mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/deduplicator.py,sha256=bIV010UkFfSUONY6-756x3tDVO4k6q3pqxoY3Z2xT-k,32990
 mdbq/mysql/mysql.py,sha256=Kjpi-LL00WQUmTTOfhEBsNrmo4-4kFFJzrHbVKfqiBE,56770
 mdbq/mysql/s_query.py,sha256=dlnrVJ3-Vp1Suv9CNbPxyYSRqRJUHjOpF39tb2F-wBc,10190
-mdbq/mysql/uploader.py,sha256=3fXyNA0GzBNaadAh6cOgbuUEvY4IAhKn4apgbkToEno,61321
+mdbq/mysql/uploader.py,sha256=K6PBLkmur-2dYdJ78_wFQPolSS44EiQfetDM0owy4E0,61699
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=YU8DxKMXbdeE1OOKEA848WVp62jYHw5O4tXTjUdq9H0,44832
 mdbq/other/otk.py,sha256=iclBIFbQbhlqzUbcMMoePXBpcP1eZ06ZtjnhcA_EbmE,7241
@@ -24,7 +24,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=YHgCKO8mEsslwet33K5tGss-nrDDwPnOSlhA9iBu0jY,24078
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=cqK-JRd_DHbToC7hyo83m8o97NZkJFqmB2xBtr6aAVU,20961
-mdbq-3.11.3.dist-info/METADATA,sha256=tgDHEyJKxO0ML-gUTBap1b6yP-xv5sEA_SsfVJ_31C0,364
-mdbq-3.11.3.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.11.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.11.3.dist-info/RECORD,,
+mdbq-3.11.4.dist-info/METADATA,sha256=Tnz1f-xIVia0AgsFI4nxuiHIjcfT1bxHk5zxHn23q9g,364
+mdbq-3.11.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.11.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.11.4.dist-info/RECORD,,