mdbq 3.8.4__py3-none-any.whl → 3.8.6__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.8.3'
+VERSION = '3.8.6'

mdbq/aggregation/query_data.py

@@ -2921,9 +2921,11 @@ class MysqlDatasQuery:
         start_date, end_date = self.months_data(num=self.months)
         projection = {
             '日期': 1,
-            'spi_id': 1,
+            '平台': 1,
+            '店铺名称': 1,
+            'spuid': 1,
             '商品名称': 1,
-            '品牌名称': 1,
+            '品牌名': 1,
             '商品款号': 1,
             '一级类目名称': 1,
             '二级类目名称': 1,
@@ -2936,7 +2938,7 @@ class MysqlDatasQuery:
             '成交gmv': 1,
             '供货额': 1,
             '供货价': 1,
-            '销售爱豆人数_成交': 1,
+            '销售爱豆人数': 1,
             '支付人数_交易': 1,
             '支付人数_成交': 1,
             '销售量_成交': 1,
@@ -2949,34 +2951,34 @@ class MysqlDatasQuery:
             '售罄率': 1,
             '在架sku数': 1,
             '可售sku数': 1,
-            'sku数_交易': 1,
-            'sku数_成交': 1,
-            '营销后供货额': 1,
-            '营销后供货价': 1,
-            '店铺名称': 1,
+            '下单sku数': 1,
+            '成交sku数': 1,
+            '图片': 1,
+            '更新时间': 1,
         }
         projection = {}
         df = self.download.data_to_df(
             db_name='爱库存2',
-            table_name='商品spu榜单',
+            table_name='spu榜单',
             start_date=start_date,
             end_date=end_date,
             projection=projection,
         )
-        df.drop_duplicates(
-            subset=[
-                '日期',
-                '店铺名称',
-                'spu_id',
-                '访客量',
-                '浏览量',
-                '下单gmv',
-                '成交gmv',
-            ], keep='last', inplace=True, ignore_index=True)
+        idx = df.groupby(['日期', '店铺名称', 'spuid'])['更新时间'].idxmax()
+        df = df.loc[idx]
+
+        # 调整列顺序, 定义需要前置的列
+        cols_to_move = ['日期','平台','店铺名称','品牌名','商品名称', '商品款号','spuid', '一级类目名称', '二级类目名称', '三级类目名称']
+        # 生成新的列顺序：前置列 + 剩余列（保持原顺序）
+        new_columns = cols_to_move + [col for col in df.columns if col not in cols_to_move]
+        # 调整DataFrame列顺序
+        df = df[new_columns]
+        df['更新时间'] = df.pop('更新时间')
+        df = df.astype({'日期': 'datetime64[ns]'}, errors='ignore')
         set_typ = {
             '日期': 'date',
             '店铺名称': 'varchar(100)',
-            'spu_id': 'varchar(100)',
+            'spuid': 'varchar(100)',
             '图片': 'varchar(255)',
             '序号': 'smallint',
             '商品名称': 'varchar(255)',

mdbq/spider/aikucun.py

@@ -69,6 +69,7 @@ class AikuCun:
         self.today = datetime.date.today()
         self.start_date = (self.today - datetime.timedelta(days=7)).strftime('%Y-%m-%d')
         self.end_date = (self.today - datetime.timedelta(days=1)).strftime('%Y-%m-%d')
+        self.error_count = 0
 
     def logining(self, shop_name='aikucun', headless=False):
         option = webdriver.ChromeOptions()
@@ -196,6 +197,9 @@ class AikuCun:
         )
 
     def get_data_from_bbx(self, start_date=None, end_date=None, item_type='spu', page_num=1, page_size=300):
+        """
+        这里获取的数据等同于"查询"按钮的数据, 没有"营销后供货额/供货价" 这2个字段, 如果通过下载按钮的报表则有两个字段
+        """
         if start_date:
             self.start_date = start_date
         if end_date:
@@ -239,6 +243,9 @@ class AikuCun:
         num = 1
         results = []
         for date in date_list:
+            if self.error_count > 5:
+                print('已退出请求 -> self.error_count > 5')
+                break
             req_date = re.sub('-', '', date)
             data = {
                 'beginDate': req_date,
@@ -266,11 +273,15 @@ class AikuCun:
             print(f'正在获取数据({num}/{len(date_list)}): {item_type}榜单  {date}')
             # print(res.json())
             if not res.json()['success']:
-                print('requests 请求不成功, success 返回值应为 True')
+                print('没有获取到数据, requests 请求不成功, success 返回值应为 True')
+                num += 1
+                self.error_count += 1
                 time.sleep(1)
                 continue
             if not res.json()['data']['rows']:
-                print("请求获取的数据 ['data']['rows'] 不能为空")
+                print("返回的数据字典异常, ['data']['rows'] 不能为空")
+                num += 1
+                self.error_count += 1
                 time.sleep(1)
                 continue
             results += [(date, res.json()['data']['rows'])]
@@ -390,7 +401,7 @@ class AikuCun:
             '图片': 'varchar(255)',
             '浏览量': 'INT',
             '序号': 'INT',
-            'spuId': 'varchar(50)',
+            'spuid': 'varchar(50)',
             '商品名称': 'varchar(50)',
             '供货额': 'decimal(10,2)',
             '供货价': 'decimal(10,2)',
@@ -469,6 +480,7 @@ def main(start_date, end_date, item_type=['spu']):
             if not data_list:
                 ak.logining()
                 ak.save_token()
+                ak.error_count = 0  # 重置错误计数器
             else:
                 break
 
@@ -482,7 +494,7 @@ def main(start_date, end_date, item_type=['spu']):
 
 if __name__ == '__main__':
     main(
-        start_date='2025-03-06',
-        end_date='2025-03-06',
+        start_date='2025-03-01',
+        end_date='2025-03-12',
         item_type=['spu', 'sku']
     )

{mdbq-3.8.4.dist-info → mdbq-3.8.6.dist-info}/METADATA

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

{mdbq-3.8.4.dist-info → mdbq-3.8.6.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=N2YV132Ke9nxG8e_N4DlVVVafsd63H4Sbusd36SCowU,17
+mdbq/__version__.py,sha256=Getdc-hdWx0sFteBzPqro7bCHfZKcq5ra0Qya_DV54w,17
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/query_data.py,sha256=fbNyjRlJF3ycVBfAmj_JXMaauUmj3oIFIzKx2XV2sR4,180368
+mdbq/aggregation/query_data.py,sha256=RUyrknC8IEOQnS_yFk_5JNSBdf-n5OcnmCAUgN-bvgw,180742
 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
@@ -28,8 +28,8 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=Uk8-cOWT0JU1qRyIVqdbYokSLvkDIAfcokmYj1ebw8k,24104
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=cYtLIEvvfKZ0pUeASpKaMY31vOKFa74KNcZQ3iCiL0c,19724
-mdbq-3.8.4.dist-info/METADATA,sha256=DKnJoT-wW88fh5-SnfD6v748tCpgii5KB7gqqe2fdAU,363
-mdbq-3.8.4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.8.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.8.4.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=bUjjPjNoW3EL6H89nnBdFEwnWgGuEB2CENuBxcvx0Kw,20284
+mdbq-3.8.6.dist-info/METADATA,sha256=fNd7czbtUog5tHTxwy-K2cAtuVWndlREi2HWO4vkp_w,363
+mdbq-3.8.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.8.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.8.6.dist-info/RECORD,,