PipeGraphPy 3.0.5__py3-none-win_amd64.whl → 3.0.7__py3-none-win_amd64.whl

PipeGraphPy/__init__.py

@@ -1,6 +1,6 @@
 # coding:utf-8
 
-__version__ = "3.0.5"
+__version__ = "3.0.7"
 
 from PipeGraphPy.core.graph import (
     Graph,

PipeGraphPy/__main__.py

@@ -34,6 +34,7 @@ settings.RUN_MODEL_SAVE_PATH = RUN_MODEL_SAVE_PATH or os.path.join(HOME, "models
 settings.SDK_MODEL_SAVE_PATH = SDK_MODEL_SAVE_PATH or RUN_MODEL_SAVE_PATH
 settings.PREDICT_MODEL_SAVE_PATH = PREDICT_MODEL_SAVE_PATH or RUN_MODEL_SAVE_PATH
 settings.MODULES_CACHE_PATH = MODULES_CACHE_PATH or os.path.join(HOME, "modules")
+sys.path.append(os.path.dirname(settings.MODULES_CACHE_PATH))
 
 # 数据库配置
 USE_DB = os.environ.get("PGP_USE_DB") == "1"
@@ -302,6 +303,7 @@ class ModelExecutor:
             output_file, result_file = self.get_file_path("predict", model_id)
             log.info("@@开始预测:模型id:%s@@" % model_id)
             graph_model = store.load_graph(model_id)
+            graph_model._use_db = USE_DB
             # biz_info 优先取 -p 传入, 其次取模型json/params_file 中的
             run_kw = dict(self.run_kw)
             biz_info = run_kw.pop("biz_info", None) or self.biz_info
@@ -352,6 +354,7 @@ class ModelExecutor:
             else:
                 try:
                     model = store.load_graph(model_id)
+                    model._use_db = USE_DB
                 except Exception as e:
                     raise Exception("载入建模对象的模型错误\n%s" % e)
 

PipeGraphPy/config/default_settings.py

@@ -77,7 +77,7 @@ if not MODULES_CACHE_PATH:
 if not os.path.exists(MODULES_CACHE_PATH):
     os.makedirs(MODULES_CACHE_PATH)
     _init_file = os.path.join(MODULES_CACHE_PATH, "__init__.py")
-    with open(_init_file, "w") as f:
+    with open(_init_file, "w", encoding="utf-8") as f:
         f.write("#")
 sys.path.append(os.path.dirname(MODULES_CACHE_PATH))
 

pipegraphpy-3.0.7.dist-info/METADATA

@@ -0,0 +1,15 @@
+Metadata-Version: 2.4
+Name: PipeGraphPy
+Version: 3.0.7
+Summary: 核心算法框架
+Author: liujm
+Author-email: 792079829@qq.com
+License: Private
+Requires-Python: >=3.10
+Requires-Dist: pandas
+Requires-Dist: numpy
+Requires-Dist: prettytable
+Requires-Dist: dbpoolpy
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary

{pipegraphpy-3.0.5.dist-info → pipegraphpy-3.0.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
-PipeGraphPy/__init__.py,sha256=ckivzwwUs4lEJNJPWN6rFi_-N6Gn0db7aVCOeyyh1-k,381
-PipeGraphPy/__main__.py,sha256=TLfdlRm2PTsNdq2WMTMnR_aNu-pZCDLfoTW0DfgwNew,17536
+PipeGraphPy/__init__.py,sha256=6U9hyZEHT5e0JhCuVG7ZCUqHV-KZKoWxxuTSi70vL3o,381
+PipeGraphPy/__main__.py,sha256=pPxIOlmtC6YsXeYnS0vulrzqGOAUFRBhUcG69T5cPGM,17682
 PipeGraphPy/common.py,sha256=Kh_xAbUO__OFZUrSBHidnPbOF9zS0ErQBUNUiTeQHOU,222
 PipeGraphPy/constants.py,sha256=P6h9n7ae1qCk78ojYdfLcXFVN4kKjIWt60rwqKiKaGU,11602
 PipeGraphPy/decorators.py,sha256=xPeSvPojvTqjx-5emR1wi0AbgIKD1DjIGrg16DuuTTo,1148
@@ -7,43 +7,43 @@ PipeGraphPy/logger.py,sha256=oD6U4KCI6AJFne4fv3rok0XncGssbT66X_mz60Ao7Gc,7403
 PipeGraphPy/tools.py,sha256=OUcDkefzcCo5BWUrRSbOda2Pds4JdOmafiP0IZsxrsg,14623
 PipeGraphPy/config/__init__.py,sha256=EG_gl0ag7am_S8WhLTClhxXi9op0_zfwvngX4QieAJw,10072
 PipeGraphPy/config/custom.py,sha256=NmwHob_bqzLwrKporycm_lijfj0Leu3GooSHPcguqbc,59
-PipeGraphPy/config/default_settings.py,sha256=zZxH9ScnkkQolj52rZJKto7ZqOgTcTPMrza3f5XukJs,5415
+PipeGraphPy/config/default_settings.py,sha256=81KRr3wUfOZk2DGrN2T7zmx0iGiXMR_VSUHaYinN5TY,5433
 PipeGraphPy/core/__init__.py,sha256=FZk9hm7vBsK8G16pNugputbrrEciYqJc_XRAhTCcojI,46
-PipeGraphPy/core/anchor.cp310-win_amd64.pyd,sha256=q060fMYJkf4VKGLlN5q54GRHQHIiSzcy6_EMidpx2Gw,69632
-PipeGraphPy/core/edge.cp310-win_amd64.pyd,sha256=lrLDx5STrbi_9q55823Zp0vPNpMMEsTLoj9LAjmbH-g,49152
-PipeGraphPy/core/graph.cp310-win_amd64.pyd,sha256=trrQpAjzNohbz2JGEpazlTQ3SbFIJ3wUZnmxr50Y4wY,491520
-PipeGraphPy/core/graph_base.cp310-win_amd64.pyd,sha256=n-NhQ5-Ta8GN3WLe6MxwgNiH7GwlX18q4fSAkLx6Qzk,153088
-PipeGraphPy/core/module.cp310-win_amd64.pyd,sha256=dRtlnYk3lWBtOnfmuLoVmV_Jlqmx3fAExkealqisp1g,196096
-PipeGraphPy/core/node.cp310-win_amd64.pyd,sha256=qyOtwyCnhyccvMWYIEWrIUJPsNCl4eai3grxgRppQaA,192000
-PipeGraphPy/core/pipegraph.cp310-win_amd64.pyd,sha256=F-cYcj6z_1M0qrtQt_FtMrqEbcw15fZEXfwxF-2YFdY,16384
+PipeGraphPy/core/anchor.cp310-win_amd64.pyd,sha256=hDs3nIYfTsEhxsRCQ65MD6TRCiFljGSljKDqk55n_-M,69632
+PipeGraphPy/core/edge.cp310-win_amd64.pyd,sha256=_hjBAr1PmH40OzV0rLUepmSIGzZQbwKOKZr_AQPukHI,49152
+PipeGraphPy/core/graph.cp310-win_amd64.pyd,sha256=7ycm3GS8_KezswfU33B5V7ANxB_qq5xovNdgke1G0ng,491520
+PipeGraphPy/core/graph_base.cp310-win_amd64.pyd,sha256=nemsq4R3rpt58uU_33yFwJCvlDfKuelPCjltBFc7wcs,153088
+PipeGraphPy/core/module.cp310-win_amd64.pyd,sha256=lti5FZp3myBRnVR_veyAothHXVpvwZUcd0jA8mlOYjE,202240
+PipeGraphPy/core/node.cp310-win_amd64.pyd,sha256=twlVAFybk9wKQRVoxq_jPTQjsPz23t5Sl2slfSUMWwk,192000
+PipeGraphPy/core/pipegraph.cp310-win_amd64.pyd,sha256=rgv6GeqLnP0RXwt28fKrNGprxI3jl2sqaZfPZ_QQVsg,16384
 PipeGraphPy/core/modcls/__init__.py,sha256=StAfza8ohuJZl4suxWknWBySer4uppaPeMYJ04YLHjU,47
-PipeGraphPy/core/modcls/base.cp310-win_amd64.pyd,sha256=H40PyKIvRkyEc7021vgsL_QF12sQQ8jgEWhenINJ4Ns,142848
-PipeGraphPy/core/modcls/branchselect.cp310-win_amd64.pyd,sha256=ikBYfH778Yf8Dc0qMzUIKsxWfKHel_ajPRg-iKaEFA4,49152
-PipeGraphPy/core/modcls/classifier.cp310-win_amd64.pyd,sha256=xfo1bZ4AxT5MlPxut11CRiqWt2UZDFcLxI5meE-YnOU,22528
-PipeGraphPy/core/modcls/cluster.cp310-win_amd64.pyd,sha256=b0yyZXpoGOiNNZ7axQ9tCuyKM40Q9yjv8V7gOqkhxMk,22528
-PipeGraphPy/core/modcls/common.cp310-win_amd64.pyd,sha256=Z9vsn_qn8VURkL2FCzgFSW15z9-ZBgMThetmBaZKhJ0,22528
-PipeGraphPy/core/modcls/datacharts.cp310-win_amd64.pyd,sha256=s3hD1Q9pnp_t8AlV-S-09FBLT7Iv88n6EETVLdmL4Ck,22528
-PipeGraphPy/core/modcls/deeplearning.cp310-win_amd64.pyd,sha256=J-tOIaP5TFC_WzPCVstibXS5un9-CncRNdekCRqgYTc,22528
-PipeGraphPy/core/modcls/endscript.cp310-win_amd64.pyd,sha256=0KzygfkQbXPAtepP_BGxbT7Hz-HExtckxYPZWxqdeCI,23552
-PipeGraphPy/core/modcls/ensemble.cp310-win_amd64.pyd,sha256=x3SO2hdJpFuUKG0wPNHZh6REtVHcxjqtZsZqBz60ARY,26112
-PipeGraphPy/core/modcls/evaluate.cp310-win_amd64.pyd,sha256=9CV6uIrzgdGskgU35SRTCQFkVHN7sWIbusSHcDReAWQ,54784
-PipeGraphPy/core/modcls/exportdata.cp310-win_amd64.pyd,sha256=x0bBYI_kAwcBK30q8xPQCa8e5og1FwrYH4j0sg0E2Rs,23552
-PipeGraphPy/core/modcls/handlescript.cp310-win_amd64.pyd,sha256=VG95Q-B0MkT_bkO2OAgdD9BUhEHrd_dgN2o1wo40_Cc,24064
-PipeGraphPy/core/modcls/importdata.cp310-win_amd64.pyd,sha256=fwxbu5Hp3eJkz5ZoXrdybI_h6KFAwu1PEV0E93om-lc,23552
-PipeGraphPy/core/modcls/merge.cp310-win_amd64.pyd,sha256=a8L4MKrO_mz9rghAmtcOG0hDMtTdQhjBAuucMn-ys9E,24576
-PipeGraphPy/core/modcls/mergescript.cp310-win_amd64.pyd,sha256=rlzEThKyXp6GzkG6k4ZlnJQaK1ZiRAfzxD6WWoXGOFI,24064
-PipeGraphPy/core/modcls/metrics.cp310-win_amd64.pyd,sha256=2yndjCnarowGx8giXKJr7AzeoPQHNdHEhJ-OFz-Kd_Y,41984
-PipeGraphPy/core/modcls/postprocessor.cp310-win_amd64.pyd,sha256=tLLjWL-64Uo4KV3yG6Qd5btj9GyxRh5JdT4YI28y3go,46080
-PipeGraphPy/core/modcls/preprocessor.cp310-win_amd64.pyd,sha256=aMaFF8vaLurrwwJhsJbrKzqLTCre8MzIvmEvCTa0x4A,22528
-PipeGraphPy/core/modcls/pythonscript.cp310-win_amd64.pyd,sha256=-5-aEIjKfeZ9Ek14-mBQ635X0nUNdKC1KqWvhgAvj9c,23040
-PipeGraphPy/core/modcls/regressor.cp310-win_amd64.pyd,sha256=vN8Ay7PizXo3aQ2GGHWZG_uDtX8V-kLTmWPqSWozmwA,22528
-PipeGraphPy/core/modcls/selector.cp310-win_amd64.pyd,sha256=681E_o3om6dNLeMafwi2EcfPUmmbRSHdVEZq4-2StxI,22528
-PipeGraphPy/core/modcls/selectscript.cp310-win_amd64.pyd,sha256=m7_DthHZrcY0eIGN-t8SWy13H5y_y8hiCoj2Zmdw07I,24064
-PipeGraphPy/core/modcls/special.cp310-win_amd64.pyd,sha256=qBFiVmJxuQD_Ljy0uaJkjDs5N7cjyL-loPlOy7FWNrc,43008
-PipeGraphPy/core/modcls/split.cp310-win_amd64.pyd,sha256=XNnUUbhyb8AVQEb5ihRZLNPmz-5LuboFHeMgGFFHKfM,24576
-PipeGraphPy/core/modcls/splitscript.cp310-win_amd64.pyd,sha256=pH0xVwId2rX3dwTBqoQI2qwVLmhjNfE1fQ9l7JiXtaM,24064
-PipeGraphPy/core/modcls/startscript.cp310-win_amd64.pyd,sha256=Nvx8DdPQH9iCtPJFpPSpjtgX1kZ9sNnLO6OtqX0V_Ys,23552
-PipeGraphPy/core/modcls/transformer.cp310-win_amd64.pyd,sha256=GCLkHWbswljWzBadhHRhSVNvnqWMaflnKqQ_syhVBhY,22528
+PipeGraphPy/core/modcls/base.cp310-win_amd64.pyd,sha256=zWJNmx6gujhZOs_bldwIbCNN6bKG3_SBENTzTyp5l-M,142848
+PipeGraphPy/core/modcls/branchselect.cp310-win_amd64.pyd,sha256=-o3qbG23P0KVKqc_XeNoigLd_eQHvXORo1CSTFH0vbg,49152
+PipeGraphPy/core/modcls/classifier.cp310-win_amd64.pyd,sha256=7XtHMsl08AAm0eLmFjffHzucc5LuJCyIgSM6rw3if4E,22528
+PipeGraphPy/core/modcls/cluster.cp310-win_amd64.pyd,sha256=9S3sGPNijejBL7m3cDer2cFY1rF73T2XjDqRPRQmJJI,22528
+PipeGraphPy/core/modcls/common.cp310-win_amd64.pyd,sha256=_vAlg6S0VfrRlAZ7_Zg8nAS_HThGWokD2RCYA6aCxTE,22528
+PipeGraphPy/core/modcls/datacharts.cp310-win_amd64.pyd,sha256=HQen7Al0wxMpPvXjQr5npjsgMUZ9TIZeu5ml4kaQ59Q,22528
+PipeGraphPy/core/modcls/deeplearning.cp310-win_amd64.pyd,sha256=expJNlvX6o4Unc9Xr7Nq6iKp5yl306mRJUOwlqy5qys,22528
+PipeGraphPy/core/modcls/endscript.cp310-win_amd64.pyd,sha256=g414mvWy2Fi6opuRd8_INj5iKjPoCz8Edmf86uRt1Lg,23552
+PipeGraphPy/core/modcls/ensemble.cp310-win_amd64.pyd,sha256=wLr53AVpyepeLhYBWcnAGF3GieUqD-b7h3RnP_-AIfk,26112
+PipeGraphPy/core/modcls/evaluate.cp310-win_amd64.pyd,sha256=J2qcag-vcTLQfqmFLiiGQe5oTMVn4y7TUadFnkDPVak,54784
+PipeGraphPy/core/modcls/exportdata.cp310-win_amd64.pyd,sha256=VAGs4drFOOgL0WstsXUbO_VOwMBL0BCQ65ULHnfpPg4,23552
+PipeGraphPy/core/modcls/handlescript.cp310-win_amd64.pyd,sha256=DG7PgTWKvu47f9-n91kXQ05CS91fVWjwT2i9VQJ6BhI,24064
+PipeGraphPy/core/modcls/importdata.cp310-win_amd64.pyd,sha256=m4UYD0b7y6JLQKOATXdPmS9qqnPgydJc1c2MThzllMs,23552
+PipeGraphPy/core/modcls/merge.cp310-win_amd64.pyd,sha256=e5fcnLMXrERvTLbvVBxZk1_QEgfifqTb_1D1xfRXUhw,24576
+PipeGraphPy/core/modcls/mergescript.cp310-win_amd64.pyd,sha256=tnkFoFb9dvP1T6l0yLJsbeL2r47MJNk4BaB-cx_Chuk,24064
+PipeGraphPy/core/modcls/metrics.cp310-win_amd64.pyd,sha256=6ZeUTB_XWqhv6P1m4iBMXxNBYi1pgYMtjs2S9feKl8I,41984
+PipeGraphPy/core/modcls/postprocessor.cp310-win_amd64.pyd,sha256=DDYo4ROJPI3Aj9lKoGffkIkX0SoyNyRKKTzRrq0pO-4,46080
+PipeGraphPy/core/modcls/preprocessor.cp310-win_amd64.pyd,sha256=Hfzt5KYZO0A8s6loNu_Xc774X_RPN3AFx9npWLs-n-8,22528
+PipeGraphPy/core/modcls/pythonscript.cp310-win_amd64.pyd,sha256=E4SBM8YbjK9IJZVnEzQs-3Nsx03_eYZI0dDJ2vcPmOM,23040
+PipeGraphPy/core/modcls/regressor.cp310-win_amd64.pyd,sha256=JAq6TSWKjl8yO5ddQfUs1zbxnIsiklRV6dxRmG1BcPw,22528
+PipeGraphPy/core/modcls/selector.cp310-win_amd64.pyd,sha256=33HdGKt2mkW8zCs3cX4aUrA5JmyEAp2-_yNLzBu3B7E,22528
+PipeGraphPy/core/modcls/selectscript.cp310-win_amd64.pyd,sha256=VVmynIndX-klWwFpGXPwh9Ef3fiRWaQR3LY40fyF7MA,24064
+PipeGraphPy/core/modcls/special.cp310-win_amd64.pyd,sha256=OTW42Ou7VNCQRaNudVKD9frBpYSLORrZc-ksiMGf1Jo,43008
+PipeGraphPy/core/modcls/split.cp310-win_amd64.pyd,sha256=i9_jQAX8pe7iFVZHtbRLD8hE4220RzM65ZOgWc4Z_bc,24576
+PipeGraphPy/core/modcls/splitscript.cp310-win_amd64.pyd,sha256=rZVs5XE9otA_JhcmHXSg5G3vVnbrjSHd_aI93AZQLLg,24064
+PipeGraphPy/core/modcls/startscript.cp310-win_amd64.pyd,sha256=20MZmKKxFTV9kBYQw9UobiAEY36SUUd53cP5oljFGA4,23552
+PipeGraphPy/core/modcls/transformer.cp310-win_amd64.pyd,sha256=NY2usY1UlyL7mfgVOVld76WXGLegbHTeqxfZyfvBoDM,22528
 PipeGraphPy/core/modules/__init__.py,sha256=FZk9hm7vBsK8G16pNugputbrrEciYqJc_XRAhTCcojI,46
 PipeGraphPy/core/modules/BranchSelect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PipeGraphPy/core/modules/Classifier/__init__.py,sha256=FZk9hm7vBsK8G16pNugputbrrEciYqJc_XRAhTCcojI,46
@@ -76,7 +76,7 @@ PipeGraphPy/core/modules/Transformer/__init__.py,sha256=StAfza8ohuJZl4suxWknWByS
 PipeGraphPy/core/modules/merge/mergemany.py,sha256=iIu673fLFm0OX5dSyEYQZ_MXr1cJ1vKJPJayaoJtrSc,3766
 PipeGraphPy/core/modules/merge/mergetwo.py,sha256=1GdahbXSCZSC_uuKDrf9t8Vl2in_GFaY_sXMZ9PLS0o,2206
 PipeGraphPy/db/__init__.py,sha256=FZk9hm7vBsK8G16pNugputbrrEciYqJc_XRAhTCcojI,46
-PipeGraphPy/db/models.cp310-win_amd64.pyd,sha256=m0pp7Vjx5IeGSei_5lk6JQPOlBbnU2u_TakiIJLY8m0,138240
+PipeGraphPy/db/models.cp310-win_amd64.pyd,sha256=k4F6-ELxA5bxB7w-Xmiwvk13bhVdIJQvQ3ydKWf5LKQ,138240
 PipeGraphPy/db/utils.py,sha256=VUdhElBAo92BX8Ld2Jn0lMH3Q0m_OC2EtAfByJ_8D78,11376
 PipeGraphPy/plot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 PipeGraphPy/plot/draw.py,sha256=_gAccJnId63lhqk35hn5RYzvaeQ5Qi77VP6M87JZTug,13289
@@ -88,7 +88,7 @@ PipeGraphPy/utils/file_operate.py,sha256=XhUx-PEi3DClwD0h5xEsHAaMuvC1gRm4vnWSo7b
 PipeGraphPy/utils/format.py,sha256=8Kywcn5UNhduG8x6lqeseU-sDFbJmaiYURzQFRon7oU,13296
 PipeGraphPy/utils/functional.py,sha256=tCEjBUc8PLyEkMFTygl63eRc7BjejYUEMebXbAzlIZc,13973
 PipeGraphPy/utils/str_handle.py,sha256=0MXj-8MaOtdf5OK_4hXJH9fEjx1x23c2XAELoxWLdhQ,3676
-pipegraphpy-3.0.5.dist-info/METADATA,sha256=Zw4vblZ74aEQhymwRoYIpidh8yk0m68Bs2Ph0K8QsoM,512
-pipegraphpy-3.0.5.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-pipegraphpy-3.0.5.dist-info/top_level.txt,sha256=ABzFtoUyTUZ5Rbf9xFf_ZMHFTrO-FhwsyMTf3_qhJJ4,12
-pipegraphpy-3.0.5.dist-info/RECORD,,
+pipegraphpy-3.0.7.dist-info/METADATA,sha256=V_x-l7xBCNJjD7hOtoqSuBuZJXMJzNNsz92VCPhwPvs,320
+pipegraphpy-3.0.7.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+pipegraphpy-3.0.7.dist-info/top_level.txt,sha256=ABzFtoUyTUZ5Rbf9xFf_ZMHFTrO-FhwsyMTf3_qhJJ4,12
+pipegraphpy-3.0.7.dist-info/RECORD,,

pipegraphpy-3.0.5.dist-info/METADATA

@@ -1,18 +0,0 @@
-Metadata-Version: 2.4
-Name: PipeGraphPy
-Version: 3.0.5
-Summary: 核心算法框架
-Home-page: https://gitee.com/zsq_tee/pipe-graph-py
-Author: zhengshuiqing
-Author-email: shuiqingzheng@126.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: pandas
-Requires-Dist: numpy
-Requires-Dist: prettytable
-Requires-Dist: dbpoolpy
-Dynamic: license
-Dynamic: requires-dist
-Dynamic: summary