mdbq 3.7.8__py3-none-any.whl → 3.7.10__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -5,7 +5,6 @@ from mdbq.mysql import mysql
 from mdbq.mysql import s_query
 from mdbq.aggregation import optimize_data
 from mdbq.config import products
-from mdbq.config import set_support
 from mdbq.config import default
 import datetime
 from dateutil.relativedelta import relativedelta
@@ -21,11 +20,12 @@ import calendar
 import concurrent.futures
 import traceback
 import logging
+import sys
 
 """
 
 """
-error_file = os.path.join(set_support.SetSupport(dirname='support').dirname, 'error.log')
+dirname = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'support')
 m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
 logger = logging.getLogger(__name__)
 
@@ -42,7 +42,8 @@ class MysqlDatasQuery:
         self.update_service = True  # 调试时加，true: 将数据写入 mysql 服务器
         self.pf_datas = []
         self.pf_datas_jd = []  # 京东聚合销售表
-        self.output = set_support.SetSupport(dirname='support')
+        # self.output = set_support.SetSupport(dirname='support')
+        self.output = dirname
 
     @staticmethod
     def try_except(func):  # 在类内部定义一个异常处理方法
@@ -52,12 +53,6 @@ class MysqlDatasQuery:
                 return func(*args, **kwargs)
             except Exception as e:
                 logger.info(f'函数: {func.__name__}, 报错信息: {e}')  # 将异常信息返回
-                with open(error_file, 'a', encoding='utf-8') as f:
-                    now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                    f.write(f'\n{now}\n')
-                    # f.write(f'报错的文件:\n{e.__traceback__.tb_frame.f_globals["__file__"]}\n')  # 发生异常所在的文件
-                traceback.print_exc(file=open(error_file, 'a'))  # 返回完整的堆栈信息
-                logger.info(f'更多信息请查看日志文件: {error_file}')
 
         return wrapper
 

mdbq/config/default.py

@@ -1,5 +1,6 @@
 # -*- coding: UTF-8 –*-
 import os
+import sys
 import json
 import platform
 import getpass
@@ -7,12 +8,13 @@ import socket
 import logging
 from mdbq.mysql import mysql
 
-if platform.system() == 'Windows':
-    support_path = r'C:\数据中心2\support'
-elif platform.system() == 'Darwin':
-    support_path = f'/Users/{getpass.getuser()}/数据中心2/support'
-else:
-    support_path = '数据中心2/support'  # 没有用, 可以删
+# if platform.system() == 'Windows':
+#     support_path = r'C:\数据中心2\support'
+# elif platform.system() == 'Darwin':
+#     support_path = f'/Users/{getpass.getuser()}/数据中心2/support'
+# else:
+#     support_path = '数据中心2/support'  # 没有用, 可以删
+support_path = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'support')
 logger = logging.getLogger(__name__)
 
 

mdbq/config/set_support.py

@@ -2,22 +2,25 @@
 import platform
 import getpass
 import os
+import sys
 
 """
 专门用来设置 support 文件夹路径
 support 文件夹包含很多配置类文件，是程序必不可少的依赖
 """
+
+
 class SetSupport:
     def __init__(self, dirname):
-        self.dirname = dirname
-        if platform.system() == 'Windows':
-            self.dirname = f'C:\\数据中心2\\support'
-        elif platform.system() == 'Darwin':
-            self.dirname = f'/Users/{getpass.getuser()}/数据中心2/support'
-        else:
-            self.dirname = '数据中心2/support'  # 没有用, 可以删
-        if not os.path.isdir(self.dirname):
-            os.mkdir(self.dirname)
+        self.dirname = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), dirname)
+        # if platform.system() == 'Windows':
+        #     self.dirname = f'C:\\数据中心2\\support'
+        # elif platform.system() == 'Darwin':
+        #     self.dirname = f'/Users/{getpass.getuser()}/数据中心2/support'
+        # else:
+        #     self.dirname = '数据中心2/support'  # 没有用, 可以删
+        # if not os.path.isdir(self.dirname):
+        #     os.mkdir(self.dirname)
 
 
 if __name__ == '__main__':

mdbq/log/spider_logging.py

@@ -2,6 +2,7 @@ import logging
 from logging.handlers import RotatingFileHandler
 import platform
 import os
+import sys
 import getpass
 
 
@@ -9,15 +10,16 @@ def setup_logging(reMoveOldHandler=True):
     """
     reMoveOldHandler: 替换根日志记录器的所有现有处理器
     """
-    if platform.system() == 'Windows':
-        from mdbq.pbix import refresh_all
-        D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
-    elif platform.system() == 'Linux':
-        D_PATH = 'Downloads'
-        if not os.path.exists(D_PATH):
-            os.makedirs(D_PATH)
-    else:
-        D_PATH = os.path.join(f'/Users/{getpass.getuser()}/Downloads')
+    # if platform.system() == 'Windows':
+    #     from mdbq.pbix import refresh_all
+    #     D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
+    # elif platform.system() == 'Linux':
+    #     D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
+    #     if not os.path.exists(D_PATH):
+    #         os.makedirs(D_PATH)
+    # else:
+    #     D_PATH = os.path.join(f'/Users/{getpass.getuser()}/Downloads')
+    D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])))
 
     if not os.path.isdir(os.path.join(D_PATH, 'logfile')):
         os.makedirs(os.path.join(D_PATH, 'logfile'))

mdbq/mysql/mysql.py

@@ -13,7 +13,6 @@ import pandas as pd
 from sqlalchemy import create_engine
 import os
 import calendar
-from mdbq.config import set_support
 from mdbq.config import myconfig
 import traceback
 import logging
@@ -29,7 +28,6 @@ warnings.filterwarnings('ignore')
 3. 小数必须使用 decimal, 禁止 float 和 double, 因为计算精度差异，后续需要聚合数据时会引发很多问题
 
 """
-error_file = os.path.join(set_support.SetSupport(dirname='support').dirname, 'error.log')
 logger = logging.getLogger(__name__)
 
 
@@ -122,13 +120,6 @@ class MysqlUpload:
                 return func(*args, **kwargs)
             except Exception as e:
                 logger.error(f'{func.__name__}, {e}')  # 将异常信息返回
-                with open(error_file, 'a', encoding='utf-8') as f:
-                    now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                    f.write(f'\n{now} \n')
-                    f.write(f'函数注释内容(用于定位函数): {func.__doc__} \n')
-                    # f.write(f'报错的文件:\n{e.__traceback__.tb_frame.f_globals["__file__"]}\n')  # 发生异常所在的文件
-                traceback.print_exc(file=open(error_file, 'a'))  # 返回完整的堆栈信息
-                logger.error(f'更多信息请查看日志文件: {error_file}')
 
         return wrapper
 
@@ -1434,13 +1425,6 @@ class OptimizeDatas:
                 return func(*args, **kwargs)
             except Exception as e:
                 logger.error(f'{func.__name__}, {e}')  # 将异常信息返回
-                with open(error_file, 'a') as f:
-                    now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-                    f.write(f'\n{now} \n')
-                    f.write(f'函数注释内容(用于定位函数): {func.__doc__} \n')
-                    # f.write(f'报错的文件:\n{e.__traceback__.tb_frame.f_globals["__file__"]}\n')  # 发生异常所在的文件
-                traceback.print_exc(file=open(error_file, 'a'))  # 返回完整的堆栈信息
-                logger.error(f'更多信息请查看日志文件: {error_file}')
 
         return wrapper
 

mdbq/other/download_sku_picture.py

@@ -44,7 +44,7 @@ elif platform.system() == 'Darwin':
     D_PATH = os.path.normpath(f'/Users/{getpass.getuser()}/Downloads')
     Share_Path = os.path.normpath('/Volumes/时尚事业部/01.运营部/天猫报表')  # 共享文件根目录
 else:
-    D_PATH = 'Downloads'
+    D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
     Share_Path = ''
 upload_path = os.path.join(D_PATH, '数据上传中心')  # 此目录位于下载文件夹，将统一上传百度云备份
 if not os.path.exists(upload_path):  # 数据中心根目录

mdbq/redis/getredis.py

@@ -1,5 +1,6 @@
 # -*- coding: UTF-8 –*-
 import os.path
+import sys
 import random
 import redis
 import socket
@@ -20,7 +21,9 @@ import orjson
 if platform.system() == 'Windows':
     D_PATH = os.path.join(f'C:\\Users\\{getpass.getuser()}\\Downloads')
 else:
-    D_PATH = os.path.join(f'/Users/{getpass.getuser()}/Downloads')
+    D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
+    if not os.path.exists(D_PATH):
+        os.makedir(D_PATH)
 
 m_engine, username, password, host, port = default.get_mysql_engine(platform='Windows', hostname='xigua_lx', sql='mysql', local='remoto', config_file=None)
 

mdbq/spider/aikucun.py

@@ -3,6 +3,7 @@ import datetime
 import getpass
 import json
 import os
+import sys
 import pathlib
 import platform
 import re
@@ -30,7 +31,7 @@ if platform.system() == 'Windows':
     # windows版本
     D_PATH = str(pathlib.Path(f'C:\\Users\\{getpass.getuser()}\\Downloads'))
 elif platform.system() == 'Linux':
-    D_PATH = 'Downloads'
+    D_PATH = os.path.join(os.path.realpath(os.path.dirname(sys.argv[0])), 'Downloads')
     if not os.path.exists(D_PATH):
         os.makedirs(D_PATH)
 else:

{mdbq-3.7.8.dist-info → mdbq-3.7.10.dist-info}/METADATA

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

{mdbq-3.7.8.dist-info → mdbq-3.7.10.dist-info}/RECORD

@@ -3,39 +3,38 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/datashow_bak.py,sha256=1AYSIDkdUx-4as1Ax2rPj0cExM9d-qFMrFYLAaPHNuk,54962
 mdbq/aggregation/optimize_data.py,sha256=ZR6iXO25EMWyiy-oy_T8H8K9xA8q1ecC8gmUbOqJOOc,910
-mdbq/aggregation/query_data.py,sha256=wYsBTRx6vmZ-dKQRdl_pnOPcI2djyIIb92MOUy097E0,174930
+mdbq/aggregation/query_data.py,sha256=jGKnHm9vRlKCZeIdP15lgpASKaQgoQjPZyd2IsTJY6k,174426
 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
-mdbq/config/default.py,sha256=3IGc4aVuoL6sZh7xkM0GUXwHJD3-HCfYTnb1Q5ZL1UM,4976
+mdbq/config/default.py,sha256=tbfjR5lMkvNmwdivtnBxnKVqH5PwFpPM9jaZ9JIOkv4,5088
 mdbq/config/myconfig.py,sha256=Akt-7KqSUBdoHQa4_Mw6YC4pA75219d-21iDO30iaD8,894
 mdbq/config/products.py,sha256=FbBIqmyaiq9h03FIeE9W2bwbLm2_5pr6xyzPV-u7Ges,5689
-mdbq/config/set_support.py,sha256=JDrYtH-YYSFAfEEJkiTro1Vhk0IlixtJSUjeZAtOpVk,783
+mdbq/config/set_support.py,sha256=eM2scqDzGNR2kkbYmguRB2ucrqeX0KMh5OMIaGsLem4,877
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
 mdbq/dataframe/converter.py,sha256=lETYhT7KXlWzWwqguqhk6vI6kj4rnOBEW1lhqKy2Abc,5035
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
-mdbq/log/spider_logging.py,sha256=CzQIflfbMSBSBjHSO3fEhcG9Oiyj6cR-YU0tObMMyxM,1975
+mdbq/log/spider_logging.py,sha256=cTI9BHePz9Q4QThc_OBxTLqX5tF9iPwIQ-dASpf6zCA,2142
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=YgmSLkwjIUpjiGH3S-bTiaJCKe8As0WvHDOS6_ePyYs,98591
+mdbq/mysql/mysql.py,sha256=SY_1UxoB_fQoPTsQeBbThHDsHFAK5Jr7csbzE8z3GPg,97303
 mdbq/mysql/s_query.py,sha256=pj5ioJfUT81Su9S-km9G49gF5F2MmXXfw_oAIUzhN28,8794
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/other/download_sku_picture.py,sha256=B5WA2-CQds2l36w4gLs1cgqzWqC1mbQTozqwb3vUQh0,44656
+mdbq/other/download_sku_picture.py,sha256=uMC6H7SVEFj3cuS8IJNPOY3v4oJVtGOE-vb2XJ7Q0tM,44718
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
-mdbq/other/sku_picture_bak.py,sha256=JwSXYlzamVqcKCD2tRH2VqYVZNr8fM6f--kcGlTVRnM,50026
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
-mdbq/redis/getredis.py,sha256=oyFwE-8c6uErSGYNIO0z2ng93mH0zstRLD86MWqF6M8,25636
+mdbq/redis/getredis.py,sha256=8ONSVHEeEY6C68OxAMAR4jB-CtA3mZyd-v6vs94zlnU,25732
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=qMU29gb72OK8GLBD-zENo1EmxuojRnuPyEdk5S2KDKw,21767
-mdbq-3.7.8.dist-info/METADATA,sha256=odmK7bUzLBCtGzFtyzNQM6gXfcVhK2Er2qRI3OwuhzU,243
-mdbq-3.7.8.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-3.7.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.7.8.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=HK6x0MnpUN1jUSWnLQ_UEH2QSYcLFBGhhUBD3FVwrzY,21840
+mdbq-3.7.10.dist-info/METADATA,sha256=hP3J0cL11HuzjbHeMJ_UklVo6CdFmgpak3pw9XTWwPY,244
+mdbq-3.7.10.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mdbq-3.7.10.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.7.10.dist-info/RECORD,,