mdbq 1.3.3__py3-none-any.whl → 1.3.4__py3-none-any.whl

mdbq/aggregation/aggregation.py

@@ -603,7 +603,7 @@ class DatabaseUpdate:
         """
         将清洗后的 df 上传数据库
         """
-        df_to_json = df_types.DataTypes(path=path, system_name=system_name)  # json 文件, 包含数据的 dtypes 信息
+        df_to_json = df_types.DataTypes()  # json 文件, 包含数据的 dtypes 信息
         for service_database in service_databases:
             for service_name, database in service_database.items():
                 # print(service_name, database)
@@ -845,7 +845,7 @@ def upload_dir(path, db_name, collection_name, dbs={'mysql': True, 'mongodb': Tr
         )
 
     # 从本地 json 文件从读取 df 的数据类型信息
-    df_to_json = df_types.DataTypes(path=json_path, system_name=system_name)
+    df_to_json = df_types.DataTypes()
     dtypes = df_to_json.load_dtypes(
         db_name=db_name,
         collection_name=collection_name,

mdbq/aggregation/df_types.py

@@ -38,7 +38,7 @@ class DataTypes:
      数据简介: 记录 dataframe 或者数据库的列信息(dtypes)，可以记录其信息或者加载相关信息用于入库使用，
      第一字段为分类(如 dataframe/mysql)，第二字段为数据库名，第三字段为集合名，第四段列名及其数据类型
     """
-    def __init__(self):
+    def __init__(self, path=None):
         self.datas = {
             "json统计":
                 {
@@ -47,10 +47,9 @@ class DataTypes:
                     "集合数量": 0
                 }
         }
-        self.path = set_support.SetSupport(dirname='support').dirname
-        self.system_name = None
-        if self.system_name:
-            self.json_file = os.path.join(self.path, f'{self.system_name}_df_types.json')
+        self.path = path
+        if not self.path:
+            self.path = set_support.SetSupport(dirname='support').dirname
         else:
             self.json_file = os.path.join(self.path, 'df_types.json')
         if not os.path.isdir(self.path):

{mdbq-1.3.3.dist-info → mdbq-1.3.4.dist-info}/METADATA

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

{mdbq-1.3.3.dist-info → mdbq-1.3.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 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=vDUHXbRlBLGQDrxJ_r0z3A31QyR_7zUvZ-Booa_NPFY,57813
-mdbq/aggregation/df_types.py,sha256=nWadlcioysdFtelot3W6TWCuVntw6vWMOYYnAbGHnS4,7694
+mdbq/aggregation/aggregation.py,sha256=IvuQGEphA0Ueu5YpLEaV_8dY5tLkX91g3N43Pea2Qic,57740
+mdbq/aggregation/df_types.py,sha256=onZjPqPwxDtc6u_seSbu4kZqLx7IWQZL4uCb1q3dNmA,7609
 mdbq/aggregation/mysql_types.py,sha256=jTQaCrDy9hj36GIImshXANyQNFAvVKJTybkzJSh-qJ8,10671
 mdbq/aggregation/optimize_data.py,sha256=jLAWtxPUuhpo4XTVrhKtT4xK3grs7r73ePQfLhxlu1I,779
 mdbq/aggregation/query_data.py,sha256=wtXd7lZmlJhch8Dt3sTgsrPVTMeaV37Fd9QvsQS87w8,27308
@@ -35,7 +35,7 @@ mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
 mdbq/pbix/refresh_all.py,sha256=tgy762608HMaXWynbOURIf2UVMuSPybzrDXQnOOcnZU,6102
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-1.3.3.dist-info/METADATA,sha256=9OO2EMliH5d5IPcbcP0d2ALZ8arwWvtpurYxH0B9X_k,245
-mdbq-1.3.3.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-1.3.3.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.3.3.dist-info/RECORD,,
+mdbq-1.3.4.dist-info/METADATA,sha256=l5VmR79f8fUslfgzJDuyPlJ6i1DhC_lZfUIgQtALWr8,245
+mdbq-1.3.4.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.3.4.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.3.4.dist-info/RECORD,,