deepfos 1.1.68__tar.gz → 1.1.70__tar.gz

{deepfos-1.1.68 → deepfos-1.1.70}/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [1.1.70] - 2025-08-19
+
+### 新增
+
+* 消息中心推送增加抄送用户、用户组参数
+
+
+## [1.1.69] - 2025-08-12
+
+### 新增
+
+* 消息中心推送接受发送成功规则参数
+
+
 ## [1.1.68] - 2025-07-29
 
 ### 更新

{deepfos-1.1.68 → deepfos-1.1.70}/PKG-INFO

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

{deepfos-1.1.68 → deepfos-1.1.70}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-08-07T03:10:50+0000",
+ "date": "2025-08-18T10:23:53+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "e1b02f36c62e37f03965c5219dc9426d19af95a8",
- "version": "1.1.68"
+ "full-revisionid": "7c62afcad8175dbdb4e323deb062c91083af3793",
+ "version": "1.1.70"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.68 → deepfos-1.1.70}/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.68 → deepfos-1.1.70}/deepfos/exceptions/__init__.py

@@ -200,7 +200,7 @@ class MsgCenterError(DeepfosBaseException):
         self.reasons = reasons
 
     def __str__(self):
-        return '推送失败，报错信息：' + '\n'.join([r.errorMsg for r in self.reasons])
+        return '推送失败，响应错误详情：\n' + '\n'.join([str(r.dict()) for r in self.reasons])
 
 
 # -----------------------------------------------------------------------------

{deepfos-1.1.68 → deepfos-1.1.70}/deepfos/lib/msg.py

@@ -110,8 +110,9 @@ 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,
-        api_idx: Literal[0, 1] = 0
+        cc_email: List = None,
+        api_idx: Literal[0, 1] = 0,
+        success_rule: Literal['partial', 'all'] = 'all'
     ) -> List:
         payload = {
             'receiver': receivers,
@@ -139,7 +140,11 @@ class AsyncMsgCenter:
 
         api = self.type_api_map[tpl_type][api_idx]
         resp = await api(payload)
-        if resp.failure:
+        if resp.failure and (
+            success_rule == 'all' or (
+                success_rule == 'partial' and not resp.success
+            )
+        ):
             raise MsgCenterError(*resp.failure)
         
         return resp.success
@@ -153,6 +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',
+        cc_users: List[str] = None,
+        cc_groups: List[str] = None,
     ) -> List:
         """推送指定消息模版的消息
 
@@ -164,6 +172,9 @@ class AsyncMsgCenter:
             title_param: 可选，标题变量
             content_param: 可选，内容变量
             attachments: 可选，站内消息或邮箱的消息附件，以 文件名: 文件(字符串/bytes) 的字典形式提供
+            success_rule: 可选，发送成功规则，'partial' 表示部分成功即可，'all' 表示所有收件人都必须成功
+            cc_users: 可选，抄送人userid列表
+            cc_groups: 可选，抄送人groupid列表
 
         .. admonition:: 示例
 
@@ -210,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中的至少一项')
@@ -217,7 +233,8 @@ class AsyncMsgCenter:
         return await self._publish(
             template, sender=sender, receivers=receivers,
             title_param=title_param, content_param=content_param,
-            attachments=attachments,
+            attachments=attachments, success_rule=success_rule,
+            cc_email=cc_email
         )
 
     async def send_mail(
@@ -229,6 +246,7 @@ class AsyncMsgCenter:
         content_param: Dict[str, str] = None,
         attachments: Dict[str, Union[str, bytes]] = None,
         cc_email: List[str] = None,
+        success_rule: Literal['partial', 'all'] = 'all'
     ) -> List:
         """发送指定消息模版的邮件
 
@@ -240,6 +258,7 @@ class AsyncMsgCenter:
             content_param: 可选，内容变量
             attachments: 可选，附件，以 文件名: 文件(字符串/bytes) 的字典形式提供
             cc_email: 可选，抄送人列表
+            success_rule: 可选，发送成功规则，'partial' 表示部分成功即可，'all' 表示所有收件人都必须成功
 
 
         .. admonition:: 示例
@@ -289,7 +308,7 @@ class AsyncMsgCenter:
             template, sender=sender, receivers=receivers,
             title_param=title_param, content_param=content_param,
             attachments=attachments, cc_email=cc_email,
-            api_idx=1
+            api_idx=1, success_rule=success_rule,
         )
 
     async def send_sms(
@@ -298,7 +317,8 @@ class AsyncMsgCenter:
         receivers: List[str],
         sender: str = None,
         title_param: Dict[str, str] = None,
-        content_param: Dict[str, str] = None
+        content_param: Dict[str, str] = None,
+        success_rule: Literal['partial', 'all'] = 'all'
     ) -> List:
         """发送指定消息模版的短信
 
@@ -308,6 +328,7 @@ class AsyncMsgCenter:
             sender: 可选，发送人userid，默认为当前用户id
             title_param: 可选，标题变量
             content_param: 可选，内容变量
+            success_rule: 可选，发送成功规则，'partial' 表示部分成功即可，'all' 表示所有收件人都必须成功
 
 
         .. admonition:: 示例
@@ -351,7 +372,7 @@ class AsyncMsgCenter:
         return await self._publish(
             template, sender=sender, receivers=receivers,
             title_param=title_param, content_param=content_param,
-            api_idx=1
+            api_idx=1, success_rule=success_rule,
         )
 
 
@@ -368,6 +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',
+            cc_users: List[str] = None,
+            cc_groups: List[str] = None,
         ) -> List:
             ...
 
@@ -380,6 +404,7 @@ class MsgCenter(AsyncMsgCenter, metaclass=SyncMeta):
             content_param: Dict[str, str] = None,
             attachments: Dict[str, Union[str, bytes]] = None,
             cc_email: List[str] = None,
+            success_rule: Literal['partial', 'all'] = 'all'
         ) -> List:
             ...
 
@@ -389,6 +414,7 @@ class MsgCenter(AsyncMsgCenter, metaclass=SyncMeta):
             receivers: List[str],
             sender: str = None,
             title_param: Dict[str, str] = None,
-            content_param: Dict[str, str] = None
+            content_param: Dict[str, str] = None,
+            success_rule: Literal['partial', 'all'] = 'all'
         ) -> List:
             ...

{deepfos-1.1.68 → deepfos-1.1.70}/deepfos.egg-info/PKG-INFO

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