mdbq 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

mdbq/__version__.py

@@ -0,0 +1,3 @@
+VERSION = (0, 3, 6)
+
+__version__ = '.'.join(map(str, VERSION))

mdbq/aggregation/aggregation.py

@@ -960,7 +960,22 @@ def main():
     # print(d.datas)
 
 
+def update_dtypte():
+    """ 更新一个文件的 dtype 信息到 json 文件 """
+    file = '/Users/xigua/数据中心/原始文件2/月数据/流量来源/【生意参谋平台】无线店铺流量来源-2023-04-01_2023-04-30.csv'
+    df = pd.read_csv(file, encoding='utf-8_sig', header=0, na_filter=False)
+    d = DataTypes()
+    d.read_dtypes(
+        df=df,
+        db_name='生意参谋数据2',
+        collection_name='店铺来源_月数据',
+        is_file_dtype=False,  # 关闭文件优先
+    )
+    d.dtypes_to_file()
+
+
 def upload():
+    """ 上传一个文件夹到数据库 """
     path = '/Users/xigua/数据中心/原始文件2/生意参谋/客户_客户概况_画像'
     db_name = '生意参谋数据2'
     collection_name = '客户_客户概况_画像'
@@ -995,7 +1010,7 @@ def upload():
     # print(dtypes)
     for root, dirs, files in os.walk(path, topdown=False):
         for name in files:
-            if '~$' in name or '.DS' in name or '.localized' in name or '.jpg' in name or '.png' in name:
+            if '~$' in name or '.DS' in name or '.localized' in name or 'baidu' in name:
                 continue
             if name.endswith('.csv'):
                 # print(name)
@@ -1005,7 +1020,7 @@ def upload():
                         continue
                     for col in df.columns.tolist():
                         df[col] = df[col].apply(lambda x: re.sub('[="]', '', str(x)) if '="' in str(x) else x)
-                    df.replace(to_replace=['--'], value='', regex=False, inplace=True)
+                    # df.replace(to_replace=['--'], value='', regex=False, inplace=True)
                     df = dt.convert_df_cols(df=df)
                     try:
                         df = df.astype(dtypes)
@@ -1032,29 +1047,5 @@ if __name__ == '__main__':
     username, password, host, port = get_myconf.select_config_values(target_service='aliyun', database='mongodb')
     print(username, password, host, port)
 
-    d = DatabaseUpdate(path='/Users/xigua/Downloads')
-    d.upload_df(service_databases=[{'home_lx': 'mongodb'},])
-
     # main()
     # upload()
-    # path = '/Users/xigua/数据中心/原始文件2/月数据/流量来源-自助取数-月数据'
-    # for root, dirs, files in os.walk(path, topdown=False):
-    #     for name in files:
-    #         if name.endswith('.csv') and 'baidu' not in name:
-    #             with open(os.path.join(root, name), 'rb') as f:
-    #                 f1 = f.read()
-    #                 encod = chardet.detect(f1).get('encoding')
-    #                 print(name, encod)
-    #             # df = pd.read_csv(os.path.join(root, name), encoding=encod, header=0, na_filter=False)
-    #             # df.to_csv(os.path.join(root, name), index=False, encoding='utf-8_sig', header=True)
-
-    # file = '/Users/xigua/数据中心/原始文件2/月数据/流量来源/【生意参谋平台】无线店铺流量来源-2023-04-01_2023-04-30.csv'
-    # df = pd.read_csv(file, encoding='utf-8_sig', header=0, na_filter=False)
-    # d = DataTypes()
-    # d.read_dtypes(
-    #     df=df,
-    #     db_name='生意参谋数据2',
-    #     collection_name='店铺来源_月数据',
-    #     is_file_dtype=False,  # 关闭文件优先
-    # )
-    # d.dtypes_to_file()

mdbq/aggregation/query_data.py

@@ -0,0 +1,307 @@
+# -*- coding: UTF-8 –*-
+from mdbq.mongo import mongo
+from mdbq.mysql import s_query
+from mdbq.config import get_myconf
+import datetime
+from dateutil.relativedelta import relativedelta
+import pandas as pd
+import numpy as np
+import platform
+import getpass
+import json
+import os
+
+
+class MongoDatasQuery:
+    """
+    从 数据库 中下载数据
+    self.output: 数据库默认导出目录
+    self.is_maximize: 是否最大转化数据
+    """
+    def __init__(self, target_service):
+        # target_service 从哪个服务器下载数据
+        self.is_maximize = True
+        if platform.system() == 'Darwin':
+            self.output = os.path.join('/Users', getpass.getuser(), '数据中心/数据库导出')
+        elif platform.system() == 'Windows':
+            self.output = os.path.join('C:\\同步空间\\BaiduSyncdisk\\数据库导出')
+        else:
+            self.output = os.path.join('数据中心/数据库导出')
+
+        # 实例化一个下载类
+        username, password, host, port = get_myconf.select_config_values(target_service=target_service, database='mongodb')
+        self.download = mongo.DownMongo(username=username, password=password, host=host, port=port, save_path=None)
+
+    def tg_wxt(self):
+        self.download.start_date, self.download.end_date = self.months_data(num=1)
+        projection = {
+            '日期': 1,
+            '场景名字': 1,
+            '主体id': 1,
+            '花费': 1,
+            '展现量': 1,
+            '点击量': 1,
+            '总购物车数': 1,
+            '总成交笔数': 1,
+            '总成交金额': 1,
+            '自然流量曝光量': 1,
+            '直接成交笔数': 1,
+            '直接成交金额': 1,
+        }
+        df = self.download.data_to_df(db_name='天猫数据2', collection_name='推广数据_宝贝主体报表', projection=projection)
+        df.rename(columns={
+            '场景名字': '营销场景',
+            '主体id': '商品id',
+            '总购物车数': '加购量',
+            '总成交笔数': '成交笔数',
+            '总成交金额': '成交金额'
+        }, inplace=True)
+        df = df.astype({
+            '花费': float,
+            '展现量': int,
+            '点击量': int,
+            '加购量': int,
+            '成交笔数': int,
+            '成交金额': float,
+            '自然流量曝光量': int,
+            '直接成交笔数': int,
+            '直接成交金额': float,
+        }, errors='raise')
+        df.fillna(0, inplace=True)
+        if self.is_maximize:
+            df = df.groupby(['日期', '营销场景', '商品id', '花费', '展现量', '点击量'], as_index=False).agg(
+                **{'加购量': ('加购量', np.max),
+                   '成交笔数': ('成交笔数', np.max),
+                   '成交金额': ('成交金额', np.max),
+                   '自然流量曝光量': ('自然流量曝光量', np.max),
+                   '直接成交笔数': ('直接成交笔数', np.max),
+                   '直接成交金额': ('直接成交金额', np.max)
+                   }
+            )
+        else:
+            df = df.groupby(['日期', '营销场景', '商品id', '花费', '展现量', '点击量'], as_index=False).agg(
+                **{'加购量': ('加购量', np.min),
+                   '成交笔数': ('成交笔数', np.min),
+                   '成交金额': ('成交金额', np.min),
+                   '自然流量曝光量': ('自然流量曝光量', np.min),
+                   '直接成交笔数': ('直接成交笔数', np.max),
+                   '直接成交金额': ('直接成交金额', np.max)
+                   }
+            )
+        df.insert(loc=1, column='推广渠道', value='万相台无界版')  # df中插入新列
+        # print(df)
+        return df
+
+    @staticmethod
+    def days_data(days, end_date=None):
+        """ 读取近 days 天的数据 """
+        if not end_date:
+            end_date = datetime.datetime.now()
+        start_date = end_date - datetime.timedelta(days=days)
+        return pd.to_datetime(start_date), pd.to_datetime(end_date)
+
+    @staticmethod
+    def months_data(num=0, end_date=None):
+        """ 读取近 num 个月的数据, 0 表示读取当月的数据 """
+        if not end_date:
+            end_date = datetime.datetime.now()
+        start_date = end_date - relativedelta(months=num)  # n 月以前的今天
+        start_date = f'{start_date.year}-{start_date.month}-01'  # 替换为 n 月以前的第一天
+        return pd.to_datetime(start_date), pd.to_datetime(end_date)
+
+    def as_csv(self, df, filename, path=None, encoding='utf-8_sig',
+               index=False, header=True, st_ascend=None, ascend=None, freq=None):
+        """
+        path: 子文件夹，可以不传，默认导出目录 self.output
+        st_ascend: 排序参数
+        ascend: 升降序
+        freq: 将创建子文件夹并按月分类存储,  freq='Y'，或 freq='M'
+        """
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if not os.path.exists(path):
+            os.makedirs(path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        if freq:
+            if '日期' not in df.columns.tolist():
+                return print(f'{filename}: 数据缺少日期列，无法按日期分组')
+            groups = df.groupby(pd.Grouper(key='日期', freq=freq))
+            for name1, df in groups:
+                if freq == 'M':
+                    sheet_name = name1.strftime('%Y-%m')
+                elif freq == 'Y':
+                    sheet_name = name1.strftime('%Y年')
+                else:
+                    sheet_name = '_未分类'
+                new_path = os.path.join(path, filename)
+                if not os.path.exists(new_path):
+                    os.makedirs(new_path)
+                new_path = os.path.join(new_path, f'{filename}{sheet_name}.csv')
+                if st_ascend and ascend:  # 这里需要重新排序一次，原因未知
+                    try:
+                        df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+                    except:
+                        print(f'{filename}: sort_values排序参数错误！')
+
+                df.to_csv(new_path, encoding=encoding, index=index, header=header)
+        else:
+            df.to_csv(os.path.join(path, filename + '.csv'), encoding=encoding, index=index, header=header)
+
+    def as_json(self, df, filename, path=None, orient='records', force_ascii=False, st_ascend=None, ascend=None):
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        df.to_json(os.path.join(path, filename + '.json'),
+                   orient=orient, force_ascii=force_ascii)
+
+    def as_excel(self, df, filename, path=None, index=False, header=True, engine='openpyxl',
+                 freeze_panes=(1, 0), st_ascend=None, ascend=None):
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        df.to_excel(os.path.join(path, filename + '.xlsx'),
+                    index=index, header=header, engine=engine, freeze_panes=freeze_panes)
+
+
+class MysqlDatasQuery:
+    """
+    从 数据库 中下载数据
+    self.output: 数据库默认导出目录
+    self.is_maximize: 是否最大转化数据
+    """
+    def __init__(self, target_service):
+        # target_service 从哪个服务器下载数据
+        self.is_maximize = True
+        if platform.system() == 'Darwin':
+            self.output = os.path.join('/Users', getpass.getuser(), '数据中心/数据库导出')
+        elif platform.system() == 'Windows':
+            self.output = os.path.join('C:\\同步空间\\BaiduSyncdisk\\数据库导出')
+        else:
+            self.output = os.path.join('数据中心/数据库导出')
+        self.months = 1  # 下载几个月数据, 0 表示当月, 1 是上月 1 号至今
+
+        # 实例化一个下载类
+        username, password, host, port = get_myconf.select_config_values(target_service=target_service, database='mysql')
+        self.download = s_query.QueryDatas(username=username, password=password, host=host, port=port)
+
+    def tg_wxt(self):
+        start_date, end_date = self.months_data(num=self.months)
+        df = self.download.data_to_df(db_name='天猫数据2', tabel_name='推广数据_宝贝主体报表', start_date=start_date, end_date=end_date)
+        return df
+
+    @staticmethod
+    def days_data(days, end_date=None):
+        """ 读取近 days 天的数据 """
+        if not end_date:
+            end_date = datetime.datetime.now()
+        start_date = end_date - datetime.timedelta(days=days)
+        return pd.to_datetime(start_date), pd.to_datetime(end_date)
+
+    @staticmethod
+    def months_data(num=0, end_date=None):
+        """ 读取近 num 个月的数据, 0 表示读取当月的数据 """
+        if not end_date:
+            end_date = datetime.datetime.now()
+        start_date = end_date - relativedelta(months=num)  # n 月以前的今天
+        start_date = f'{start_date.year}-{start_date.month}-01'  # 替换为 n 月以前的第一天
+        return pd.to_datetime(start_date), pd.to_datetime(end_date)
+
+    def as_csv(self, df, filename, path=None, encoding='utf-8_sig',
+               index=False, header=True, st_ascend=None, ascend=None, freq=None):
+        """
+        path: 子文件夹，可以不传，默认导出目录 self.output
+        st_ascend: 排序参数
+        ascend: 升降序
+        freq: 将创建子文件夹并按月分类存储,  freq='Y'，或 freq='M'
+        """
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if not os.path.exists(path):
+            os.makedirs(path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        if freq:
+            if '日期' not in df.columns.tolist():
+                return print(f'{filename}: 数据缺少日期列，无法按日期分组')
+            groups = df.groupby(pd.Grouper(key='日期', freq=freq))
+            for name1, df in groups:
+                if freq == 'M':
+                    sheet_name = name1.strftime('%Y-%m')
+                elif freq == 'Y':
+                    sheet_name = name1.strftime('%Y年')
+                else:
+                    sheet_name = '_未分类'
+                new_path = os.path.join(path, filename)
+                if not os.path.exists(new_path):
+                    os.makedirs(new_path)
+                new_path = os.path.join(new_path, f'{filename}{sheet_name}.csv')
+                if st_ascend and ascend:  # 这里需要重新排序一次，原因未知
+                    try:
+                        df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+                    except:
+                        print(f'{filename}: sort_values排序参数错误！')
+
+                df.to_csv(new_path, encoding=encoding, index=index, header=header)
+        else:
+            df.to_csv(os.path.join(path, filename + '.csv'), encoding=encoding, index=index, header=header)
+
+    def as_json(self, df, filename, path=None, orient='records', force_ascii=False, st_ascend=None, ascend=None):
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        df.to_json(os.path.join(path, filename + '.json'),
+                   orient=orient, force_ascii=force_ascii)
+
+    def as_excel(self, df, filename, path=None, index=False, header=True, engine='openpyxl',
+                 freeze_panes=(1, 0), st_ascend=None, ascend=None):
+        if not path:
+            path = self.output
+        else:
+            path = os.path.join(self.output, path)
+        if st_ascend and ascend:
+            try:
+                df.sort_values(st_ascend, ascending=ascend, ignore_index=True, inplace=True)
+            except:
+                print(f'{filename}: sort_values排序参数错误！')
+        df.to_excel(os.path.join(path, filename + '.xlsx'),
+                    index=index, header=header, engine=engine, freeze_panes=freeze_panes)
+
+
+def main():
+    sdq = MysqlDatasQuery(target_service='company')
+    sdq.months = 0
+    df = sdq.tg_wxt()
+    print(df)
+
+
+if __name__ == '__main__':
+    main()

mdbq/company/copysh.py

@@ -9,8 +9,8 @@ import datetime
 import shutil
 import time
 import re
-from mdbq.bdup import bd
-from mdbq.pipeline import database
+from mdbq.bdup import bdup
+from mdbq.aggregation import database
 from mdbq.config import update_conf
 warnings.filterwarnings('ignore')
 
@@ -293,10 +293,10 @@ def main():
         res, d_path = u.check_date()  # 文件中的 ch_record 值，决定是否执行更新
         if res:
             upload_path = f'windows/{str(datetime.date.today().strftime("%Y-%m"))}/{str(datetime.date.today())}'
-            b = bdup2.BaiDu()
+            b = bdup.BaiDu()
             b.download_dir(local_path=d_path, remote_path=upload_path)
 
-            dp = database.DatabaseUpdate(path=d_path)
+            dp = aggregation.DatabaseUpdate(path=d_path)
             dp.new_unzip(is_move=True)
             dp.cleaning(is_move=True)  # 公司台式机需要移除
             d.upload_df(service_databases=[{'company': 'mysql'}])

mdbq/mysql/s_query.py

@@ -0,0 +1,165 @@
+# -*- coding:utf-8 -*-
+import datetime
+import platform
+import re
+import time
+from functools import wraps
+import warnings
+import pymysql
+import numpy as np
+import pandas as pd
+from sqlalchemy import create_engine
+import os
+import calendar
+from mdbq.config import get_myconf
+
+warnings.filterwarnings('ignore')
+
+
+class QueryDatas:
+    def __init__(self, username: str, password: str, host: str, port: int, charset: str = 'utf8mb4'):
+        self.username = username
+        self.password = password
+        self.host = host
+        self.port = port
+        self.config = {
+            'host': self.host,
+            'port': self.port,
+            'user': self.username,
+            'password': self.password,
+            'charset': charset,  # utf8mb4 支持存储四字节的UTF-8字符集
+            'cursorclass': pymysql.cursors.DictCursor,
+        }
+
+    def data_to_df(self, db_name, tabel_name, start_date, end_date, projection=[]):
+        start_date = pd.to_datetime(start_date).strftime('%Y-%m-%d')
+        end_date = pd.to_datetime(end_date).strftime('%Y-%m-%d')
+        df = pd.DataFrame()
+
+        connection = pymysql.connect(**self.config)  # 连接数据库
+        try:
+            with connection.cursor() as cursor:
+                cursor.execute(f"SHOW DATABASES LIKE '{db_name}'")  # 检查数据库是否存在
+                database_exists = cursor.fetchone()
+                if not database_exists:
+                    print(f"Database <{db_name}>: 数据库不存在")
+        finally:
+            connection.close()  # 这里要断开连接
+            time.sleep(0.2)
+
+        self.config.update({'database': db_name})  # 添加更新 config 字段
+        connection = pymysql.connect(**self.config)  # 重新连接数据库
+        try:
+            with connection.cursor() as cursor:
+                # 1. 查询表是否存在
+                sql = f"SHOW TABLES LIKE '{tabel_name}'"
+                cursor.execute(sql)
+                if not cursor.fetchone():
+                    print(f'{db_name} -> <{tabel_name}>: 表不存在')
+                    return df
+
+                # 查询列
+                for col in projection:
+                    sql = ('SELECT 1 FROM information_schema.columns WHERE table_schema = %s AND table_name = %s AND '
+                           'column_name = %s')
+                    cursor.execute(sql, (db_name, {tabel_name}, col))
+                    if cursor.fetchone() is None:  # 移除不存在的列
+                        projection.remove(col)
+        except Exception as e:
+            print(e)
+            return df
+        finally:
+            connection.close()  # 断开连接
+
+        # before_time = time.time()
+        # 读取数据
+        self.config.update({'database': db_name})
+        connection = pymysql.connect(**self.config)  # 重新连接数据库
+        try:
+            with connection.cursor() as cursor:
+                if not projection:  # 如果未指定，则查询所有列，获取 cols_exist
+                    sql = 'SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = %s AND table_name = %s'
+                    cursor.execute(sql, (db_name, {tabel_name}))
+                    columns = cursor.fetchall()
+                    cols_exist = [col['COLUMN_NAME'] for col in columns]
+
+                if '日期' in projection or '日期' in cols_exist:  # 指定含日期的 projection 或者未指定 projection 但表中有日期列
+                    sql = f"SELECT * FROM {db_name}.{tabel_name} WHERE {'日期'} BETWEEN '%s' AND '%s'" % (start_date, end_date)
+                elif projection:  # 指定未含日期的 projection
+                    sql = f"SELECT '%s' FROM {db_name}.{tabel_name}" % (', '.join(projection))
+                else:  # 未指定 projection 且表中无日期
+                    sql = f"SELECT * FROM {db_name}.{tabel_name}"
+                cursor.execute(sql)
+                rows = cursor.fetchall()  # 获取查询结果
+                columns = [desc[0] for desc in cursor.description]
+                df = pd.DataFrame(rows, columns=columns)
+        except Exception as e:
+            print(f'{e} {db_name} -> <{tabel_name}>: 表不存在')
+            return df
+        finally:
+            connection.close()
+
+        if len(df) == 0:
+            print(f'database: {db_name}, table: {tabel_name} 查询的数据为空')
+        # else:
+        #     now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S ")
+        #     cost_time = int(time.time() - before_time)
+        #     if cost_time < 1:
+        #         cost_time = round(time.time() - before_time, 2)
+        #     print(f'{now}mysql ({self.host}) 表: {tabel_name} 获取数据长度: {len(df)}, 用时: {cost_time} 秒')
+        return df
+
+
+def year_month_day(start_date, end_date):
+    """
+    使用date_range函数和DataFrame来获取从start_date至end_date之间的所有年月日
+    calendar.monthrange： 获取当月第一个工作日的星期值(0,6) 以及当月天数
+    """
+    # 替换年月日中的日, 以便即使传入当月日期也有返回值
+    try:
+        start_date = f'{pd.to_datetime(start_date).year}-{pd.to_datetime(start_date).month}-01'
+    except Exception as e:
+        print(e)
+        return []
+    # 使用pandas的date_range创建一个日期范围，频率为'MS'代表每月开始
+    date_range = pd.date_range(start=start_date, end=end_date, freq='MS')
+    # 转换格式
+    year_months = date_range.strftime('%Y-%m').drop_duplicates().sort_values()
+
+    results = []
+    for year_month in year_months:
+        year = re.findall(r'(\d{4})', year_month)[0]
+        month = re.findall(r'\d{4}-(\d{2})', year_month)[0]
+        s, d = calendar.monthrange(int(year), int(month))
+        results.append({'起始日期': f'{year_month}-01', '结束日期': f'{year_month}-{d}'})
+
+    return results  # start_date至end_date之间的所有年月日
+
+
+def download_datas(tabel_name, save_path, start_date):
+    username, password, host, port = get_myconf.select_config_values(target_service='company', 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.data_to_df(db_name='市场数据2', tabel_name=tabel_name, start_date=start_date, end_date=end_date)
+        if len(df) == 0:
+            continue
+        path = os.path.join(save_path, f'{tabel_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='company', database='mysql')
+    # print(username, password, host, port)
+
+    username, password, host, port = get_myconf.select_config_values(target_service='company', database='mysql')
+    qd = QueryDatas(username=username, password=password, host=host, port=port)
+    df = qd.data_to_df(db_name='市场数据2', tabel_name='市场排行_店铺', start_date='2024-08-13', end_date='2024-08-31')
+    print(df)

mdbq/other/{xigua_porxy.py → porxy.py}

@@ -1,9 +1,6 @@
 import requests
 import kdl
 import warnings
-import getpass
-import platform
-import pathlib
 import os
 import requests
 import datetime

{mdbq-0.0.4.dist-info → mdbq-0.0.6.dist-info}/METADATA

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

{mdbq-0.0.4.dist-info → mdbq-0.0.6.dist-info}/RECORD

@@ -1,12 +1,14 @@
 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=HtaUlq6abeyT4V-C3jREbjJGj5L8cTKcDfDm4c4UNpI,60133
+mdbq/aggregation/aggregation.py,sha256=RHQa2rs4fimRvJzluujErg6I8fn7s9q1-kwC2bPZohE,59439
+mdbq/aggregation/query_data.py,sha256=avbMc36kCuyTjLOXMzIEIKSc0x227c1t-Ydf0vdkViM,13756
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
-mdbq/bdup/bd.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
+mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=33OmeQFl9AW21P5EOay52W_S8DF96H5oHwCg4fSuBxA,85359
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=U_m6C6dBRGPhuw2prgiFgfnTIiTXxyFJV0K6OE_PY9g,15602
+mdbq/company/copysh.py,sha256=0exynzeqf85gCBQXAgKycVxddMhr0TjkFcBP_NK0QTA,15609
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=q6Pylsnh4-MsHP9JcX8IdlnGVWikz9hio1HI_qh6Wvs,6171
 mdbq/config/update_conf.py,sha256=YjGjjRchu5BcrmLJkoLjHEF2TbGOmsgCWX4LroXOYWQ,3455
@@ -16,15 +18,16 @@ mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=hF93-kP2lxK4WY1KCdBBszLQ_I7W0mQQxZ7t4qU2w3A,32930
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/mysql.py,sha256=H9onFYKSYRjdXghK_29Aj7vgvUgDHexJjIECrdxLbE0,29925
+mdbq/mysql/s_query.py,sha256=P0QNwJL3ytyN75c8Qny1xfxrOUI4ks-FuRghNsyMWic,7409
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
+mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
-mdbq/other/xigua_porxy.py,sha256=zTOxsdkdDAyGfHWPUm_7WIztjrGExONAwvPzTaC7Rho,5007
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=wulHs4rivf4Mi0Pii2QR5Nk9-TBcvSwnCB_WH9QULKE,5939
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-0.0.4.dist-info/METADATA,sha256=5CO9nsAMDCP49m1fNFh_UQ-tIyPIgBFdUl-rQd8HlOc,245
-mdbq-0.0.4.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-mdbq-0.0.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-0.0.4.dist-info/RECORD,,
+mdbq-0.0.6.dist-info/METADATA,sha256=G_RkhGDJMmXpNdrECY4LBT0f6HF9sHpfU-LYxNUzWPk,245
+mdbq-0.0.6.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+mdbq-0.0.6.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-0.0.6.dist-info/RECORD,,