PipeGraphPy 2.0.5__tar.gz → 2.0.16__tar.gz

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/MANIFEST.in

@@ -1,2 +1,4 @@
 include README.md requirements.txt
 global-include *.so
+global-include *.pyd
+

pipegraphpy-2.0.16/PKG-INFO

@@ -0,0 +1,21 @@
+Metadata-Version: 2.4
+Name: PipeGraphPy
+Version: 2.0.16
+Summary: 核心算法框架
+Author: liujm
+Author-email: 792079829@qq.com
+License: Private
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: Microsoft :: Windows
+Requires-Python: >=3.7
+Requires-Dist: python-dateutil>=2.8.2
+Requires-Dist: prettytable==3.7.0
+Requires-Dist: pandas>=1.3.5
+Requires-Dist: joblib>=1.3.2
+Requires-Dist: dbpoolpy>=0.6.11
+Dynamic: classifier
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/README.md

@@ -527,6 +527,7 @@ import_node.run()
 ```
 
 ## x86版本升级步骤（改进）
+
 前期准备：
 docker pull --platform linux/amd64 python:3.8.17
 docker tag python:3.8.17 x86_python:3.8.17
@@ -539,6 +540,7 @@ docker rmi python:3.8.17
     twine upload ./dist/*
 
 ## arm版本升级步骤（改进）
+
 前期准备：
 docker pull --platform linux/arm64 python:3.8.17
 docker tag python:3.8.17 arm_python:3.8.17
@@ -549,3 +551,67 @@ docker rmi python:3.8.17
 - 4、到容器外面的/Users/zhengshuiqing/work/qingneng/pyproj/PipeGraphPy_arm目录执行：
     python -m build
     twine upload ./dist/*
+
+## linux平台和windows平台同时打包，并且兼容python3.9和python3.10
+
+1、在linux上复制PipeGraphPy 为 PipeGraphPy_linux 和 PipeGraphPy_win
+
+2、打包linux安装包
+
+    2.1 在linux系统中使用conda切换为python3.9的环境
+    2.2 在PipeGraphPy_linux/src目录下执行：python build_setup_manylinux1_x86_64.py build_ext --inplace
+    2.3 在linux系统中使用conda切换为python3.10的环境
+    2.4 在PipeGraphPy_linux/src目录下执行：python build_setup_manylinux1_x86_64.py build_ext --inplace
+    2.5 在PipeGraphPy_linux/src目录下执行：python build_setup_manylinux1_x86_64.py
+    2.6 在PipeGraphPy_linux目录执行：python -m build
+    2.7 删除dist目录下的pipegraphpy-2.0.8.tar.gz
+    2.8 修改PipeGraphPy-2.0.8-py3-none-any.whl为PipeGraphPy-2.0.8-py3-none-manylinux1_x86_64.whl
+    2.9 在PipeGraphPy_linux目录下执行：twine upload ./dist/*
+3、打包windows安装包
+
+    3.1 在windows系统中使用conda切换为python3.9的环境
+    3.2 在PipeGraphPy_win/src目录下执行：python build_setup_win_amd64.py build_ext --inplace
+    3.3 在windows系统中使用conda切换为python3.10的环境
+    3.4 在PipeGraphPy_win/src目录下执行：python build_setup_win_amd64.py build_ext --inplace
+    3.5 在PipeGraphPy_win/src目录下执行：python build_setup_win_amd64.py
+    3.6 在PipeGraphPy_win目录执行：python -m build
+    3.7 删除dist目录下的pipegraphpy-2.0.8.tar.gz
+    3.8 修改PipeGraphPy-2.0.8-py3-none-any.whl为PipeGraphPy-2.0.8-py3-none-win_amd64.whl
+    3.9 在PipeGraphPy_win目录下执行：twine upload ./dist/*
+
+## 平台和包名后面的对应关系
+
+### 操作系统
+
+1. **Windows**
+   - `win32`：适用于 32 位 Windows 系统
+   - `win_amd64`：适用于 64 位 Windows 系统
+   - `win_arm`：适用于 ARM 架构的 Windows 系统
+
+2. **Linux**
+   - `linux`：适用于一般的 Linux 系统
+   - `linux_x86_64`：专门为 64 位 Linux 系统构建
+   - `manylinux1`：为 Linux 提供的兼容性标准，适用于多种 Linux 发行版
+   - `manylinux2010`：更新的兼容性标准，支持更现代的系统库
+   - `manylinux2014`：更高版本的兼容性标准，支持最新的系统功能
+   - `linux_i686`：适用于 32 位 Linux 系统
+   - `musllinux`：适用于基于 musl C 库的 Linux 发行版
+
+3. **macOS**
+   - `darwin`：适用于 macOS 系统
+
+### 处理器架构
+
+1. **x86 架构**
+   - `x86`：32 位处理器架构
+   - `x86_64` 或 `amd64`：64 位处理器架构（适用于 Intel 和 AMD 处理器）
+
+2. **ARM 架构**
+   - `arm`：适用于 ARM 32 位处理器
+   - `arm64` 或 `aarch64`：适用于 ARM 64 位处理器架构
+
+### 特殊标识
+
+- **musl**：用于指示基于 musl C 库的特定兼容性，通常用于某些精简的 Linux 发行版。
+- **win32_debug**：适用于调试版本的 32 位 Windows。
+- **win_amd64_debug**：适用于调试版本的 64 位 Windows。

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

@@ -3,19 +3,15 @@ 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
+python_requires = >= 3.7
 
 [options.packages.find]
 where = src

pipegraphpy-2.0.16/setup.py

@@ -0,0 +1,24 @@
+# coding:utf-8
+
+from setuptools import setup
+
+setup(
+    name="PipeGraphPy",
+    description="核心算法框架",
+    version="2.0.16",
+    license="Private",
+    include_package_data=True,
+    install_requires=[
+        "python-dateutil>=2.8.2",
+        "prettytable==3.7.0",
+        "pandas>=1.3.5",
+        "joblib>=1.3.2",
+        "dbpoolpy>=0.6.11",
+    ],
+    classifiers=[
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Operating System :: POSIX :: Linux',
+        'Operating System :: Microsoft :: Windows',
+    ],
+)

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

@@ -1,6 +1,6 @@
 # coding:utf-8
 
-__version__ = "2.0.5"
+__version__ = "2.0.16"
 
 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.16}/src/PipeGraphPy/config/__init__.py

@@ -13,7 +13,6 @@ import os
 import traceback
 import PipeGraphPy
 from PipeGraphPy.config import default_settings
-from PipeGraphPy.exceptions import ImproperlyConfigured
 from PipeGraphPy.utils.functional import LazyObject, empty
 from dbpoolpy import settings as dbsettings
 
@@ -62,7 +61,7 @@ class LazySettings(LazyObject):
         settings_module = os.environ.get(ENVIRONMENT_VARIABLE)
         if not settings_module:
             desc = ("setting %s" % name) if name else "settings"
-            raise ImproperlyConfigured(
+            raise Exception(
                 "Requested %s, but settings are not configured. "
                 "You must either define the environment variable %s "
                 "or call settings.configure() before accessing settings."
@@ -91,7 +90,7 @@ class LazySettings(LazyObject):
         # if name in {'MEDIA_URL', 'STATIC_URL'} and val is not None:
         #     val = self._add_script_prefix(val)
         # elif name == 'SECRET_KEY' and not val:
-        #     raise ImproperlyConfigured(
+        #     raise Exception(
         #         "The SECRET_KEY setting must not be empty.")
 
         self.__dict__[name] = val
@@ -190,14 +189,14 @@ class Settings:
 
                 if (setting in tuple_settings and
                         not isinstance(setting_value, (list, tuple))):
-                    raise ImproperlyConfigured(
+                    raise Exception(
                         "The %s setting must be a list or a tuple. " % setting)
                 setattr(self, setting, setting_value)
                 self._explicit_settings.add(setting)
 
         if self.is_overridden('PASSWORD_RESET_TIMEOUT_DAYS'):
             if self.is_overridden('PASSWORD_RESET_TIMEOUT'):
-                raise ImproperlyConfigured(
+                raise Exception(
                     'PASSWORD_RESET_TIMEOUT_DAYS/PASSWORD_RESET_TIMEOUT are '
                     'mutually exclusive.'
                 )

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/src/PipeGraphPy/config/default_settings.py

@@ -21,7 +21,6 @@ class PGP_ENV:
 DEBUG = False if str(os.environ.get("PGP_NOT_DEBUG")) == "1" else True
 ISDEV = False if str(os.environ.get("PGP_NOT_DEV")) == "1" else True
 ISJUPYTER = True if str(os.environ.get("PGP_JUPYTER")) == "1" else False
-RUN_PERMISSION = True if str(os.environ.get("PGP_RUN_PERMISSION")) == "1" else False
 RUN_MODEL_SAVE_PATH = os.environ.get("PGP_RUN_MODEL_SAVE_PATH", "")
 SDK_MODEL_SAVE_PATH = os.environ.get("PGP_SDK_MODEL_SAVE_PATH", "")
 PREDICT_MODEL_SAVE_PATH = os.environ.get("PGP_PREDICT_MODEL_SAVE_PATH", '')
@@ -47,13 +46,13 @@ PGP_PDB_PORT = int(os.environ.get("PGP_PDB_PORT", '6688'))
 
 # 模型保存配置
 if DEPLOYMENT_ENV == PGP_ENV.SDK:
-    HOME_CACHE_PATH = os.path.expanduser('~/.cache/PipeGraphPy/sdk/')
+    HOME_CACHE_PATH = os.path.join(os.path.expanduser('~'), '.cache', 'PipeGraphPy','sdk')
     if not SDK_MODEL_SAVE_PATH:
         SDK_MODEL_SAVE_PATH = os.path.join(HOME_CACHE_PATH, "sdk")
     if not os.path.exists(SDK_MODEL_SAVE_PATH):
         os.makedirs(SDK_MODEL_SAVE_PATH)
 else:
-    HOME_CACHE_PATH = os.path.expanduser('~/.cache/PipeGraphPy/')
+    HOME_CACHE_PATH = os.path.join(os.path.expanduser('~'), '.cache', 'PipeGraphPy')
 if not RUN_MODEL_SAVE_PATH:
     RUN_MODEL_SAVE_PATH = os.path.join(HOME_CACHE_PATH, "models")
 if not PREDICT_MODEL_SAVE_PATH:
@@ -121,5 +120,5 @@ DATABASE_DB_NAME = None
 
 
 # SDK是否显示log日志
-SDK_SHOW_LOG = False
+SDK_CLOSE_LOG = True
 

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/src/PipeGraphPy/constants.py

@@ -41,6 +41,14 @@ class GRAPH_PREDICT_TYPE():
     CAL = 4
 
 
+class GRAPH_EXE_TYPE():
+    RUN = 'run'
+    PREDICT = 'predict'
+    EVALUATE = 'evaluate'
+    BACKTEST = 'backtest'
+    CAL = 'cal'
+
+
 class FARMTYPE(object):
     WIND = "W"
     PV = "S"
@@ -177,7 +185,17 @@ class GRAPHTYPE(object):
 
 
 # 组件输入输出类型
-class DATATYPE(object):
+class DATATYPE(ENUMSBASE):
+    LIST           = "list"
+    DICT           = "dict"
+    FLOAT          = "float"
+    FLOAT_LIST     = "list(float)"
+    INT            = "int"
+    INT_LIST       = "list(int)"
+    STR            = "str"
+    STR_LIST       = "list(str)"
+    NUMBER         = "number"
+    NUMBER_LIST    = "list(number)"
     DATAFRAME      = "DataFrame"
     DATAFRAME_LIST = "list(DataFrame)"
     OBJECT         = "object"
@@ -349,15 +367,13 @@ GRAPH_DICT_FORMAT = {
                 "source_anchor": {
                     "required": False,
                     "default": 1,
-                    "type": str,
-                    "dest": "",
+                    "type": int,
                     "help": "必传,起始节点锚点,默认是1",
                 },
                 "target_anchor": {
                     "required": False,
                     "default": 1,
-                    "type": str,
-                    "dest": "",
+                    "type": int,
                     "help": "必传,目标节点锚点,默认是1",
                 }
             }

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/src/PipeGraphPy/db/utils.py

@@ -5,6 +5,7 @@ from PipeGraphPy.db.models import GraphsTB, NodesTB, ObjectsTB
 from dbpoolpy import connect_db
 from PipeGraphPy.logger import log
 from PipeGraphPy.constants import BIZ_TYPE, STATUS, DB
+from PipeGraphPy.utils.format import now_time
 
 
 def update_node_params(node_ids, key, value, value_key="value"):
@@ -67,7 +68,7 @@ def get_object_info(object_id):
             object_info = {"id": object_id}
         return object_info
     except Exception as e:
-        print(traceback.format_exc())
+        log.error(traceback.format_exc())
         return {"id": object_id}
 
 def graphs_wait_to_run(graph_ids):
@@ -79,7 +80,7 @@ def graphs_wait_to_run(graph_ids):
         if running_ids:
             graph_ids = list(set(graph_ids) - set(running_ids))
         if graph_ids:
-            now = (datetime.utcnow()+timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S")
+            now = now_time(is_str=True)
             GraphsTB.set(
                 status=STATUS.WAITRUN,
                 wait_run_time=now,
@@ -98,7 +99,7 @@ def graphs_wait_to_predict(graph_ids, clock="12", is_pub=False, **kwargs):
         if predicting_ids:
             graph_ids = list(set(graph_ids) - set(predicting_ids))
         if graph_ids:
-            now = (datetime.utcnow()+timedelta(hours=8)).strftime("%Y-%m-%d %H:%M:%S")
+            now = now_time(is_str=True)
             GraphsTB.set(
                 p_status=STATUS.WAITRUN,
                 predict_params=json.dumps(params),

{pipegraphpy-2.0.5 → pipegraphpy-2.0.16}/src/PipeGraphPy/logger.py

@@ -3,7 +3,7 @@
 
 import re
 import logging
-import logging, logging.config
+import time
 from logging.handlers import TimedRotatingFileHandler
 from PipeGraphPy.config import settings
 from PipeGraphPy.db.models import PredictRecordTB, OnlineGraphsPredictRecordTB, RunRecordTB, BacktestRecordTB, EvaluateRecordTB, OnlineGraphsEvaluateRecordTB
@@ -22,8 +22,8 @@ class RecordHandler(logging.Handler, object):
         """
         try:
             msg = self.format(record)
-            if settings.SDK_SHOW_LOG:
-                print(msg)
+            # if not settings.SDK_CLOSE_LOG:
+            #     print(msg)
             if self.kw.get("plog_record_id"):
                 PredictRecordTB.add_log(id=self.kw["plog_record_id"], msg=msg)
             if self.kw.get("rlog_record_id"):
@@ -78,9 +78,10 @@ def log_dec(level):
             try:
                 msg = '\n'.join([str(i) for i in msg])
                 if not hasattr(cls, "logger") or cls.logger is None:
+                    log_name = extra.get("pgp_log_name") or "pgp_"+str(time.time()).replace('.', '')
                     cls.logger = get_pgp_logger(
                         logfile=extra.get("pgp_logfile") or "",
-                        log_name=extra.get("pgp_log_name") or "pgp",
+                        log_name=log_name,
                         level=extra.get("pgp_level") or logging.INFO,
                         backup_count=extra.get("pgp_backup_count") or 7,
                         handlers=extra.get("pgp_handlers") or ["console"],
@@ -104,9 +105,12 @@ class LogBase(object):
 
     @classmethod
     def init(cls, pgp_handlers, **extra):
+        if hasattr(cls, "logger"):
+            cls.logger = None
+        log_name = extra.get("pgp_log_name") or "pgp_"+str(time.time()).replace('.', '')
         cls.logger = get_pgp_logger(
             logfile=extra.get("pgp_logfile") or "",
-            log_name=extra.get("pgp_log_name") or "pgp",
+            log_name=log_name,
             level=extra.get("pgp_level") or logging.INFO,
             backup_count=extra.get("pgp_backup_count") or 7,
             handlers=pgp_handlers,