mdbq 4.0.44__py3-none-any.whl → 4.0.45__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.44'
+VERSION = '4.0.45'

mdbq/aggregation/query_data.py

@@ -24,7 +24,7 @@ host, port, username, password = parser.get_section_values(
     section='mysql',
     keys=['host', 'port', 'username', 'password'],
 )
-# host = 'localhost'
+host = 'localhost'
 uld = uploader.MySQLUploader(username=username, password=password, host=host, port=int(port), pool_size=10)
 
 logger = mylogger.MyLogger(
@@ -1514,25 +1514,29 @@ class MysqlDatasQuery:
             end_date=end_date,
             projection=projection,
         )
+        df.pop('data_sku')
         df['日期'] = pd.to_datetime(df['日期'], format='%Y-%m-%d', errors='ignore')  # 转换日期列
         df_set['商品id'] = df_set['商品id'].astype('int64')
         df['商品id'] = df['商品id'].astype('int64')
         df_set.sort_values('商品id', ascending=False, ignore_index=True, inplace=True)
 
+        # 仅保留最新日期的数据
+        idx = df.groupby(['商品id'])['更新时间'].idxmax()
+        df = df.loc[idx]
+
         def check_year(item_id):
             for item in df_set.to_dict(orient='records'):
                 if item_id > item['商品id']:
                     return item['上市年份']
 
         df['上市年份'] = df['商品id'].apply(lambda x: check_year(x))
-        p = df.pop('上市年份')
-        df.insert(loc=5, column='上市年份', value=p)
         set_typ = {
             '日期': 'date',
             '店铺id': 'bigint',
             '店铺名称': 'varchar(255)',
             '商家id': 'bigint',
             '商品id': 'bigint',
+            '上市年份': 'varchar(50)',
             '商品标题': 'varchar(255)',
             '商品链接': 'varchar(255)',
             '商品图片': 'varchar(255)',
@@ -1540,7 +1544,6 @@ class MysqlDatasQuery:
             '页面价': 'int',
             'data_sku': 'varchar(1000)',
             '更新时间': 'timestamp',
-            '上市年份': 'varchar(50)',
         }
         return df, {
             'db_name': db_name,

{mdbq-4.0.44.dist-info → mdbq-4.0.45.dist-info}/METADATA

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

{mdbq-4.0.44.dist-info → mdbq-4.0.45.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=Yq_JgKwKONwVexEyE66trDbripXgbesAkvt1eQ___20,18
+mdbq/__version__.py,sha256=FkR4y0Q2ePf9_DJM8InzWHAQoyH_nonI89ug5PqBPvw,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/query_data.py,sha256=ZWLJghNiEtyA4rvgUqMCLorY0R4-Likd6i4mVMuOni0,170025
+mdbq/aggregation/query_data.py,sha256=V67KBQNNK8Ayhqrgg8GGf8HGW0H8owjbbiwt07b1Qkw,170092
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=kPe3wsQNaB1slfX-Z7VMqzZoMoqPfc7ylYXZDBeFzzI,24945
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -25,7 +25,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=XptHjGzbout9IYzWAOQUpMMV5qEgLTU8pL1ZGt8oNEA,21868
-mdbq-4.0.44.dist-info/METADATA,sha256=6BCrO5mef08KVeODcA3rgk-gOsNtI_8_CTh0mghCKeE,364
-mdbq-4.0.44.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.44.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.44.dist-info/RECORD,,
+mdbq-4.0.45.dist-info/METADATA,sha256=l9QP6JJAwfO9i4vZpq8H6Z89M6VaOL58wotceJ4MaLY,364
+mdbq-4.0.45.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.45.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.45.dist-info/RECORD,,