PipeGraphPy 2.0.5__tar.gz → 2.0.5b1__tar.gz

{pipegraphpy-2.0.5/src/PipeGraphPy.egg-info → pipegraphpy-2.0.5b1}/PKG-INFO

@@ -1,22 +1,26 @@
-Metadata-Version: 2.1
-Name: PipeGraphPy
-Version: 2.0.5
-Summary: 核心算法框架
-Home-page: https://gitee.com/zsq_tee/pipe-graph-py
-Author: liujm
-Author-email: 792079829@qq.com
-License: Private
-Project-URL: Documentation, https://gitee.com/zsq_tee/pipe-graph-py
-Project-URL: Source, https://gitee.com/zsq_tee/pipe-graph-py
-Requires-Python: >=3.6
-Requires-Dist: openpyxl
-Requires-Dist: pandas
-Requires-Dist: python-dateutil
-Requires-Dist: PyYAML
-Requires-Dist: tqdm
-Requires-Dist: numpy
-Requires-Dist: matplotlib
-Requires-Dist: pandasql
-Requires-Dist: dnspython
-Requires-Dist: prettytable
-Requires-Dist: dbpoolpy
+Metadata-Version: 2.1
+Name: PipeGraphPy
+Version: 2.0.5b1
+Summary: 核心算法框架
+Home-page: https://gitee.com/zsq_tee/pipe-graph-py
+Author: liujm
+Author-email: 792079829@qq.com
+License: Private
+Project-URL: Documentation, https://gitee.com/zsq_tee/pipe-graph-py
+Project-URL: Source, https://gitee.com/zsq_tee/pipe-graph-py
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
+Requires-Python: >=3.6
+Requires-Dist: openpyxl
+Requires-Dist: pandas
+Requires-Dist: python-dateutil
+Requires-Dist: PyYAML
+Requires-Dist: tqdm
+Requires-Dist: numpy
+Requires-Dist: matplotlib
+Requires-Dist: pandasql
+Requires-Dist: dnspython
+Requires-Dist: prettytable
+Requires-Dist: dbpoolpy

{pipegraphpy-2.0.5 → pipegraphpy-2.0.5b1}/setup.cfg

@@ -1,40 +1,40 @@
-[metadata]
-name = PipeGraphPy
-version = attr: PipeGraphPy.__version__
-author = liujm
-author_email = 792079829@qq.com
-url = https://gitee.com/zsq_tee/pipe-graph-py
-description = A Python library of core algorithms for weather group forecasting
-long_description = file: README.rst
-license = MIT
-project_urls = 
-	Documentation = https://gitee.com/zsq_tee/pipe-graph-py
-	Source = https://gitee.com/zsq_tee/pipe-graph-py
-
-[options]
-packages = find:
-package_dir = = src
-include_package_data = true
-python_requires = >= 3.6
-
-[options.packages.find]
-where = src
-
-[options.entry_points]
-
-[flake8]
-select = B, E, F, W, B9, ISC
-ignore = 
-	E203
-	E402
-	E501
-	E722
-	W503
-max-line-length = 80
-per-file-ignores = 
-	src/flask/__init__.py: F401
-
-[egg_info]
-tag_build = 
-tag_date = 0
-
+[metadata]
+name = PipeGraphPy
+version = attr: PipeGraphPy.__version__
+author = liujm
+author_email = 792079829@qq.com
+url = https://gitee.com/zsq_tee/pipe-graph-py
+description = A Python library of core algorithms for weather group forecasting
+long_description = file: README.rst
+license = MIT
+project_urls = 
+	Documentation = https://gitee.com/zsq_tee/pipe-graph-py
+	Source = https://gitee.com/zsq_tee/pipe-graph-py
+
+[options]
+packages = find:
+package_dir = = src
+include_package_data = true
+python_requires = >= 3.6
+
+[options.packages.find]
+where = src
+
+[options.entry_points]
+
+[flake8]
+select = B, E, F, W, B9, ISC
+ignore = 
+	E203
+	E402
+	E501
+	E722
+	W503
+max-line-length = 80
+per-file-ignores = 
+	src/flask/__init__.py: F401
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{pipegraphpy-2.0.5 → pipegraphpy-2.0.5b1}/setup.py

@@ -19,4 +19,10 @@ setup(
     license="Private",
     include_package_data=True,
     install_requires=get_requirements(),
+    classifiers=[
+        'Programming Language :: Python :: 3.6',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: MacOS',
+    ],
 )

{pipegraphpy-2.0.5 → pipegraphpy-2.0.5b1}/src/PipeGraphPy/__init__.py

@@ -1,6 +1,6 @@
 # coding:utf-8
 
-__version__ = "2.0.5"
+__version__ = "2.0.5b1"
 
 from PipeGraphPy.core.graph import Graph, graph_predict, graph_evaluate, online_graph_evaluate, online_graph_predict, graph_run, graph_backtest
 from PipeGraphPy.core.module import Module

{pipegraphpy-2.0.5 → pipegraphpy-2.0.5b1}/src/PipeGraphPy/tools.py

@@ -59,12 +59,13 @@ def update_params_source(key, value, node):
 
 
 def predict_to_csv(datas, filename="",
-        graph_id='', node_id='',
+        graph_id='', object_id='', node_id='',
         plog_record_id='', online_plog_record_id="",
         filepath=""):
     # 取出节点的数据导入节点
     assert isinstance(datas, pd.DataFrame), "预测保存的数据必须是DataFrame"
     assert graph_id, "未传graph_id"
+    assert object_id, "未传object_id"
     assert node_id, "未传node_id"
     if filepath:
         if not filepath.endswith(".csv"):
@@ -75,7 +76,8 @@ def predict_to_csv(datas, filename="",
             return 0
         predict_save_path = os.path.join(
                 settings.PREDICT_RESULT_SAVE_PATH,
-                str(graph_id))
+                str(graph_id),
+                str(object_id))
         if not os.path.exists(predict_save_path):
             os.makedirs(predict_save_path)
         if filename:
@@ -93,15 +95,16 @@ def predict_to_csv(datas, filename="",
     return 1
 
 
-def read_predict_csv(graph_id, start_date=None, end_date=None):
+def read_predict_csv(graph_id, object_id,  start_date=None, end_date=None):
     """读取模型历史的预测数据
     args:
         graph_id：预测模型的id
+        object_id, 建模对象id,
         start_date: 预测数据批次的开始日期 (包含), 不传的话只返回最近的一次数据, 格式：YYYYmmdd or YYYY-mm-dd
         end_date: 预测数据批次的结束日期（包含）, 不传的话只返回最近的一次数据, 格式：YYYYmmdd or YYYY-mm-dd
     """
     datas = pd.DataFrame()
-    predict_save_path = os.path.join(settings.PREDICT_RESULT_SAVE_PATH, str(graph_id))
+    predict_save_path = os.path.join(settings.PREDICT_RESULT_SAVE_PATH, str(graph_id), str(object_id))
     if not os.path.exists(predict_save_path):
         return datas
     file_list = os.listdir(predict_save_path)

{pipegraphpy-2.0.5 → pipegraphpy-2.0.5b1/src/PipeGraphPy.egg-info}/PKG-INFO

@@ -1,22 +1,26 @@
-Metadata-Version: 2.1
-Name: PipeGraphPy
-Version: 2.0.5
-Summary: 核心算法框架
-Home-page: https://gitee.com/zsq_tee/pipe-graph-py
-Author: liujm
-Author-email: 792079829@qq.com
-License: Private
-Project-URL: Documentation, https://gitee.com/zsq_tee/pipe-graph-py
-Project-URL: Source, https://gitee.com/zsq_tee/pipe-graph-py
-Requires-Python: >=3.6
-Requires-Dist: openpyxl
-Requires-Dist: pandas
-Requires-Dist: python-dateutil
-Requires-Dist: PyYAML
-Requires-Dist: tqdm
-Requires-Dist: numpy
-Requires-Dist: matplotlib
-Requires-Dist: pandasql
-Requires-Dist: dnspython
-Requires-Dist: prettytable
-Requires-Dist: dbpoolpy
+Metadata-Version: 2.1
+Name: PipeGraphPy
+Version: 2.0.5b1
+Summary: 核心算法框架
+Home-page: https://gitee.com/zsq_tee/pipe-graph-py
+Author: liujm
+Author-email: 792079829@qq.com
+License: Private
+Project-URL: Documentation, https://gitee.com/zsq_tee/pipe-graph-py
+Project-URL: Source, https://gitee.com/zsq_tee/pipe-graph-py
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
+Requires-Python: >=3.6
+Requires-Dist: openpyxl
+Requires-Dist: pandas
+Requires-Dist: python-dateutil
+Requires-Dist: PyYAML
+Requires-Dist: tqdm
+Requires-Dist: numpy
+Requires-Dist: matplotlib
+Requires-Dist: pandasql
+Requires-Dist: dnspython
+Requires-Dist: prettytable
+Requires-Dist: dbpoolpy