codosdk 1.0.2__tar.gz → 1.0.4__tar.gz

{codosdk-1.0.2 → codosdk-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codosdk
-Version: 1.0.2
+Version: 1.0.4
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.2 → codosdk-1.0.4}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codosdk
-Version: 1.0.2
+Version: 1.0.4
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.2 → codosdk-1.0.4}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from distutils.core import setup
 
-VERSION = '1.0.2'
+VERSION = '1.0.4'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')

{codosdk-1.0.2 → codosdk-1.0.4}/websdk2/consts.py

@@ -191,19 +191,27 @@ const.TOKEN_EXP_TIME = "TOKEN_EXP_TIME"
 ### 全局 二次认证
 const.MFA_GLOBAL = 'MFA_GLOBAL'
 
-### 任务状态
-const.STATE_NEW = '0'
-const.STATE_WAIT = '1'
-const.STATE_RUNNING = '2'
-const.STATE_SUCCESS = '3'
-const.STATE_ERROR = '4'
-const.STATE_MANUAL = '5'
-const.STATE_BREAK = '6'
-const.STATE_TIMING = '7'
-const.STATE_UNKNOWN = '8'
-const.STATE_FAIL = '9'
-const.STATE_IGNORE = '10'  # 忽略
-const.STATE_QUEUE = '11'  # 排队中
+# task event 状态
+const.STATE_NEW = '0'  # 新建任务
+const.STATE_WAIT = '1'  # 等待执行
+const.STATE_RUNNING = '2'  # 正在运行
+const.STATE_SUCCESS = '3'  # 成功完成
+const.STATE_ERROR = '4'  # 发生错误
+const.STATE_MANUAL = '5'  # 等待手动
+const.STATE_BREAK = '6'  # 中止状态 //不区分手动和自动
+const.STATE_TIMING = '7'  # 定时状态
+const.STATE_UNKNOWN = '8'  # 未知状态  // debug
+const.STATE_FAIL = '9'  # 失败         // debug
+const.STATE_IGNORE = '10'  # 忽略执行
+const.STATE_QUEUE = '11'  # 排队中   //订单和任务节点公用
+# 订单 状态
+const.ORDER_STATE_WAITING = '31'  # 订单等待中
+const.ORDER_STATE_RUNNING = '32'  # 订单执行中
+const.ORDER_STATE_SUCCESS = '33'  # 订单成功
+const.ORDER_STATE_FAIL = '34'  # 订单失败
+const.ORDER_STATE_WAITING_APPROVAL = '35'  # 订单等待审批
+const.ORDER_STATE_TERMINATED = '39'  # 订单终止
+const.ORDER_STATE_QUEUE = '11'  # 订单排队中
 const.EXEC_TIMEOUT = 1800
 
 ## 节点地址

{codosdk-1.0.2 → codosdk-1.0.4}/websdk2/utils/__init__.py

@@ -10,12 +10,13 @@ Desc    :
 import os
 import time
 import json
+import uuid
 import socket
 import smtplib
+from datetime import datetime
 from ..consts import const
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
-import uuid
 
 
 class SendMail(object):
@@ -92,7 +93,6 @@ class SendMail(object):
             return False
 
 
-
 def mail_login(user, password, mail_server='smtp.exmail.qq.com'):
     ### 模拟登录来验证邮箱
     try:
@@ -165,6 +165,7 @@ def get_contain_dict(src_data: dict, dst_data: dict) -> bool:
         else:
             return True
 
+
 def now_time_stamp() -> int:
     """
     秒时间戳
@@ -192,6 +193,11 @@ def get_node_topic(node=False):
         return f'{socket.gethostname()}--mac-{mac}'
 
 
+@staticmethod
+def echo_datetime_now_f():
+    return datetime.now().strftime('%Y-%m-%d %H:%M:%S.%f')
+
+
 ### 令牌桶限流
 '''
 示例