mdbq 4.0.27__py3-none-any.whl → 4.0.29__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '4.0.27'
+VERSION = '4.0.29'

mdbq/aggregation/query_data.py

@@ -3709,7 +3709,7 @@ if __name__ == '__main__':
         username=username, 
         password=password, 
         host=host, 
-        port=port,
+        port=int(port),
         pool_size=10,
         )
     sdq = MysqlDatasQuery(download_manager=download_manager) 

mdbq/mysql/deduplicator.py

@@ -95,7 +95,7 @@ class MySQLDeduplicator:
         self.pool = PooledDB(
             creator=pymysql,
             host=host,
-            port=port,
+            port=int(port),
             user=username,
             password=password,
             charset=charset,
@@ -1363,7 +1363,7 @@ def main():
         username=username,
         password=password,
         host=host,
-        port=port,
+        port=int(port),
         max_workers= 2,
         batch_size=1000,
         skip_system_dbs=True,

mdbq/mysql/s_query.py

@@ -60,7 +60,7 @@ class QueryDatas:
         self.username = username
         self.password = password
         self.host = host
-        self.port = port
+        self.port = int(port)
         self.charset = charset
         self.collation = collation
         self.max_retries = max_retries
@@ -999,7 +999,7 @@ def main():
     )
     host = 'localhost'
     
-    qd = QueryDatas(username=username, password=password, host=host, port=port)
+    qd = QueryDatas(username=username, password=password, host=host, port=int(port))
     df = qd.data_to_df('聚合数据', '店铺流量来源构成', limit=10)
     print(df)
 

mdbq/mysql/unique_.py

@@ -29,7 +29,7 @@ class UniqueManager:
         self.username = username
         self.password = password
         self.host = host
-        self.port = port
+        self.port = int(port)
         self.pool = PooledDB(
             creator=pymysql,
             maxconnections=10,
@@ -371,7 +371,7 @@ def main():
         username=username,
         password=password,
         host=host,
-        port=port
+        port=int(port)
     )
     manager.add_unique(my_databases)
 

mdbq/mysql/uploader.py

@@ -112,7 +112,7 @@ class MySQLUploader:
         self.username = username
         self.password = password
         self.host = host
-        self.port = port
+        self.port = int(port)
         self.charset = charset
         self.collation = collation
         self.max_retries = max(max_retries, 1)
@@ -1751,7 +1751,7 @@ def main():
         username=username,
         password=password,
         host=host,
-        port=port,
+        port=int(port),
     )
 
     # 定义列和数据类型

mdbq/other/download_sku_picture.py

@@ -54,7 +54,7 @@ host, port, username, password = parser.get_section_values(
     section='mysql',
     keys=['host', 'port', 'username', 'password'],
 )
-m_engine = mysql.MysqlUpload(username=username, password=password, host=host, port=port, charset='utf8mb4')
+m_engine = mysql.MysqlUpload(username=username, password=password, host=host, port=int(port), charset='utf8mb4')
 
 if not username:
     print(f'找不到主机：')
@@ -119,6 +119,12 @@ class LoadAccount:
             os.environ["webdriver.chrome.driver"] = chrome_path
             # option.binary_location = chrome_path  # Macos 设置此参数报错
             service = Service(chromedriver_path)
+        elif platform.system().lower() == 'linux':
+            # ubuntu
+            chrome_path = '/usr/bin/google-chrome'
+            chromedriver_path = '/usr/local/bin/chromedriver'
+            # option.binary_location = chrome_path  # macOS 设置此参数有效
+            service = Service(chromedriver_path)
         else:
             chrome_path = '/usr/local/chrome/Google Chrome for Testing.app'
             chromedriver_path = '/usr/local/chrome/chromedriver'
@@ -515,7 +521,7 @@ class DownloadPicture():
         # target_service 从哪个服务器下载数据
         self.months = 0  # 下载几个月数据, 0 表示当月, 1 是上月 1 号至今
         # 实例化一个下载类
-        self.download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
+        self.download = s_query.QueryDatas(username=username, password=password, host=host, port=int(port))
         self.df = pd.DataFrame()
         self.headers = {'User-Agent': ua_sj.get_ua()}
         self.save_path = None
@@ -811,7 +817,7 @@ def main(service_name, database):
         tb_driver2.quit()
 
         # s.df.to_csv('/Users/xigua/Downloads/test.csv', encoding='utf-8_sig', index=False, header=True)
-        m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+        m = mysql.MysqlUpload(username=username, password=password, host=host, port=int(port))
         m.df_to_mysql(
             df=s.df,
             db_name='属性设置2',
@@ -847,7 +853,7 @@ def main3():
 def download_sku(service_name='company', database='mysql', db_name='属性设置2', table_name='商品素材下载记录', col_name='sku图片链接'):
     """ 从数据库中获取商品id信息 """
     # 实例化一个下载类
-    download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
+    download = s_query.QueryDatas(username=username, password=password, host=host, port=int(port))
     projection = {
         '宝贝id': 1,
         '商家编码': 1,
@@ -890,7 +896,7 @@ def download_sku(service_name='company', database='mysql', db_name='属性设置
         tb_driver2.quit()
 
         # 回传数据库
-        m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+        m = mysql.MysqlUpload(username=username, password=password, host=host, port=int(port))
         m.df_to_mysql(
             df=s.df,
             db_name=db_name,
@@ -929,7 +935,7 @@ def download_sku(service_name='company', database='mysql', db_name='属性设置
     df['获取与下载'] = df.apply(lambda x: '已下载' if x['sku编码'] in d.finish_download else x['获取与下载'], axis=1)
 
     # 回传数据库
-    m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+    m = mysql.MysqlUpload(username=username, password=password, host=host, port=int(port))
     m.df_to_mysql(
         df=df,
         db_name=db_name,
@@ -946,7 +952,7 @@ def download_spu(username, password, host, port, heads=0, col_name='白底图',
     从 属性设置 3 ->  商品sku属性 数据库中提取图片地址，下载图片
     col_name： 从那一列提取图片下载地址 ，， 白底图
     """
-    download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
+    download = s_query.QueryDatas(username=username, password=password, host=host, port=int(port))
     projection = {
         '日期': 1,
         '店铺名称': 1,
@@ -983,7 +989,7 @@ if __name__ == '__main__':
         username=username,
         password=password,
         host=host,
-        port=port,
+        port=int(port),
         heads=100,
         col_name='白底图',
         save_path=os.path.join(upload_path, '商品id_商家编码_图片'),

mdbq/spider/aikucun.py

@@ -125,6 +125,12 @@ class AikuCun:
             os.environ["webdriver.chrome.driver"] = chrome_path
             # option.binary_location = chrome_path  # Macos 设置此参数报错
             service = Service(chromedriver_path)
+        elif platform.system().lower() == 'linux':
+            # ubuntu
+            chrome_path = '/usr/bin/google-chrome'
+            chromedriver_path = '/usr/local/bin/chromedriver'
+            # option.binary_location = chrome_path  # macOS 设置此参数有效
+            service = Service(chromedriver_path)
         else:
             chrome_path = '/usr/local/chrome/Google Chrome for Testing.app'
             chromedriver_path = '/usr/local/chrome/chromedriver'

{mdbq-4.0.27.dist-info → mdbq-4.0.29.dist-info}/METADATA

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

{mdbq-4.0.27.dist-info → mdbq-4.0.29.dist-info}/RECORD

@@ -1,20 +1,20 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=BLG9qI65B4G2SR9uwnNZDJXbyRfkGwa15Y-2HC-0wj4,18
+mdbq/__version__.py,sha256=N6OMK2hTXcxeW1DcfsoVg7tObrrdr9odN7ny5aMYKew,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/query_data.py,sha256=3lvLLy1sEn5ctf4FRacFvWF-J3isK5siOSItGXmCCrg,166877
+mdbq/aggregation/query_data.py,sha256=UWwVcpOo9Ro6u9VtXcr8T8Hdh8Atem4yjO4wCsvcOTw,166882
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
 mdbq/log/mylogger.py,sha256=9w_o5mYB3FooIxobq_lSa6oCYTKIhPxDFox-jeLtUHI,21714
 mdbq/myconf/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/myconf/myconf.py,sha256=GR250mf2KKImRUamPM2TEi9no_65tR4uKXn7eHNCAmg,31205
 mdbq/myconf/myconf_bak.py,sha256=39tLUBVlWQZzQfrwk7YoLEfipo11fpwWjaLBHcUt2qM,33341
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/deduplicator.py,sha256=kAnkI_vnN8CchgDQAFzeh0M0vLXE2oWq9SfDPNZZ3v0,73215
+mdbq/mysql/deduplicator.py,sha256=0cyGZIHqWM1ELCPrepLtb51jludzvKMIeWFV7jPuIp4,73225
 mdbq/mysql/mysql.py,sha256=pDg771xBugCMSTWeskIFTi3pFLgaqgyG3smzf-86Wn8,56772
-mdbq/mysql/s_query.py,sha256=UqmR592HAFzQ5mwArHisd8HFUFiNa2HJuwiIbh8N8n8,44995
-mdbq/mysql/unique_.py,sha256=eA0RHGobXsMJtImMW1QvhrmguzJOYz5pX9vOA1G-gxQ,21117
-mdbq/mysql/uploader.py,sha256=f1wxouaQk3narxFQ4XiAtlA0LTX_WSz3qXTkn7m_tQQ,81141
+mdbq/mysql/s_query.py,sha256=nByjtk5G18zgpomldb_5xDUAwBPXyXAcV1zvq5vkM_4,45005
+mdbq/mysql/unique_.py,sha256=XHDBiY-zF_Hmt28Jf-xh3E-_sIWoJCxdi2dOAfnAyQ0,21127
+mdbq/mysql/uploader.py,sha256=jW4aHm3kvt3EJ4tgnMl2fRPLY06VWaBv8JI5LSSMVzE,81151
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/other/download_sku_picture.py,sha256=L-inWl2bGNqNEpl5I2yyATzwYtYmObzM14cbiQedk8w,44758
+mdbq/other/download_sku_picture.py,sha256=EBRgO4L4k1AoCLehtCY_DvjUlYUNj_9CcePnsSKjx5Q,45114
 mdbq/other/otk.py,sha256=iclBIFbQbhlqzUbcMMoePXBpcP1eZ06ZtjnhcA_EbmE,7241
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
@@ -24,8 +24,8 @@ mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=vpBuNc22uj9Vr-_Dh25_wpwWM1e-072EAAIBdB_IpL0,23494
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq/spider/aikucun.py,sha256=juOqpr_dHeE1RyjCu67VcpzoJAWMO7FKv0i8KiH8WUo,21552
-mdbq-4.0.27.dist-info/METADATA,sha256=ho97HRTp4AqSe_HLBpN_L7b6MkBHmrNOqdggrG8CRwg,364
-mdbq-4.0.27.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-4.0.27.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-4.0.27.dist-info/RECORD,,
+mdbq/spider/aikucun.py,sha256=XptHjGzbout9IYzWAOQUpMMV5qEgLTU8pL1ZGt8oNEA,21868
+mdbq-4.0.29.dist-info/METADATA,sha256=QGDmHnUKdlYJhIYfFhdvf5mcVNTqr0SN_VBGYcoVDZg,364
+mdbq-4.0.29.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-4.0.29.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-4.0.29.dist-info/RECORD,,