mdbq 2.4.0__py3-none-any.whl → 2.4.2__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -1050,11 +1050,16 @@ class GroupBy:
                 df_fl = pd.read_excel(dir_file, sheet_name='关键词分类', header=0)
                 df_fl.rename(columns={'分类1': '词分类'}, inplace=True)
                 df_fl = df_fl[['关键词', '词分类']]
+                # 合并并获取词分类信息
                 df = pd.merge(df, df_fl, left_on=['词名字/词包名字'], right_on=['关键词'], how='left')
                 df.pop('关键词')
                 df['词分类'].fillna('', inplace=True)
             if '词分类' in df.columns.tolist():
-                df['词分类'] = df.apply(lambda x: self.ret_keyword(keyword=str(x['词名字/词包名字']), as_file=False) if x['词分类'] == '' else x['词分类'], axis=1)
+                # 这行决定了，从文件中读取的词分类信息优先级高于 ret_keyword 函数的词分类
+                df['词分类'] = df.apply(
+                    lambda x: self.ret_keyword(keyword=str(x['词名字/词包名字']), as_file=False) if x['词分类'] == ''
+                    else x['词分类'], axis=1
+                )
             else:
                 df['词分类'] = df['词名字/词包名字'].apply(lambda x: self.ret_keyword(keyword=str(x), as_file=False))
             # df.to_csv('/Users/xigua/Downloads/test.csv', index=False, header=True, encoding='utf-8_sig')
@@ -1449,6 +1454,7 @@ class GroupBy:
             return pd.DataFrame({})
 
     def ret_keyword(self, keyword, as_file=False):
+        """ 推广关键词报表，关键词分类， """
         datas = [
             {
                 '类别': '品牌词',
@@ -1485,6 +1491,12 @@ class GroupBy:
                     '智选',
                 ]
             },
+            {
+                '类别': '智能',
+                '值': [
+                    '智能',
+                ]
+            },
             {
                 '类别': '年份',
                 '值': [
@@ -1509,6 +1521,12 @@ class GroupBy:
                     '冬',
                 ]
             },
+            {
+                '类别': '一键起量',
+                '值': [
+                    '一键起量',
+                ]
+            },
             {
                 '类别': '款式',
                 '值': [
@@ -1560,7 +1578,6 @@ class GroupBy:
                     '老花',
                     '包包',
                     '通勤',
-                    '高级感',
                     '轻奢',
                     '包',
                     '新款',
@@ -1570,6 +1587,14 @@ class GroupBy:
                     '精致',
                     '奢侈',
                     '袋',
+                    '腰带',
+                    '裤带',
+                    '女士',
+                    '复古',
+                    '高级',
+                    '容量',
+                    '时尚',
+                    '商务',
                 ],
             },
         ]

{mdbq-2.4.0.dist-info → mdbq-2.4.2.dist-info}/METADATA

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

{mdbq-2.4.0.dist-info → mdbq-2.4.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ mdbq/aggregation/aggregation.py,sha256=CS_gMBwPKQo7uId8BrsYNTjtCZKzRVV7gT4PfE2Q4
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=Wis40oL04M7E1pkvgNPjyVFAUe-zgjimjIVAikxYY8Y,4418
-mdbq/aggregation/query_data.py,sha256=pPRVYILlkrINQex1pEzYyYk9vETr1trcUjmtRSMDlOY,95196
+mdbq/aggregation/query_data.py,sha256=b-beZv7JHMUe7jK0wr-cNClMVYOop3meb1fAGSadfIQ,96001
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
@@ -41,7 +41,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=Olq7IJP9itM4wuNxZeHOG-Q3i8wWyB4hY8TUGGwCvQ0,14104
-mdbq-2.4.0.dist-info/METADATA,sha256=0jmVpU_v3934UFKNk4UPV1uNw4uFEs0mi2IHZBlBBEY,245
-mdbq-2.4.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.4.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.4.0.dist-info/RECORD,,
+mdbq-2.4.2.dist-info/METADATA,sha256=eWoyYl2-G_Dxp_d_FEyYMYrm5YCGLzHsi-dcT98B9kQ,245
+mdbq-2.4.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-2.4.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.4.2.dist-info/RECORD,,