deepfos 1.1.69__tar.gz → 1.1.71__tar.gz

{deepfos-1.1.69 → deepfos-1.1.71}/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [1.1.71] - 2025-08-21
+
+### 更新
+
+* 根据数据流3.0组件API调整更新模型定义
+* 数据流3.0异步启动默认为带启停启动，同步固定为不带启停启动
+
+
+## [1.1.70] - 2025-08-19
+
+### 新增
+
+* 消息中心推送增加抄送用户、用户组参数
+
+
 ## [1.1.69] - 2025-08-12
 
 ### 新增

{deepfos-1.1.69 → deepfos-1.1.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.69
+Version: 1.1.71
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-08-13T05:47:18+0000",
+ "date": "2025-08-20T06:19:57+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "8ee03bc48deaa7e1f492dac1690e50b4097da6ea",
- "version": "1.1.69"
+ "full-revisionid": "e2b7caff4237e4df0c64899b4d6d948f41512291",
+ "version": "1.1.71"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/api/deep_pipeline.py

@@ -12,7 +12,7 @@ class RunAPI(ChildAPI):
     endpoint = '/'
 
     @post('run')
-    def run_async(self, run_info: RunInfo) -> Union[str, Awaitable[str]]:
+    def run_async(self, run_info: Union[RunInfo, RunInfoWithParam]) -> Union[str, Awaitable[str]]:
         """
         异步执行数据流
         异步执行数据流，返回任务id

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/api/models/deep_pipeline.py

@@ -3,11 +3,24 @@ from typing import Any, Optional
 from .base import BaseModel
 
 __all__ = [
-    "RunInfo", "FlowInfo",
+    "RunInfo", "FlowInfo", "RunInfoWithParam",
 ]
 
 
 class RunInfo(BaseModel):
+    #: 元素名/编码
+    elementName: str
+    #: 元素类型
+    elementType: str = "DPL"
+    #: 文件路径
+    path: Optional[str] = None
+    #: 文件夹id
+    folderId: Optional[str] = None
+    # 是否在同一个进程执行
+    inProcess: bool = False
+
+
+class RunInfoWithParam(BaseModel):
     #: 元素名/编码
     elementName: str
     #: 元素类型
@@ -30,8 +43,6 @@ class Revision(BaseModel):
 
 
 class Configure(BaseModel):
-    #: 超时时间（秒）
-    timeout: int
     #: 公共脚本
     prelude: Optional[str] = None
     #: 实例名称

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/api/models/system.py

@@ -954,6 +954,8 @@ class MsgPushHasAttachmentRequestVO(BaseModel):
     params: Optional[List[MessageTemplateParamVO]] = None
     #: 接收对象（用户/用户组）
     receiver: List[MessageReceiverVO]
+    #: 抄送对象（用户/用户组）
+    ccEmail: Optional[List[MessageReceiverVO]] = None
     #: 发送人
     sender: Optional[str] = None
     #: 模板编码

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/element/deep_pipeline.py

@@ -1,17 +1,19 @@
 import asyncio
 import time
+import warnings
 from math import ceil
 from typing import Any, TYPE_CHECKING, List
 
 from deepfos import OPTION
 from deepfos.api.deep_pipeline import DeepPipelineAPI
-from deepfos.api.models.deep_pipeline import RunInfo, FlowInfo
+from deepfos.api.models.deep_pipeline import RunInfo, FlowInfo, RunInfoWithParam
 from deepfos.element.base import ElementBase, SyncMeta
 from deepfos.exceptions import (
     APIResponseError, RunIdInvalid, RunTerminated,
     ReleaseFlowTimeout, RunFailedError, ReleaseFlowNotExists,
 )
 from deepfos.lib.asynchronous import future_property
+from deepfos.lib.constant import UNSET
 from deepfos.lib.decorator import cached_property
 
 errcode_map = {
@@ -47,7 +49,7 @@ class AsyncDeepPipeline(ElementBase[DeepPipelineAPI]):
 
     async def run(
         self,
-        parameter: Any = None,
+        parameter: Any = UNSET,
         timeout: int = None,
         in_process: bool = True,
     ) -> Any:
@@ -57,25 +59,29 @@ class AsyncDeepPipeline(ElementBase[DeepPipelineAPI]):
         Args:
             parameter: 执行参数
             timeout: 超时时间(秒)
-            in_process: 是否在同一个进程执行
+            in_process: 是否在同一个进程执行（仅作新旧兼容，实际只会在同一个进程执行，即不带启停启动）
 
         Returns:
             执行结果
         """
-        run_id = await self.run_async(parameter, in_process)
+        if not in_process:
+            warnings.warn(
+                '同步启动固定为同一个进程执行(不带启停启动)，in_process参数为False不会影响该行为'
+            )
+        run_id = await self.run_async(parameter, True)
         return await self.result(run_id, timeout)
 
     async def run_async(
         self,
-        parameter: Any = None,
-        in_process: bool = True,
+        parameter: Any = UNSET,
+        in_process: bool = False,
     ) -> str:
         """
         异步启动数据流
 
         Args:
             parameter: 执行参数
-            in_process: 是否在同一个进程执行
+            in_process: 是否在同一个进程执行，默认False，即带启停启动
 
         Returns:
             执行ID
@@ -83,14 +89,21 @@ class AsyncDeepPipeline(ElementBase[DeepPipelineAPI]):
         if not self.has_approved_release:
             raise ReleaseFlowNotExists('暂无启用中状态的数据流版本')
 
-        return await self.async_api.run.run_async(
-            RunInfo(
+        if parameter is UNSET:
+            payload = RunInfo(
+                elementName=self.element_name,
+                folderId=self.element_info.folderId,
+                inProcess=in_process
+            )
+        else:
+            payload = RunInfoWithParam(
                 elementName=self.element_name,
                 parameter=parameter,
                 folderId=self.element_info.folderId,
                 inProcess=in_process
             )
-        )
+
+        return await self.async_api.run.run_async(payload)
 
     async def result(self, run_id: str, timeout: int = None) -> Any:
         """
@@ -134,14 +147,14 @@ class AsyncDeepPipeline(ElementBase[DeepPipelineAPI]):
     async def run_batch(
         self,
         parameters: List[Any],
-        in_process: bool = True,
+        in_process: bool = False,
     ) -> List[str]:
         """
         批量异步启动数据流
 
         Args:
             parameters: 执行参数列表
-            in_process: 是否在同一个进程执行
+            in_process: 是否在同一个进程执行，默认False，即带启停启动
 
         Returns:
             执行ID列表
@@ -162,7 +175,7 @@ class DeepPipeline(AsyncDeepPipeline, metaclass=SyncMeta):
     if TYPE_CHECKING:  # pragma: no cover
         def run(
             self,
-            parameter: Any = None,
+            parameter: Any = UNSET,
             timeout: int = None,
             in_process: bool = True,
         ) -> Any:
@@ -170,8 +183,8 @@ class DeepPipeline(AsyncDeepPipeline, metaclass=SyncMeta):
 
         def run_async(
             self,
-            parameter: Any = None,
-            in_process: bool = True,
+            parameter: Any = UNSET,
+            in_process: bool = False,
         ) -> str:
             ...
 
@@ -181,6 +194,6 @@ class DeepPipeline(AsyncDeepPipeline, metaclass=SyncMeta):
         def run_batch(
             self,
             parameters: List[Any],
-            in_process: bool = True,
+            in_process: bool = False,
         ):
             ...

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos/lib/msg.py

@@ -110,7 +110,7 @@ class AsyncMsgCenter:
         title_param: Dict[str, str] = None,
         content_param: Dict[str, str] = None,
         attachments: Dict[str, Union[str, bytes]] = None,
-        cc_email: List[str] = None,
+        cc_email: List = None,
         api_idx: Literal[0, 1] = 0,
         success_rule: Literal['partial', 'all'] = 'all'
     ) -> List:
@@ -158,7 +158,9 @@ class AsyncMsgCenter:
         title_param: Dict[str, str] = None,
         content_param: Dict[str, str] = None,
         attachments: Dict[str, Union[str, bytes]] = None,
-        success_rule: Literal['partial', 'all'] = 'all'
+        success_rule: Literal['partial', 'all'] = 'all',
+        cc_users: List[str] = None,
+        cc_groups: List[str] = None,
     ) -> List:
         """推送指定消息模版的消息
 
@@ -171,6 +173,8 @@ class AsyncMsgCenter:
             content_param: 可选，内容变量
             attachments: 可选，站内消息或邮箱的消息附件，以 文件名: 文件(字符串/bytes) 的字典形式提供
             success_rule: 可选，发送成功规则，'partial' 表示部分成功即可，'all' 表示所有收件人都必须成功
+            cc_users: 可选，抄送人userid列表
+            cc_groups: 可选，抄送人groupid列表
 
         .. admonition:: 示例
 
@@ -217,6 +221,11 @@ class AsyncMsgCenter:
             receivers.extend([{'id': r, 'type': 'USER'} for r in receiver_users])
         if receiver_groups:
             receivers.extend([{'id': r, 'type': 'GROUP'} for r in receiver_groups])
+        cc_email = []
+        if cc_users:
+            cc_email.extend([{'id': r, 'type': 'USER'} for r in cc_users])
+        if cc_groups:
+            cc_email.extend([{'id': r, 'type': 'GROUP'} for r in cc_groups])
 
         if not receivers:
             raise ValueError('需提供receiver_users和receiver_groups中的至少一项')
@@ -225,6 +234,7 @@ class AsyncMsgCenter:
             template, sender=sender, receivers=receivers,
             title_param=title_param, content_param=content_param,
             attachments=attachments, success_rule=success_rule,
+            cc_email=cc_email
         )
 
     async def send_mail(
@@ -379,7 +389,9 @@ class MsgCenter(AsyncMsgCenter, metaclass=SyncMeta):
             title_param: Dict[str, str] = None,
             content_param: Dict[str, str] = None,
             attachments: Dict[str, Union[str, bytes]] = None,
-            success_rule: Literal['partial', 'all'] = 'all'
+            success_rule: Literal['partial', 'all'] = 'all',
+            cc_users: List[str] = None,
+            cc_groups: List[str] = None,
         ) -> List:
             ...
 

{deepfos-1.1.69 → deepfos-1.1.71}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.69
+Version: 1.1.71
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team