mdbq 3.6.0__py3-none-any.whl → 3.6.2__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -4142,6 +4142,7 @@ def main(days=150, months=3):
         "属性设置3",
         "推广数据2",
         "推广数据_淘宝店",
+        "推广数据_奥莱店",
         "爱库存2",
         "生意参谋3",
         "生意经3",
@@ -4149,6 +4150,7 @@ def main(days=150, months=3):
         '人群画像2',
         '商品人群画像2',
         '市场数据3',
+        '回传数据',
     ]
     # 使用 ThreadPoolExecutor 来并行运行
     # with concurrent.futures.ThreadPoolExecutor() as executor:

mdbq/mysql/mysql.py

@@ -949,6 +949,8 @@ class MysqlUpload:
                     df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')
                     min_year = df['日期'].min(skipna=True).year
                     min_month = df['日期'].min(skipna=True).month
+                    if 0 < int(min_month) < 10 and not str(min_month).startswith('0'):
+                        min_month = f'0{min_month}'
                     if str(cut_data).lower() == 'year':
                         table_name = f'{table_name}_{min_year}'
                     elif str(cut_data).lower() == 'month':

mdbq/redis/getredis.py

@@ -101,7 +101,7 @@ class RedisData(object):
             # Bug: 如果外部请求日期小于 table 最小日期，每次都要从 mysql 获取数据，即使 redis 缓存了数据
             if start_date < min_date:  # 外部请求日期小于 redis 数据最小日期
                 # 3. redis 有数据但数据不完整时
-                print(f'数据日期不对劲需要更新')
+                print(f'{start_date} -- {min_date} 数据日期不对劲需要更新')
                 thread = threading.Thread(target=self.set_redis, args=(my_key, _db_name, _table_name, _set_year, start_date, end_date, _df))
                 thread.start()
                 # _df = self.set_redis(my_key=my_key, _db_name=_db_name, _table_name=_table_name, _set_year=_set_year, start_date=start_date, end_date=end_date)
@@ -131,9 +131,12 @@ class RedisData(object):
             before_df1 = before_df[(before_df['日期'] < _min_date)]
             before_df2 = before_df[(before_df['日期'] > _max_date)]
             _df = pd.concat([_df, before_df1, before_df2], ignore_index=True, axis=0)
-        if '日期' in _df.columns.tolist():
+        # if '日期' in _df.columns.tolist():
+        #     _df['日期'] = _df['日期'].astype('str')
+        for col in _df.columns.tolist():
             # 存入 redis ，需要先格式化为 str，避免日期变整数形式
-            _df['日期'] = _df['日期'].astype('str')
+            if _df[col].dtype == 'datetime64[ns]':
+                _df[col] = _df[col].astype('str')
         jsondata = _df.to_json(orient='records', force_ascii=False)
         self.redis_engin.set(my_key, jsondata)
         self.redis_engin.expire(my_key, self.minute * 60)  # 设置缓存过期时间: 分钟

{mdbq-3.6.0.dist-info → mdbq-3.6.2.dist-info}/METADATA

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

{mdbq-3.6.0.dist-info → mdbq-3.6.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,
 mdbq/aggregation/aggregation.py,sha256=-yzApnlqSN2L0E1YMu5ml-W827qpKQvWPCOI7jj2kzY,80264
 mdbq/aggregation/datashow.py,sha256=1AYSIDkdUx-4as1Ax2rPj0cExM9d-qFMrFYLAaPHNuk,54962
 mdbq/aggregation/optimize_data.py,sha256=RXIv7cACCgYyehAxMjUYi_S7rVyjIwXKWMaM3nduGtA,3068
-mdbq/aggregation/query_data.py,sha256=zySZBs90a5cYs5zBhP6NVcLt-rLDpaxw5iW0OTKYbys,193015
+mdbq/aggregation/query_data.py,sha256=KrQqe9qzrKAs3s6QNoQZuY8_U36I852dFPiIcv1QIi0,193075
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -18,7 +18,7 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=M9DUeUCMPDngkwn9-ui0uTiFrvfNU1kLs22s5SmoNm0,31899
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=r5YkS1WnV9dGtEHFcwaekjtUBgFcvkdmwif-m52CyHI,99560
+mdbq/mysql/mysql.py,sha256=_jFo2_OC1BNm5wEmoYiBG_TcuNNA2xUWKNhMBfgDiAM,99699
 mdbq/mysql/recheck_mysql.py,sha256=ppBTfBLgkRWirMVZ31e_ZPULiGPJU7K3PP9G6QBZ3QI,8605
 mdbq/mysql/s_query.py,sha256=Z0C3lQQcGtnizyVHa62HYIAqZ8R3KeSHP-N0O7Qb5eU,9280
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
@@ -33,10 +33,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=PlWAGMC-WqdZtyvtjjj-i0i8AiBsNP6zgAUb5Fdkark,8481
+mdbq/redis/getredis.py,sha256=zpkdy624Drj2ujvOcldKS4PSN8bfKKmIIRkB0KqL7x0,8657
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=v7VO5gtEXR6_4Q6ujbTyu1FHu7TXHcwSQ6hIO249YH0,22208
-mdbq-3.6.0.dist-info/METADATA,sha256=J_5KkTuR3qb6SiQTBwoPL3CW2ERykJp326azY8M0u1M,243
-mdbq-3.6.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-3.6.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.6.0.dist-info/RECORD,,
+mdbq-3.6.2.dist-info/METADATA,sha256=EtY3g6bo6ZkYkc_47W3VJO6toGHWZXIFVaBgXZtjX_U,243
+mdbq-3.6.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.6.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.6.2.dist-info/RECORD,,