deepfos 1.1.59__tar.gz → 1.1.62__tar.gz

{deepfos-1.1.59 → deepfos-1.1.62}/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.1.62] - 2025-06-12
+
+### 更新
+
+* 工作流完成任务实例方法增加提供动作类型参数
+
+
+## [1.1.61] - 2025-06-10
+
+### 新增
+
+* 财务模型元素实例化支持定制数据来源类型
+
+### 更新
+
+* deepmodel query_df无论有无数据都在列信息上保持一致性
+
+
 ## [1.1.59] - 2025-06-05
 
 ### 更新

{deepfos-1.1.59 → deepfos-1.1.62}/PKG-INFO

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

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-05T10:33:43+0000",
+ "date": "2025-06-12T05:42:40+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "f773d5beecc1220650ab78f23b81f6e3a5e79616",
- "version": "1.1.59"
+ "full-revisionid": "cbd77f74d1d6b9c821c1c69be29fb027794f846c",
+ "version": "1.1.62"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/api/models/workflow.py

@@ -57,6 +57,7 @@ __all__ = [
     'SendMessageParam',
     'FlowQueryResp',
     'TaskCompleteParam',
+    'OutComeDto',
 ]
 
 
@@ -411,16 +412,12 @@ class UserDetailVO(BaseModel):
     mobilePhone: Optional[str] = None
     #: 昵称
     nickName: Optional[str] = None
-    #: nickname
-    nickname: Optional[str] = None
     #: 状态
     status: Optional[str] = None
     #: 用户id
     userId: Optional[str] = None
     #: 用户名
     userName: Optional[str] = None
-    #: username
-    username: Optional[str] = None
 
 
 class UserPageParamsVO(BaseModel):
@@ -559,12 +556,6 @@ class TaskCompleteParam(BaseModel):
     value: Any
 
 
-class TaskCompleteParam(BaseModel):
-    """任务完成参数"""
-    name: str
-    value: Any
-
-
 class TaskCompleteInstance(BaseModel):
     """任务完成实体
 
@@ -583,6 +574,8 @@ class TaskCompleteInstance(BaseModel):
     taskId: Optional[str] = None
     #: 完成参数
     extraResParams: Optional[List[TaskCompleteParam]] = None
+    #: 按钮id
+    actionId: Optional[str] = None
 
 
 class TaskReqDto(BaseModel):
@@ -958,4 +951,13 @@ class FlowQueryResp(BaseModel):
     versionStatus: Optional[str] = None
 
 
+class OutComeDto(BaseModel):
+    """获取用户任务outcome
 
+    .. admonition:: 引用接口
+
+        - **GET** ``/process/task/outcomes`` (Response: 200)
+    """
+    code: Optional[str] = None
+    id: Optional[str] = None
+    name: Optional[Any] = None

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/api/workflow.py

@@ -188,6 +188,14 @@ class ProcessTask(ChildAPI):
         """
         return {'body': userTaskQueryDTO}
 
+    @get('outcomes')
+    def outcomes(self, taskId: str) -> Union[List[OutComeDto], Awaitable[List[OutComeDto]]]:
+        """
+        获取用户任务outcome
+
+        """
+        return {'param': {'taskId': taskId}}
+
 
 class Version(ChildAPI):
     endpoint = '/version'

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/element/deepmodel.py

@@ -650,7 +650,8 @@ def collect_query_result_structure(
         )
         for f in object_info.fields
     ]
-    return ObjectStructure(name='', structure=fields)
+    include_id = len(fields) == 1 and fields[0].name == 'id'
+    return ObjectStructure(name='', structure=fields, include_id=include_id)
 
 
 def collect_frame_desc_structure(desc: Dict[str, str]):
@@ -664,7 +665,8 @@ def collect_frame_desc_structure(desc: Dict[str, str]):
         )
         for name, tname in desc.items()
     ]
-    return ObjectStructure(name='', structure=fields)
+    include_id = len(fields) == 1 and fields[0].name == 'id'
+    return ObjectStructure(name='', structure=fields, include_id=include_id)
 
 
 # Copied from edb/pgsql/types.py base_type_name_map
@@ -1008,6 +1010,14 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         """
         if self.direct_access:
             frame_desc, data = await self.client.query(ql, **kwargs)
+            # set of unnamed tuple
+            if isinstance(frame_desc, list):
+                return pd.DataFrame(
+                    data=serutils.serialize(
+                        data, ctx=serutils.Context(frame_desc=frame_desc, query_df=True)
+                    ),
+                    columns=[str(i) for i in range(len(frame_desc))]
+                )
 
             data = pd.DataFrame(data=serutils.serialize(
                 data, ctx=serutils.Context(frame_desc=frame_desc, query_df=True)

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/element/finmodel.py

@@ -134,7 +134,11 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
 
     Args:
         entry_object: 数据来源名模板，支持替换的字段为脚本元素名称或脚本全名，默认为python
-
+        entry_mode: 数据来源类型，影响显示的icon，默认为1
+            1: Python
+            2: 电子表格
+            3: 可视化计算脚本
+            4: 数据流3.0
 
     Note:
 
@@ -174,11 +178,13 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
         folder_id: Optional[str] = None,
         path: Optional[str] = None,
         entry_object='python',
+        entry_mode=1,
         server_name: Optional[str] = None,
     ):
         full_name = OPTION.general.task_info.get('script_name', 'python')
         self.entry_object = entry_object.format(script_name=full_name.split('.')[-1],
                                                 full_name=full_name)
+        self.entry_mode = entry_mode
         super().__init__(element_name, folder_id, path, server_name)
 
     @future_property(on_demand=True)
@@ -822,7 +828,7 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
                 )],
                 needCheck=need_check,
                 dataAuditSwitch=data_audit,
-                entryMode=1,
+                entryMode=self.entry_mode,
                 validateDimensionMember=need_check,
                 callback=callback,
                 saveDataAuthMode=auth_mode

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos/element/workflow.py

@@ -295,7 +295,7 @@ class AsyncWorkFlow(ElementBase[WorkFlowAPI]):
         comment: str = None,
         file_path: str = None,
         outcome: str = None,
-        extra_res_params: Dict[str, Any] = None
+        extra_res_params: Dict[str, Any] = None,
     ) -> bool:
         """完成任务实例
 
@@ -311,6 +311,13 @@ class AsyncWorkFlow(ElementBase[WorkFlowAPI]):
             False: 失败
 
         """
+        action_id = None
+        if outcome is not None:
+            outcomes = await self.async_api.task.outcomes(task_id)
+            for o in outcomes:
+                if o.code == outcome:
+                    action_id = o.id
+                    break
         if extra_res_params is None:
             extra_res_params = {}
         return await self.async_api.task.express_complete(
@@ -319,7 +326,8 @@ class AsyncWorkFlow(ElementBase[WorkFlowAPI]):
                 extraResParams=[
                     TaskCompleteParam(name=k, value=v)
                     for k, v in extra_res_params.items()
-                ]
+                ],
+                actionId=action_id
             )
         )
 

{deepfos-1.1.59 → deepfos-1.1.62}/deepfos.egg-info/PKG-INFO

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