PipeGraphPy 3.0.6__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.6"
+__version__ = "3.0.7"
 
 from PipeGraphPy.core.graph import (
     Graph,

PipeGraphPy/__main__.py

@@ -303,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
@@ -353,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.7.dist-info/RECORD

@@ -0,0 +1,94 @@
+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
+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=81KRr3wUfOZk2DGrN2T7zmx0iGiXMR_VSUHaYinN5TY,5433
+PipeGraphPy/core/__init__.py,sha256=FZk9hm7vBsK8G16pNugputbrrEciYqJc_XRAhTCcojI,46
+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=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
+PipeGraphPy/core/modules/Cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/DataCharts/__init__.py,sha256=T6thgVFikRhMRXnul7xh6QW23CjQIeyJH6xdkXfRrsE,34
+PipeGraphPy/core/modules/DataCharts/dataview.py,sha256=AAX4weBc-EXsRA2G5OjeJ89IwOoe69T6YuDhhNK1BFI,659
+PipeGraphPy/core/modules/Deeplearning/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/EndScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Ensemble/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Evaluate/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/ExportData/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/HandleScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/ImportData/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+PipeGraphPy/core/modules/MergeScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Postprocessor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Preprocessor/__init__.py,sha256=lynmWpMxHyxIQNDXFrQtYSeWSOE5cwS0yA_f0Vt9fCY,150
+PipeGraphPy/core/modules/Preprocessor/sqlfilter.py,sha256=-vkMxoUiuNKx6k9beD05AgsDqtwKB_D2zzPU6XVx0_k,1410
+PipeGraphPy/core/modules/PythonScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Regressor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/SelectScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Selector/__init__.py,sha256=StAfza8ohuJZl4suxWknWBySer4uppaPeMYJ04YLHjU,47
+PipeGraphPy/core/modules/Special/__init__.py,sha256=tWCdhMS0mFXu2XKOVw1OtWfcZAefaLYCLIpfGULy_kc,109
+PipeGraphPy/core/modules/Special/emptydata.py,sha256=3BfZWh1CEuJdLLAdr_eo5KVBJbhthvWJNC2u82v5SLU,744
+PipeGraphPy/core/modules/Special/graphmod.py,sha256=uVDqi7D6yTxJtAHqLAa89DMWa0O54GhzsMw3txfwsd0,1104
+PipeGraphPy/core/modules/Split/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/SplitScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/StartScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+PipeGraphPy/core/modules/Transformer/__init__.py,sha256=StAfza8ohuJZl4suxWknWBySer4uppaPeMYJ04YLHjU,47
+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=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
+PipeGraphPy/storage/__init__.py,sha256=diYs9BQlCHItAO3N76g0R-MBHKb7R_nnLpwDuybXfqg,493
+PipeGraphPy/storage/base.py,sha256=nDSQlVoQM-22127EPZEhKBCqBplOwyeIH6S9HAdxn08,122
+PipeGraphPy/storage/file_backend.py,sha256=RG0L-4A5JikWwM3d4IOgKIRRpbzhdrowUd2JBi0bUn4,16196
+PipeGraphPy/utils/__init__.py,sha256=Gx-lC52xRprKQjygiXM00LBARNIsT5JakUprPew639E,14
+PipeGraphPy/utils/file_operate.py,sha256=XhUx-PEi3DClwD0h5xEsHAaMuvC1gRm4vnWSo7bI4v8,3579
+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.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/core/anchor.py

@@ -1,74 +0,0 @@
-"""
-锚点(Anchor)模块。
-
-锚点表示节点上的一个输入/输出接口。节点连接时把源节点的输出锚点连到
-目标节点的输入锚点, 边信息同时写入内存图(multi_graph)与数据库。
-"""
-
-from PipeGraphPy.common import multi_graph
-from PipeGraphPy.core.edge import Edge
-from PipeGraphPy.db.models import EdgesTB
-
-
-class Anchor(object):
-    """节点锚点: anc 为锚点编号, node_info 为所属节点信息。"""
-
-    def __init__(self, anc: int, node_info):
-        self.anc = anc
-        self.node_info = node_info
-
-    def __str__(self):
-        return str(self.anc)
-
-    def __repr__(self):
-        return "Anchor(Node(%s), %s)" % (str(self.node_info["id"]), str(self.anc))
-
-    def _add_edge(self, **kwargs):
-        """创建边并挂到所属图上(内存), 不做数据库持久化。
-
-        kwargs: source_id, target_id, source_anchor, target_anchor
-        """
-        if kwargs["source_id"] == kwargs["target_id"]:
-            raise Exception("源节点与目标节点不能是同一节点")
-        if not multi_graph.get(self.node_info["graph_id"]):
-            raise Exception("未找到对应graph信息")
-        multi_graph[self.node_info["graph_id"]]._edges.append(Edge.create(**kwargs))
-
-    def _connect_anchor(self, anchor):
-        """把本输出锚点连接到目标输入锚点(校验同图)。"""
-        if not isinstance(anchor, Anchor):
-            raise Exception("连接对像只能是Anchor对象")
-        if self.node_info["graph_id"] != anchor.node_info["graph_id"]:
-            raise Exception("节点所在图不一致")
-        self._add_edge(
-            source_id=self.node_info["id"],
-            target_id=anchor.node_info["id"],
-            source_anchor=self.anc,
-            target_anchor=anchor.anc,
-        )
-
-    def _break_anchor(self, anchor):
-        """删除与目标锚点之间的边(数据库)。"""
-        EdgesTB.rm(
-            graph_id=self.node_info["graph_id"],
-            source_id=self.node_info["id"],
-            target_id=anchor.node_info["id"],
-            source_anchor=self.anc,
-            target_anchor=anchor.anc,
-        )
-
-    def connect(self, anchors):
-        """连接一个或多个锚点, 任一失败则回滚已建立的连接。
-
-        anchors: Anchor 或 list[Anchor]
-        """
-        if not isinstance(anchors, list):
-            anchors = [anchors]
-        try:
-            for anchor in anchors:
-                self._connect_anchor(anchor)
-            return self
-        except Exception as e:
-            for anchor in anchors:
-                self._break_anchor(anchor)
-            raise e

PipeGraphPy/core/edge.py

@@ -1,33 +0,0 @@
-"""
-边(Edge)模块。
-
-边描述两个节点锚点之间的连接关系, info 中保存:
-    source_id/target_id/source_anchor/target_anchor/graph_id 等。
-"""
-
-from PipeGraphPy.db.models import EdgesTB
-from PipeGraphPy.utils.str_handle import tid
-
-
-class Edge(object):
-    def __init__(self, id, info=None):
-        self.id = id
-        self._info = info
-
-    @property
-    def info(self):
-        """边信息; 为空时从数据库按id加载。"""
-        if not self._info:
-            edge_info = EdgesTB.find_one(id=self.id)
-            if not edge_info:
-                raise ValueError("数据库不存在此边[%s]信息" % self.id)
-            self._info = edge_info
-        return self._info
-
-    @classmethod
-    def create(cls, **kwargs):
-        """创建一个内存边对象(不落库), 自动生成id。"""
-        id = "e%s" % tid()
-        info = {"id": id}
-        info.update(kwargs)
-        return cls(id, info)