mdbq 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

mdbq/mysql/mysql.py

@@ -12,7 +12,7 @@ import pandas as pd
 from sqlalchemy import create_engine
 import os
 import calendar
-from mdbq.config import get_myconf
+from mdbq.config import myconfig
 from mdbq.config import set_support
 from mdbq.dataframe import converter
 from mdbq.aggregation import mysql_types
@@ -49,7 +49,7 @@ class MysqlUpload:
         self.port = port
         self.config = {
             'host': self.host,
-            'port': self.port,
+            'port': int(self.port),
             'user': self.username,
             'password': self.password,
             'charset': charset,  # utf8mb4 支持存储四字节的UTF-8字符集
@@ -69,7 +69,7 @@ class MysqlUpload:
         return wrapper
 
     @try_except
-    def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'home_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None, reset_id=False):
+    def df_to_mysql(self, df, table_name, db_name='远程数据源', icm_update=[], service_database={'xigua_lx': 'mysql'}, move_insert=False, df_sql=False, drop_duplicates=False, filename=None, count=None, json_path=None, reset_id=False):
         """
         将 df 写入数据库
         db_name: 数据库名称
@@ -185,13 +185,13 @@ class MysqlUpload:
 
             # print(cl, db_n, tb_n)
             # 返回这些结果的目的是等添加完列再写 json 文件才能读到 types 信息
-            # ⚠️ mysql_all_dtypes 函数默认只读取 home_lx 的数据库信息，不会读取其他系统
+            # ⚠️ mysql_all_dtypes 函数默认只读取 xigua_lx 的数据库信息，不会读取其他系统
             if cl and db_n and tb_n:
-                mysql_types.mysql_all_dtypes(service_database=service_database, db_name=db_name, table_name=table_name)  # 更新一个表的 dtypes
+                mysql_types.mysql_all_dtypes(db_name=db_name, table_name=table_name)  # 更新一个表的 dtypes
             elif cl and db_n:
-                mysql_types.mysql_all_dtypes(service_database=service_database, db_name=db_name)  # 更新一个数据库的 dtypes
+                mysql_types.mysql_all_dtypes(db_name=db_name)  # 更新一个数据库的 dtypes
             elif cl:
-                mysql_types.mysql_all_dtypes(service_database=service_database)  # 更新所有数据库所有数据表的 dtypes 信息到本地 json
+                mysql_types.mysql_all_dtypes()  # 更新所有数据库所有数据表的 dtypes 信息到本地 json
 
             # 4. 更新插入数据
             now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ")
@@ -555,7 +555,7 @@ class OptimizeDatas:
         self.charset = charset
         self.config = {
             'host': self.host,
-            'port': self.port,
+            'port': int(self.port),
             'user': self.username,
             'password': self.password,
             'charset': self.charset,  # utf8mb4 支持存储四字节的UTF-8字符集
@@ -864,38 +864,8 @@ def year_month_day_bak(start_date, end_date):
     return results  # start_date至end_date之间的所有年月日
 
 
-def download_datas_bak(table_name, save_path, start_date):
-    username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
-    print(username, password, host, port)
-    m = MysqlUpload(username=username, password=password, host=host, port=port)
-    m.port = port
-    results = year_month_day(start_date=start_date, end_date='today')
-    # print(results)
-    for result in results:
-        start_date = result['起始日期']
-        end_date = result['结束日期']
-        # print(start_date, end_date)
-        df = m.read_mysql(db_name='天猫数据1', table_name=table_name, start_date=start_date, end_date=end_date)
-        if len(df) == 0:
-            continue
-        path = os.path.join(save_path, f'{table_name}_{str(start_date)}_{str(end_date)}.csv')
-        df['日期'] = df['日期'].apply(lambda x: re.sub(' .*', '', str(x)))
-        df.to_csv(path, index=False, encoding='utf-8_sig', header=True)
-
-
 if __name__ == '__main__':
-    username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
-    # print(username, password, host, port)
-    path = '/Users/xigua/Downloads/人群洞察.csv'
-    df = pd.read_csv(path, encoding='utf-8_sig', header=0, na_filter=False)
-    # print(df)
-    m = MysqlUpload(username=username, password=password, host=host, port=port)
-    m.df_to_mysql(
-        df=df,
-        db_name='test',
-        table_name='测试数据',
-        drop_duplicates=True,
-        # service_name=service_name,
-        # service_databases=service_databases,
-    )
-
+    conf = myconfig.main()
+    data = conf['Windows']['xigua_lx']['mysql']['local']
+    username, password, host, port = data['username'], data['password'], data['host'], data['port']
+    print(username, password, host, port)

mdbq/mysql/s_query.py

@@ -28,7 +28,7 @@ class QueryDatas:
         self.port = port
         self.config = {
             'host': self.host,
-            'port': self.port,
+            'port': int(self.port),
             'user': self.username,
             'password': self.password,
             'charset': charset,  # utf8mb4 支持存储四字节的UTF-8字符集
@@ -174,8 +174,9 @@ class QueryDatas:
 
 
 if __name__ == '__main__':
-    username, password, host, port = get_myconf.select_config_values(target_service='home_lx', database='mysql')
-    print(username, password, host, port)
+    conf = ConfigTxt()
+    data = conf.config_datas['Windows']['xigua_lx']['mysql']['remoto']
+    username, password, host, port = data['username'], data['password'], data['host'], data['port']
 
     q = QueryDatas(username, password, host, port)
     res = q.columns_to_list(db_name='视频数据', table_name='bilibili视频', columns_name=['视频bv号', '下载进度'])

{mdbq-2.7.0.dist-info → mdbq-2.7.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: mdbq
-Version: 2.7.0
-Home-page: https://pypi.org/project/mdbsql
+Version: 2.7.2
+Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com
 License: MIT

{mdbq-2.7.0.dist-info → mdbq-2.7.2.dist-info}/RECORD

@@ -1,23 +1,24 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
 mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
-mdbq/aggregation/aggregation.py,sha256=v_5VM-InaDDvDNjAy_b8xsc38-vf78GkqoXjoe6MZ8U,76569
+mdbq/aggregation/aggregation.py,sha256=XzTzG51QiUfOhcFYWAqTWKJrUX4kZvYq0n3TaajPXYo,76530
 mdbq/aggregation/df_types.py,sha256=U9i3q2eRPTDY8qAPTw7irzu-Tlg4CIySW9uYro81wdk,8125
-mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
-mdbq/aggregation/optimize_data.py,sha256=gdScrgTAb6RbXHZy1LitX7lggMGn1GTLhkYSgztfwew,4903
-mdbq/aggregation/query_data.py,sha256=gqvKDgg3jrfCcI1VudrnQLJgKHUThZVTqS1zOQ5wgMk,102766
+mdbq/aggregation/mysql_types.py,sha256=VPaDclx4twRZFfv4JYbsuwqzWWFnBLEPr00j1RvXWDI,10937
+mdbq/aggregation/optimize_data.py,sha256=ACm3EuaalP6fwTN2-pZCIwe8r_I52sV-CS_-W489JNE,3448
+mdbq/aggregation/query_data.py,sha256=-CFUdWq93Gla7dSVRWsefAxrwwQYt6J-8TXtSHKMFyU,98312
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
-mdbq/clean/clean_upload.py,sha256=X5WcWm7kkGZDMpk8p0vMq-SFIcrSL1DmVCYWbxYmLVI,86644
+mdbq/clean/clean_upload.py,sha256=PddjNTVEcsdSdtj10pUGz58RCKV2V94zD_oZqs1PgEk,83029
 mdbq/clean/data_clean.py,sha256=ucfslhqXVZoH2QaXHSAWDky0GhIvH9f4GeNaHg4SrFE,104790
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=3ZYm_rTE8nXcbgZlyHsa0y-RAkZ8vcmwkxMy_Jj4F2k,17574
+mdbq/company/copysh.py,sha256=sisL5eo3D5HGGYvRw46xGqnqFaI3SxfBnoa-Y7zknus,17541
 mdbq/company/copysh_bak.py,sha256=NvlXCBZBcO2GIT5nLRYYqhOyHWM1-1RE7DHvgbj6jmQ,19723
 mdbq/company/home_sh.py,sha256=42CZ2tZIXHLl2mOl2gk2fZnjH2IHh1VJ1s3qHABjonY,18021
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=cmNvsyoNa0RbZ9FOTjSd3jyyGwkxjUo0phvdHbGlrms,6010
-mdbq/config/products.py,sha256=hN9UMkM6j76HYMulTYdtr3mOhh9QdpvvrLH14a_mbFY,5980
+mdbq/config/myconfig.py,sha256=EGymTlAimtHIDJ9egCtOehBEPOj6rea504kvsEZu64o,854
+mdbq/config/products.py,sha256=Jewg5fdOlveu3RCM9cV5hXpQHZOdq_Xp1OBr0CEfINw,6005
 mdbq/config/set_support.py,sha256=xkZCX6y9Bq1ppBpJAofld4B2YtchA7fl0eT3dx3CrSI,777
 mdbq/config/update_conf.py,sha256=taL3ZqKgiVWwUrDFuaYhim9a72Hm4BHRhhDscJTziR8,4535
 mdbq/dataframe/__init__.py,sha256=2HtCN8AdRj53teXDqzysC1h8aPL-mMFy561ESmhehGQ,22
@@ -27,9 +28,9 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=v9qvrp6p1ZRWuPpbSilqveiE0FEcZF7U5xUPI0RN4xs,31880
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=9IIyKYU81SXglz6GqVTz0-kCE2dhFuwpQAhUym-yjuc,47135
+mdbq/mysql/mysql.py,sha256=cpCmGP4qlkZrJBFdQagUiHXPfuS13J_XcSNeQ97NgFY,45709
 mdbq/mysql/recheck_mysql.py,sha256=jHQSlQy0PlQ_EYICQv_2nairUX3t6OIwPtSELKIpjkY,8702
-mdbq/mysql/s_query.py,sha256=37GGHzRpycfUjsYEoQgDpdEs9JwjW-LxFXnGwwP2b2Q,8403
+mdbq/mysql/s_query.py,sha256=bgNNIqYLDCHjD5KTFcm6x4u74selpAGs5ouJYuqX86k,8447
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
@@ -44,7 +45,7 @@ mdbq/req_post/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/req_post/req_tb.py,sha256=PexWSCPJNM6Tv0ol4lAWIhlOwsAr_frnjtcdSHCFiek,36179
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=4Y5zd64hZUFtll8AdpUc2napDas-La-A6XzAhb2mLv0,17157
-mdbq-2.7.0.dist-info/METADATA,sha256=i_0WznHsXfCR0sToIhC5S4mv3hv1qMUOFFdws6FocOg,245
-mdbq-2.7.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-2.7.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-2.7.0.dist-info/RECORD,,
+mdbq-2.7.2.dist-info/METADATA,sha256=dE5SA3HexKJs7KOlf6PTR_uPYKe8EFlCOvqaGkKqGOM,243
+mdbq-2.7.2.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+mdbq-2.7.2.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-2.7.2.dist-info/RECORD,,

{mdbq-2.7.0.dist-info → mdbq-2.7.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.44.0)
+Generator: setuptools (70.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any