mdbq 2.1.8__tar.gz → 2.2.0__tar.gz

{mdbq-2.1.8 → mdbq-2.2.0}/PKG-INFO

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

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq/aggregation/aggregation.py

@@ -88,7 +88,7 @@ class DatabaseUpdate:
                 df = pd.DataFrame()  # 初始化 df
                 encoding = self.get_encoding(file_path=os.path.join(root, name))  # 用于处理 csv 文件
                 tg_names = [
-                    '账户报表',  # 旧版，后来改成 营销场景报表了，C 店还是旧版
+                    # '账户报表',  # 旧版，后来改成 营销场景报表了，C 店还是旧版
                     '营销场景报表',
                     '计划报表',
                     '单元报表',

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq/aggregation/query_data.py

@@ -557,11 +557,14 @@ class MysqlDatasQuery:
 
         df_tb = self.download.data_to_df(
             db_name='推广数据_淘宝店',
-            table_name='账户报表',
+            table_name='营销场景报表',
             start_date=start_date,
             end_date=end_date,
             projection=projection,
         )
+        # print(df_tb)
+        # df_tm.to_csv('/Users/xigua/Downloads/test2.csv', index=False, header=True, encoding='utf-8_sig')
+        # df_tb.to_csv('/Users/xigua/Downloads/test.csv', index=False, header=True, encoding='utf-8_sig')
         df_tb.rename(columns={'场景名字': '营销场景'}, inplace=True)
         df_tb = df_tb.groupby(
             ['日期', '营销场景', '花费'],

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq/company/copysh.py

@@ -257,14 +257,15 @@ class TbFiles:
         files = os.listdir(excel_path)
         r = refresh_all.RefreshAll()
         for file in files:
-            if file.endswith('.xlsx'):
-                # now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                # print(f'{now}正在刷新 excel: {file}')
-                r.refresh_excel2(excel_file=os.path.join(excel_path, file))
-            time.sleep(10)
+            if '~' in file or 'DS_Store' in file or 'baidu' in file or 'xunlei' in name:
+                continue
+            if file.endswith('.xlsx') or file.endswith('.xls'):
+                r.refresh_excel(file=file)
+            time.sleep(5)
 
-        excel_file = f'\\\\190.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新\\WLM 周报-模版V1.xlsx'
-        r.refresh_excel2(excel_file=excel_file)
+        # 临时加的
+        excel_file = f'\\\\192.168.1.198\\时尚事业部\\01.运营部\\0-电商周报-每周五更新\\WLM 周报-模版V1.xlsx'
+        r.refresh_excel(file=excel_file)
 
         self.before_max_time = self.check_change()  # 重置值, 避免重复同步
 
@@ -403,4 +404,3 @@ if __name__ == '__main__':
     main()
     # # 聚合数据，并清理聚合数据
     # query_data.data_aggregation(service_databases=[{'company': 'mysql'}], months=1)
-

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq/mysql/s_query.py

@@ -79,6 +79,7 @@ class QueryDatas:
                 else:  # 没有指定获取列，且数据表也没有日期列，则返回全部列的全部数据
                     all_col = ', '.join([f"`{item}`" for item in cols_exist if item != 'id'])
                     sql = f"SELECT %s FROM `%s`.`%s`" % (all_col, db_name, table_name)
+            # print(sql)
             cursor.execute(sql)
             rows = cursor.fetchall()  # 获取查询结果
             columns = [desc[0] for desc in cursor.description]

mdbq-2.2.0/mdbq/pbix/refresh_all.py

@@ -0,0 +1,152 @@
+import os
+import sys
+import win32com.client
+import time
+import psutil
+from pywinauto.application import Application
+import warnings
+# from mdbq.config import set_support
+
+warnings.filterwarnings('ignore')
+# top_path = os.path.realpath(os.path.dirname(sys.argv[0]))  # 程序运行目录, 打包时使用
+# sys.path.append(top_path)
+
+
+class RefreshAll:
+    def __init__(self):
+        # self.my_conf = os.path.join(set_support.SetSupport(dirname='support').dirname, '.my_conf')
+        # self.file = None
+        self.procname = 'PBIDesktop.exe'
+
+    def refresh_pbix(self, file):
+        # 刷新 PBI
+        if not os.path.isfile(file):
+            print(f'{file} ->  文件不存在')
+            return
+        # with open(self.pbix_path, 'r', encoding='utf-8') as f:
+        #     content = f.readlines()
+        #     content = [item.strip() for item in content if not item.strip().startswith('#') and not item.strip().startswith('[')]
+        #     pbix_list = [item for item in content if item]
+
+        # if not pbix_list:
+        #     return
+        # for filename in pbix_list:
+        if not file.endswith('.pbix'):
+            return
+
+        """刷新程序"""
+        for es in range(4):
+            try:
+                print(f'正在刷新 >>>{file}')
+                self.pbi(path=file)
+                print('文件已刷新!')
+                break
+            except Exception as e:
+                print(e)
+                print('报错的文件 >>>' + file + ' >> ' + str(es + 1))
+
+    def refresh_excel(self, file):
+        # 刷新 excel
+        if not os.path.isfile(file):
+            print(f'{file} ->  文件不存在')
+            return
+        if not file.endswith('.xlsx') and not file.endswith('.xls'):
+            return
+
+        # with open(self.excel_path, 'r', encoding='utf-8') as f:
+        #     content = f.readlines()
+        #     content = [item.strip() for item in content if not item.strip().startswith('#')]
+        #     excel_list = [item for item in content if item]
+        #
+        # if not excel_list:
+        #     return
+        try:
+            print(f'正在刷新 >>>{file}')
+            xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
+            xlapp.Visible = False  # 窗口是否可见
+            xlapp.DisplayAlerts = False  # 是否显示警告信息
+            wb = xlapp.Workbooks.Open(file)
+            conjuncts = wb.Connections.Count  # 统计工作簿含有多少外部链接
+            if conjuncts == 0:
+                wb.Close(SaveChanges=False)
+                xlapp.Quit()
+            else:
+                time.sleep(2)
+                wb.RefreshAll()
+                xlapp.CalculateUntilAsyncQueriesDone()
+                time.sleep(2)
+                wb.Save()
+                wb.Close(SaveChanges=True)
+                xlapp.Quit()
+            print('文件已刷新!')
+        except Exception as e:
+            print(file, e)
+
+
+    def pbi(self, path, _timeout=300):
+        """
+        会被 refresh_pbix 函数调用
+        这是原本属于独立的库模块:  pbix_refresh
+        path: pbi文件路径
+        _timeout: 刷新等待时间
+        如果连接失败，请将 power bi 文件名的特殊字符(空格等)去掉或改为英文文件名试试
+        """
+        # 关闭已打开的 power bi进程
+        for proc in psutil.process_iter():
+            if proc.name() == self.procname:
+                proc.kill()
+        time.sleep(1)
+
+        # 启动 Power bi
+        os.system('start "" "' + path + '"')
+        time.sleep(5)
+
+        # 通过 connect 方法连接进程
+        app = Application(backend='uia').connect(path=self.procname)
+        # title_re可以通过正则表达式连接：".*Power BI Desktop", 仅限 2023年9月之前的 Power bi版本
+        # 2023年10月之后的版本没有此窗口后缀, 因此需用文件名找窗口
+        # 如果同时打开了其他同名的文件（非 power bi文件时）, 可能会引发错误
+        _filename = os.path.splitext(os.path.basename(path))[0]  # 文件名不含后缀
+        win = app.window(title_re=f'{_filename}.*?')  # 连接 pbi 窗口
+        time.sleep(10)
+        # win.print_control_identifiers()  # 打印窗口全部信息, 推荐使用 inspect 开发工具查询窗口句柄信息
+        num = 0
+        while True:
+            try:
+                win['刷新'].wait("enabled", timeout=_timeout)
+                time.sleep(3)
+                win['刷新'].click()
+                break
+            except:
+                print(f'{path}, 未识别窗口句柄, 连接超时')
+                num += 1
+                if num > 1:
+                    break
+
+        num = 0
+        while True:
+            try:
+                win['保存'].wait("enabled", timeout=_timeout)  # timeout 通过"保存"按键状态, 等待刷新窗口关闭, 时间不要设置太短
+                time.sleep(3)
+                win['保存'].click()
+                break
+            except:
+                print(f'{path}, 未识别窗口句柄, 文件未保存')
+                num += 1
+                if num > 1:
+                    break
+        # win.type_keys("^s")
+        win.wait("enabled", timeout=15)
+        win.close()
+
+        # 关闭进程
+        for proc in psutil.process_iter():
+            if proc.name() == self.procname:
+                proc.kill()
+
+
+if __name__ == '__main__':
+    # r = RefreshAll()
+    # # r.refresh_pbix()
+    # r.refresh_excel()
+    pass

mdbq-2.1.8/mdbq/pbix/refresh_all.py → mdbq-2.2.0/mdbq/pbix/refresh_all_old.py

@@ -171,7 +171,7 @@ class RefreshAll:
 
 
 if __name__ == '__main__':
-    r = RefreshAll()
-    # r.refresh_pbix()
-    r.refresh_excel()
+    # r = RefreshAll()
+    # # r.refresh_pbix()
+    # r.refresh_excel()
     pass

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq.egg-info/PKG-INFO

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

{mdbq-2.1.8 → mdbq-2.2.0}/mdbq.egg-info/SOURCES.txt

@@ -42,4 +42,5 @@ mdbq/other/ua_sj.py
 mdbq/pbix/__init__.py
 mdbq/pbix/pbix_refresh.py
 mdbq/pbix/refresh_all.py
+mdbq/pbix/refresh_all_old.py
 mdbq/spider/__init__.py

{mdbq-2.1.8 → mdbq-2.2.0}/setup.py

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