mdbq 1.4.2__tar.gz → 1.4.4__tar.gz

{mdbq-1.4.2 → mdbq-1.4.4}/PKG-INFO

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

{mdbq-1.4.2 → mdbq-1.4.4}/mdbq/aggregation/aggregation.py

@@ -366,6 +366,8 @@ class DatabaseUpdate:
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                 elif name.endswith('.csv') and '类目洞察_价格分析_分析明细_汇总' in name:
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
+                elif name.endswith('.csv') and '搜索排行_搜索' in name:
+                    df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                 elif name.endswith('.csv') and '竞店分析-销售分析-关键指标对比' in name:
                     df = pd.read_csv(os.path.join(root, name), encoding='utf-8_sig', header=0, na_filter=False)
                 elif name.endswith('.csv') and '竞店分析-销售分析-top商品榜' in name:

{mdbq-1.4.2 → mdbq-1.4.4}/mdbq/aggregation/optimize_data.py

@@ -109,4 +109,4 @@ def op_data(db_name_lists, service_databases=None, days: int = 63):
 
 
 if __name__ == '__main__':
-    op_data(service_databases=[{'home_lx': 'mysql'}], days=3650)
+    op_data(db_name_lists=['聚合数据'], service_databases=[{'company': 'mysql'}], days=3650)

{mdbq-1.4.2 → mdbq-1.4.4}/mdbq/clean/data_clean.py

@@ -1046,6 +1046,9 @@ class DataClean:
                 elif name.endswith('.csv') and '类目洞察' in name and '价格分析_分析明细_商品发现' in name:
                     t_path = str(pathlib.Path(self.source_path, '市场数据/类目洞察/价格分析/商品发现'))
                     bib(t_path, _as_month=True)
+                elif name.endswith('.csv') and '搜索排行_搜索' in name:
+                    t_path = str(pathlib.Path(self.source_path, '市场数据/搜索排行'))
+                    bib(t_path, _as_month=True)
                 elif name.endswith('.csv') and '市场排行_店铺排行' in name:
                     t_path = str(pathlib.Path(self.source_path, '市场数据/市场二级类目店铺'))
                     bib(t_path, _as_month=True)

{mdbq-1.4.2 → mdbq-1.4.4}/mdbq/company/copysh.py

@@ -289,7 +289,7 @@ class UpdateMysql:
             return False, self.d_path
 
 
-def op_data(days: int =3650):
+def op_data(days: int =100):
 
     # 清理数据库， 除了 聚合数据
     if socket.gethostname() == 'company':  # 公司台式机自身运行
@@ -322,11 +322,11 @@ def op_data(days: int =3650):
                 '属性设置2',
                 # '聚合数据',  # 不在这里清理聚合数据, 还未开始聚合呢
             ],
-            days=3650,
+            days=days,
         )
 
         # 数据聚合
-        query_data.data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=1, system_name='home_lx')
+        query_data.data_aggregation(service_databases=[{'home_lx': 'mysql'}], months=3, system_name='home_lx')
         time.sleep(60)
 
         # 清理聚合数据
@@ -352,7 +352,7 @@ def main():
             w = update_conf.UpdateConf()
             w.update_config(filename='.copysh_conf', option='ch_record', new_value='False')
             time.sleep(60)
-            op_data(days=3650)  # 数据清理和聚合
+            op_data(days=100)  # 数据清理和聚合
 
         t.sleep_minutes = 30  # 同步前休眠时间
         t.tb_file()

{mdbq-1.4.2 → mdbq-1.4.4}/mdbq.egg-info/PKG-INFO

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

{mdbq-1.4.2 → mdbq-1.4.4}/setup.py

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