deepfos 1.1.65__tar.gz → 1.1.67__tar.gz

{deepfos-1.1.65 → deepfos-1.1.67}/CHANGELOG.md

@@ -1,3 +1,22 @@
+## [1.1.67] - 2025-07-22
+
+### 新增
+
+* 财务模型元素查询支持指定透视成员列表
+* 凭证模型数据更新接受指定头行操作类型
+
+### 更新
+
+* 兼容维度load_dataframe依据共享成员列分数据时共享成员列非bool列的处理
+
+
+## [1.1.66] - 2025-07-10
+
+### 更新
+
+* 修复连接器连接信息密码超过16位时的aes解密逻辑
+
+
 ## [1.1.65] - 2025-07-09
 
 ### 更新

{deepfos-1.1.65 → deepfos-1.1.67}/PKG-INFO

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

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-07-09T10:58:56+0000",
+ "date": "2025-07-22T03:24:23+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "7891ba3eb0b577f318140d5ea3b613c82bda9e68",
- "version": "1.1.65"
+ "full-revisionid": "61559f9a44520b8bcfced0acc40f356ed3c1e6d7",
+ "version": "1.1.67"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/element/deepconnector.py

@@ -13,9 +13,11 @@ __all__ = ['AsyncDeepConnector', 'DeepConnector', 'ConnectionInfo']
 
 
 def decrypt(secret, cipher_text, encoding='utf8'):
-    pwd_padded = AES(secret).decrypt(
-        base64.b16decode(cipher_text)
-    )
+    pwd_padded = b''
+    for i in range(len(cipher_text))[::32]:
+        pwd_padded += AES(secret).decrypt(
+            base64.b16decode(cipher_text[i: i + 32])
+        )
     if pwd_padded[-1] in range(1, 17):
         pad_length = pwd_padded[-1]
         pad_char = chr(pwd_padded[-1])

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/element/deepmodel.py

@@ -7,7 +7,7 @@ import json
 import uuid
 from contextlib import asynccontextmanager, contextmanager
 from contextvars import ContextVar
-from itertools import count
+from itertools import count, chain
 from typing import (
     List, TYPE_CHECKING, Any, Dict, Union, NamedTuple,
     Iterable, Optional, Literal
@@ -37,7 +37,7 @@ from deepfos.lib import serutils
 from deepfos.lib.asynchronous import future_property, evloop
 from deepfos.lib.decorator import flagmethod, cached_property, lru_cache
 from deepfos.lib.utils import (
-    AliasGenerator, to_version_tuple, ChunkAlert, split_dataframe_alert
+    AliasGenerator, to_version_tuple,
 )
 
 __all__ = ['AsyncDeepModel', 'DeepModel', 'to_fields', 'QueryWithArgs']
@@ -793,8 +793,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         self,
         direct_access: bool = True,
         pg_dsn: str = None,
-        before_chunk: ChunkAlert = None,
-        after_chunk: ChunkAlert = None,
+        **kwargs
     ):
         self._txn_ = ContextVar('QLTXN')
         self.appmodule = f"app{OPTION.api.header['app']}"
@@ -805,8 +804,6 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         self.alias = AliasGenerator()
         self.pg_dsn = pg_dsn
         self._globals = None
-        self.before_chunk = before_chunk
-        self.after_chunk = after_chunk
         self._clients = threading.local()
 
     @future_property
@@ -1099,6 +1096,10 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                  会自动用作所有string形式ql的参数
 
         """
+        qls_with_args = self._collect_execute_qls(qls, kwargs)
+        return await self._maybe_exec_qls(qls_with_args)
+
+    def _collect_execute_qls(self, qls, kwargs):
         self._ensure_client()
         if isinstance(qls, str):
             qls_with_args = [QueryWithArgs(
@@ -1126,8 +1127,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                     ))
                 else:
                     raise TypeError(f'qls参数中出现类型非法成员：{type(ql)}')
-
-        return await self._maybe_exec_qls(qls_with_args)
+        return qls_with_args
 
     execute.__doc__ = execute.__doc__ + DOC_ARGS_KWARGS
 
@@ -1312,30 +1312,17 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             tgt_main_field[name] = MainField(tgt_bkey, is_multi, link_props)
         return field_info, tgt_main_field
 
-    def _collect_qls(
-        self,
-        data: pd.DataFrame,
-        ql: str,
-        chunksize: int,
-        qls: List[QueryWithArgs]
-    ):
+    def _ql_payload(self, data: pd.DataFrame, ql: str,):
         self._ensure_client()
-
-        for part, alert in split_dataframe_alert(
-            data, chunksize, self.before_chunk, self.after_chunk
-        ):
-            with alert:
-                kw_name = self.alias.get(BATCH_INSERT_KW)
-                qls.append(QueryWithArgs(
-                    commands=ql.replace(
-                        f'${BATCH_INSERT_KW}', f'${kw_name}'
-                    ),
-                    kwargs={kw_name: part.to_json(
-                        orient='records', double_precision=15,
-                        force_ascii=False, default_handler=str
-                    )},
-                    globals=self._globals
-                ))
+        kw_name = self.alias.get(BATCH_INSERT_KW)
+        return QueryWithArgs(
+            commands=ql.replace(f'${BATCH_INSERT_KW}', f'${kw_name}'),
+            kwargs={kw_name: data.to_json(
+                orient='records', double_precision=15,
+                force_ascii=False, default_handler=str
+            )},
+            globals=self._globals,
+        )
 
     @staticmethod
     def _split_self_link(data, relation, structure, bkey):
@@ -1391,6 +1378,87 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             data = data.join(link.to_frame(name), on=bkey)
         return data
 
+    async def _collect_bulk_qls(
+        self,
+        object_name: str,
+        data: pd.DataFrame,
+        relation: Dict[str, pd.DataFrame] = None,
+        chunk_size: int = 500,
+        enable_upsert: bool = False,
+        update_fields: Iterable[str] = None,
+        exclusive_fields: Iterable[str] = None,
+        match_fields: Iterable[str] = None,
+        insert: bool = True
+    ) -> List[List[QueryWithArgs]]:
+        if object_name in self.objects:
+            obj = self.objects[object_name]
+        else:
+            raise ObjectNotExist(
+                f'DeepModel对象[{object_name}]在当前应用不存在，无法插入数据'
+            )
+        if obj.external:
+            raise ExternalObjectReadOnly('外部对象只可读')
+
+        structure = ObjectStructure(name=obj.name, structure=obj.fields.values())
+        self._valid_data(data, object_name, relation, structure, check_required=insert)
+
+        relation = relation or {}
+        bkey = await self._get_bkey(obj)
+        if bkey not in data.columns:
+            raise RequiredFieldUnfilled(f'缺少业务主键[{bkey}]')
+
+        # data拼接relation df
+        data = self._merge_relation(data, relation, structure, bkey)
+        # 从data中分离出self-link更新信息
+        data, self_link_dfs = self._split_self_link(data, relation, structure, bkey)
+        field_info, tgt_main_field = await self._collect_bulk_field_info(
+            object_name, structure, data, relation
+        )
+        field_names = set(map(lambda f: f.name, field_info))
+        if insert:
+            if enable_upsert:
+                self._valid_upsert(obj, field_names, bkey, exclusive_fields, update_fields)
+
+            exclusive_fields = set(exclusive_fields or {bkey}) & set(field_names)
+            update_fields = set(update_fields or (field_names - {bkey})) & set(field_names)
+            if enable_upsert and update_fields:
+                bulk_ql = bulk_upsert_by_fields(
+                    object_name, field_info, tgt_main_field,
+                    exclusive_fields, update_fields
+                )
+            else:
+                bulk_ql = bulk_insert_by_fields(object_name, field_info, tgt_main_field)
+        else:
+            if missing := (set(match_fields or [bkey]) - set(field_names)):
+                raise ValueError(f"match fields: {missing} 不在提供的数据中")
+
+            match_fields = set(match_fields or [bkey]) & set(field_names)
+            if to_upd := (field_names - match_fields):
+                bulk_ql = bulk_update_by_fields(
+                    object_name, field_info, tgt_main_field,
+                    match_fields, to_upd
+                )
+            else:
+                bulk_ql = None
+        qls = []
+        self._ensure_client()
+        for i in range(0, len(data), chunk_size):
+            part = structure.fit(data.iloc[i: i + chunk_size])
+            ql_chunk = []
+            # Ignore bulk_ql when only update multi links
+            if bulk_ql is not None:
+                ql_chunk = [self._ql_payload(part, bulk_ql)]
+            for update_field, (update_df, main_field) in self_link_dfs.items():
+                field = structure.fields[update_field]
+                update_ql = bulk_update_by_fields(
+                    object_name, [field], {update_field: main_field},
+                    [bkey], [update_field]
+                )
+                update_part = update_df.iloc[i: i + chunk_size]
+                ql_chunk.append(self._ql_payload(update_part, update_ql))
+            qls.append(ql_chunk)
+        return qls
+
     @txn_support
     async def insert_df(
         self,
@@ -1401,6 +1469,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         enable_upsert: bool = False,
         update_fields: Iterable[str] = None,
         exclusive_fields: Iterable[str] = None,
+        commit_per_chunk: bool = False,
     ) -> None:
         """以事务执行基于DataFrame字段信息的批量插入数据
 
@@ -1421,6 +1490,9 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             exclusive_fields: upsert句式下update的exclusive fields列表，
                             涉及的fields需出现在data或relation中，
                             默认为业务主键
+            commit_per_chunk: 每次插入后是否提交事务，
+                            默认为False，即所有数据插入后再提交事务
+                            该参数仅在非start transaction上下文中生效
 
         Notes:
 
@@ -1493,54 +1565,16 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             logger.info("data为空，无DML执行")
             return
 
-        if object_name in self.objects:
-            obj = self.objects[object_name]
-        else:
-            raise ObjectNotExist(
-                f'DeepModel对象[{object_name}]在当前应用不存在，无法插入数据'
-            )
-        if obj.external:
-            raise ExternalObjectReadOnly('外部对象只可读')
-
-        structure = ObjectStructure(name=obj.name, structure=obj.fields.values())
-
-        self._valid_data(data, object_name, relation, structure)
-
-        relation = relation or {}
-        bkey = await self._get_bkey(obj)
-        # data拼接relation df
-        data = self._merge_relation(data, relation, structure, bkey)
-        # 从data中分离出self-link更新信息
-        data, self_link_dfs = self._split_self_link(data, relation, structure, bkey)
-        field_info, tgt_main_field = await self._collect_bulk_field_info(
-            object_name, structure, data, relation
+        qls = await self._collect_bulk_qls(
+            object_name, data, relation, chunksize,
+            enable_upsert, update_fields, exclusive_fields,
+            insert=True
         )
-        field_names = set(map(lambda f: f.name, field_info))
-        if enable_upsert:
-            self._valid_upsert(obj, field_names, bkey, exclusive_fields, update_fields)
-
-        exclusive_fields = set(exclusive_fields or {bkey}) & set(field_names)
-        update_fields = set(update_fields or (field_names - {bkey})) & set(field_names)
-        if enable_upsert and update_fields:
-            insert_ql = bulk_upsert_by_fields(
-                object_name, field_info, tgt_main_field,
-                exclusive_fields, update_fields
-            )
+        if commit_per_chunk:
+            for ql_chunk in qls:
+                await self.execute(ql_chunk)
         else:
-            insert_ql = bulk_insert_by_fields(object_name, field_info, tgt_main_field)
-
-        qls = []
-        self._collect_qls(structure.fit(data), insert_ql, chunksize, qls)
-        if self_link_dfs:
-            for update_field, (update_df, main_field) in self_link_dfs.items():
-                field = structure.fields[update_field]
-                update_ql = bulk_update_by_fields(
-                    object_name, [field], {update_field: main_field},
-                    [bkey], [update_field]
-                )
-                self._collect_qls(update_df, update_ql, chunksize, qls)
-
-        await self.execute(qls)
+            await self.execute(list(chain(*qls)))
 
     async def get_object(
         self,
@@ -1693,6 +1727,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         relation: Dict[str, pd.DataFrame] = None,
         chunksize: int = 500,
         match_fields: Iterable[str] = None,
+        commit_per_chunk: bool = False,
     ) -> None:
         """以事务执行基于DataFrame字段信息的批量更新数据
 
@@ -1709,57 +1744,23 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                     若有link property，则以property名为列名，提供在除source和target的列中
             chunksize: 单次最大行数
             match_fields: update的匹配列表，涉及的fields需出现在data或relation中，默认为业务主键
+            commit_per_chunk: 每次插入后是否提交事务，
+                            默认为False，即所有数据插入后再提交事务
+                            该参数仅在非start transaction上下文中生效
         """
         if data.empty:
             logger.info("data为空，无DML执行")
             return
 
-        if object_name in self.objects:
-            obj = self.objects[object_name]
-        else:
-            raise ObjectNotExist(
-                f'DeepModel对象[{object_name}]在当前应用不存在，无法更新数据'
-            )
-        if obj.external:
-            raise ExternalObjectReadOnly('外部对象只可读')
-
-        structure = ObjectStructure(name=obj.name, structure=obj.fields.values())
-        self._valid_data(data, object_name, relation, structure, check_required=False)
-        relation = relation or {}
-        bkey = await self._get_bkey(obj)
-        if bkey not in data.columns:
-            raise RequiredFieldUnfilled(f'缺少业务主键[{bkey}]')
-        # data拼接relation df
-        data = self._merge_relation(data, relation, structure, bkey)
-        # 从data中分离出self-link更新信息
-        data, self_link_dfs = self._split_self_link(data, relation, structure, bkey)
-        field_info, tgt_main_field = await self._collect_bulk_field_info(
-            object_name, structure, data, relation
-        )
-        field_names = set(map(lambda f: f.name, field_info))
-
-        if missing := (set(match_fields or [bkey]) - set(field_names)):
-            raise ValueError(f"match fields: {missing} 不在提供的数据中")
-
-        match_fields = set(match_fields or [bkey]) & set(field_names)
-        update_ql = bulk_update_by_fields(
-            object_name, field_info, tgt_main_field,
-            match_fields, field_names - match_fields
+        qls = await self._collect_bulk_qls(
+            object_name, data, relation, chunksize,
+            match_fields=match_fields, insert=False
         )
-        qls = []
-        self._collect_qls(structure.fit(data), update_ql, chunksize, qls)
-        if self_link_dfs:
-            for update_field, (update_df, main_field) in self_link_dfs.items():
-                field = structure.fields[update_field]
-                update_ql = bulk_update_by_fields(
-                    object_name, [field],
-                    {update_field: main_field},
-                    [bkey],
-                    [update_field]
-                )
-                self._collect_qls(update_df, update_ql, chunksize, qls)
-
-        await self.execute(qls)
+        if commit_per_chunk:
+            for ql_chunk in qls:
+                await self.execute(ql_chunk)
+        else:
+            await self.execute(list(chain(*qls)))
 
     @asynccontextmanager
     async def start_transaction(self, flatten: bool = False):
@@ -1799,7 +1800,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
 
         Important:
 
-            仅 :func:`insert_df` :func:`execute` 方法支持在事务中执行
+            仅 :func:`insert_df` :func:`update_df` :func:`execute` 方法支持在事务中执行
 
         """
         try:
@@ -1913,6 +1914,7 @@ class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
             enable_upsert: bool = False,
             update_fields: Iterable[str] = None,
             exclusive_fields: Iterable[str] = None,
+            commit_per_chunk: bool = False,
         ) -> None:
             ...
 
@@ -1934,6 +1936,7 @@ class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
             relation: Dict[str, pd.DataFrame] = None,
             chunksize: int = 500,
             match_fields: Iterable[str] = None,
+            commit_per_chunk: bool = False,
         ) -> None:
             ...
 

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/element/dimension.py

@@ -956,7 +956,7 @@ class AsyncDimension(ElementBase[DimensionAPI]):
 
         # -----------------------------------------------------------------------------
         # has shared member
-        df_shared: pd.DataFrame = df[df[shared_mbr_col]]
+        df_shared: pd.DataFrame = df[df[shared_mbr_col].astype(bool)]
         if self._strict:
             existed_mbrs = self._member_memo
 
@@ -989,7 +989,7 @@ class AsyncDimension(ElementBase[DimensionAPI]):
         # 在df中丢弃系统中已存在的共享节点
         df_shared_remain = df_shared[~df_shared.index.isin(dup_sharedmbrs)]
 
-        df_not_shared = df[~df[shared_mbr_col]]
+        df_not_shared = df[~df[shared_mbr_col].astype(bool)]
         existed_idx = df_not_shared[DFLT_NAME_COLUMN].isin(existed_mbrs)
         return df_not_shared.loc[existed_idx], \
             pd.concat([df_not_shared.loc[~existed_idx], df_shared_remain])

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/element/finmodel.py

@@ -390,6 +390,7 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
         verify_access: bool = False,
         include_ignored: bool = False,
         normalize_view: bool = False,
+        pivot_members: List[str] = None,
     ) -> Union[pd.DataFrame, Tuple[pd.DataFrame, Dict[str, str]]]:
         """
         根据维度表达式以及pov获取cube数据
@@ -403,6 +404,7 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
             verify_access: 是否带权限查询
             include_ignored: 包含多版本实体维时，是否在结果中包含无效数据(即i列为1的数据)
             normalize_view: 是否把大小写View统一成"View"
+            pivot_members: 如有透视维度，可指定透视成员列表，在透视列成员不存在时补全列
 
         .. admonition:: 示例
 
@@ -432,7 +434,9 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
 
         """
         pov = self._resolve_pov_as_dict(pov, validate_expr)
-        expression, full_pov = self._split_expr(expression, pov, validate_expr=validate_expr)
+        expression, full_pov = self._split_expr(
+            expression, pov, validate_expr=validate_expr
+        )
         pov_expr = dict_to_expr(full_pov)
 
         if not expression:  # only pov
@@ -469,10 +473,17 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
 
         if pivot_dim is not None:
             pivot_col = self._get_column_from_dim(pivot_dim)
-
+            has_mbrs = isinstance(pivot_members, list)
+            if has_mbrs and any(not isinstance(c, str) for c in pivot_members):
+                raise ValueError(
+                    f"Pivot members must be a list of string, got: {pivot_members}"
+                )
             if pivot_col in full_pov:
                 val = full_pov.pop(pivot_col)
-                data = data.rename(columns={DFLT_DATA_COLUMN: val})
+                if not has_mbrs or val in pivot_members:
+                    data = data.rename(columns={DFLT_DATA_COLUMN: val})
+                else:
+                    data = data.drop(columns=[DFLT_DATA_COLUMN])
             elif pivot_col not in data.columns:
                 raise ValueError(
                     f"Pivot dimension: {pivot_dim} does not "
@@ -488,7 +499,14 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
                     columns=pivot_col, aggfunc='first', fill_value=None
                 ).reset_index(drop=drop_index)
                 data.columns.name = None
-
+                if has_mbrs:
+                    data = data.drop(columns=filter(
+                        lambda c: c not in pivot_members and c not in index,
+                        data.columns
+                    ))
+            if has_mbrs:
+                mbr_assigns = {m: None for m in pivot_members if m not in data.columns}
+                data = data.assign(**mbr_assigns)
         if not compact:
             return data.assign(**full_pov)
         return data, full_pov
@@ -1573,6 +1591,7 @@ class FinancialCube(AsyncFinancialCube, metaclass=SyncMeta):
             verify_access: bool = False,
             include_ignored: bool = False,
             normalize_view: bool = False,
+            pivot_members: List[str] = None,
         ) -> Union[pd.DataFrame, Tuple[pd.DataFrame, Dict[str, str]]]:
             ...
 

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos/element/journal.py

@@ -122,8 +122,7 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         line_df: pd.DataFrame,
         callback: Union[Dict, CallbackInfo] = None,
         relation_field: str = 'journal_id',
-        id_col: str = None,
-        operate_type: Literal['EDIT', 'ADD'] = 'ADD',
+        id_col: str = MAIN_ID,
         enable_create: bool = True,
         enable_default_value: bool = True,
         enable_repeat_check: bool = True,
@@ -131,9 +130,10 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         enable_valid_range: bool = True,
         enable_all_errors: bool = True,
         enable_need_one_line: bool = True,
+        header_operate: Literal['EDIT', 'ADD', 'DELETE_ADD'] = 'ADD',
+        line_operate: Literal['EDIT', 'ADD', 'DELETE', 'DELETE_ADD'] = 'ADD',
     ):
         errors = set()
-        is_editing = operate_type == 'EDIT'
 
         if head_df.empty:
             errors.add('凭证头表数据DataFrame不能为空')
@@ -143,6 +143,7 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
             errors.add('凭证头行表的关联字段relation_field不能为空')
 
         self._maybe_raise_errors(errors)
+        is_editing = not (header_operate == 'ADD' and line_operate == 'ADD')
 
         if is_editing:
             head_required_fields = [relation_field, '_type', id_col]
@@ -201,7 +202,7 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
                     index=head_data.index
                 )
             )
-        head_data = head_data.assign(operateType=operate_type)
+        head_data = head_data.assign(operateType=header_operate)
 
         # NB: replace twice in case of infer None to nan happened
         head_df = head_df.replace({None: np.nan})
@@ -227,7 +228,7 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         self._maybe_raise_errors(errors)
 
         line_data = line_df[line_required_fields]
-        line_data = line_data.assign(operateType=operate_type)
+        line_data = line_data.assign(operateType=line_operate)
 
         # generate lineMainId
         if is_editing:
@@ -301,7 +302,7 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         enable_need_one_line: bool = True,
         sync: bool = True
     ) -> CommonResultDTO:
-        """凭证模型数据保存
+        """凭证模型数据新增
         
         Args:
             head_df: 凭证头表的数据（字段名与凭证模型上头表的字段名对应）
@@ -471,6 +472,8 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         enable_valid_range: bool = True,
         enable_all_errors: bool = True,
         enable_need_one_line: bool = True,
+        header_operate: Literal['EDIT', 'DELETE_ADD'] = 'EDIT',
+        line_operate: Literal['EDIT', 'ADD', 'DELETE', 'DELETE_ADD'] = 'EDIT',
     ) -> CommonResultDTO:
         """凭证模型数据更新
 
@@ -491,6 +494,10 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
             enable_valid_range: 是否启用有效性范围的校验，默认为True
             enable_all_errors: 是否启用一次性校验所有规则和数据，默认为True
             enable_need_one_line: 是否启用凭证行表至少需要一条数据的校验，默认为True
+            header_operate: 凭证头表的操作类型，默认为EDIT
+            line_operate: 凭证行表的操作类型，默认为EDIT
+                         头表EDIT, 行表可以ADD/EDIT/DELETE
+                         头表DELETE_ADD, 头表update，行表全删全增，行表只能为DELETE_ADD
 
         Returns:
            接口返回信息（CommonResultDTO的success为true 表示成功，如false 则错误在errors集合里）
@@ -500,14 +507,16 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         batch = self._gen_batch_payload(
             head_df=head_df, line_df=line_df,
             callback=callback, relation_field=relation_field,
-            id_col=MAIN_ID, operate_type='EDIT',
+            id_col=MAIN_ID,
             enable_create=enable_create,
             enable_default_value=enable_default_value,
             enable_repeat_check=enable_repeat_check,
             enable_required=enable_required,
             enable_valid_range=enable_valid_range,
             enable_all_errors=enable_all_errors,
-            enable_need_one_line=enable_need_one_line
+            enable_need_one_line=enable_need_one_line,
+            header_operate=header_operate,
+            line_operate=line_operate,
         )
         resp = await self.async_api.journal_model_data.update(batch)
 
@@ -814,6 +823,8 @@ class JournalModel(AsyncJournalModel, metaclass=SyncMeta):
             enable_valid_range: bool = True,
             enable_all_errors: bool = True,
             enable_need_one_line: bool = True,
+            header_operate: Literal['EDIT', 'DELETE_ADD'] = 'EDIT',
+            line_operate: Literal['EDIT', 'ADD', 'DELETE', 'DELETE_ADD'] = 'EDIT',
         ) -> CommonResultDTO:
             ...
 

{deepfos-1.1.65 → deepfos-1.1.67}/deepfos.egg-info/PKG-INFO

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