mdbq 2.4.0__tar.gz → 2.4.1__tar.gz

{mdbq-2.4.0 → mdbq-2.4.1}/PKG-INFO

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

{mdbq-2.4.0 → mdbq-2.4.1}/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:
                     '智选',
                 ]
             },
+            {
+                '类别': '智能',
+                '值': [
+                    '智能',
+                ]
+            },
             {
                 '类别': '年份',
                 '值': [

{mdbq-2.4.0 → mdbq-2.4.1}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.4.0 → mdbq-2.4.1}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='2.4.0',
+      version='2.4.1',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbsql',