deepfos 1.1.74__tar.gz → 1.1.75__tar.gz

{deepfos-1.1.74 → deepfos-1.1.75}/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [1.1.75] - 2025-09-17
+
+### 更新
+
+* 适配财务模型delete接口
+
+
 ## [1.1.74] - 2025-09-16
 
 ### 更新

{deepfos-1.1.74 → deepfos-1.1.75}/PKG-INFO

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

{deepfos-1.1.74 → deepfos-1.1.75}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-09-16T04:32:06+0000",
+ "date": "2025-09-18T10:14:56+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "c0ae4a326c442d072bfc0722ebcf1c6ca5002d03",
- "version": "1.1.74"
+ "full-revisionid": "874420bc37e43a0b78366335290be2dbff468540",
+ "version": "1.1.75"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.74 → deepfos-1.1.75}/deepfos/api/financial_model.py

@@ -53,6 +53,10 @@ class Extra(ChildAPI):
         """
         return {'body': calculateDTO}
 
+    @get('git-version')
+    def git_version(self) -> Union[str, Awaitable[str]]:
+        return {}
+
 
 class CubeDataAPI(ChildAPI):
     endpoint = '/cube-data'
@@ -163,6 +167,14 @@ class CubeCalculateAPI(ChildAPI):
         """
         return {'body': clearDataDTO}
 
+    @post('/sync/clearData')
+    def clear_data_ex(self, clearDataDTO: SyncClearDataDto) -> Union[Any, Awaitable[Any]]:
+        """
+        根据财务数据模型名称 所在文件夹Id 维度表达式 清除相关的数据
+
+        """
+        return {'body': clearDataDTO}
+
 
 class ReactSpreadsheet(ChildAPI):
     endpoint = '/react/spreadsheet'

{deepfos-1.1.74 → deepfos-1.1.75}/deepfos/api/models/financial_model.py

@@ -81,6 +81,7 @@ __all__ = [
     'RoleSetDataBlock',
     'FinancialDataDto',
     'TaskExecutionParam',
+    'SyncClearDataDto',
     'TaskExecutionResult'
 ]
 
@@ -1788,6 +1789,29 @@ class FinancialDataDto(BaseModel):
     datatable: Optional[DatatableInfoDto] = None
 
 
+class SyncClearDataDto(BaseModel):
+    """Cube clear data dto
+
+    .. admonition:: 引用接口
+
+        - **POST** ``/cubeCalculate/sync/clearData``
+    """
+    #: 财务模型名称
+    cubeName: str
+    #: 财务模型路径id
+    folderId: Optional[str] = None
+    #: 财务模型路径
+    path: Optional[str] = None
+    #: 删除范围
+    clearScriptList: Optional[List[str]] = None
+    #: entryMode
+    entryMode: Optional[int] = None
+    #: entryObject
+    entryObject: Optional[str] = None
+    #: 日志开关
+    dataAuditSwitch: Optional[bool] = None
+
+
 CubeAccessControlViewReact.update_forward_refs()
 DatatableColumnDto.update_forward_refs()
 DatatableInfoDto.update_forward_refs()

{deepfos-1.1.74 → deepfos-1.1.75}/deepfos/element/finmodel.py

@@ -44,7 +44,8 @@ from deepfos.api.models.financial_model import (
     PcParams, CopyCalculateDTO,
     TaskExecutionParam,
     ParameterDefineDto,  # noqa
-    FinancialDataDto
+    FinancialDataDto,
+    SyncClearDataDto,
 )
 from deepfos.api.models.base import BaseModel
 from deepfos.options import OPTION
@@ -71,6 +72,9 @@ def need_query(body: str):
 
 # -----------------------------------------------------------------------------
 # models
+TypeDimensionExpr = Union[str, Dict[str, Union[List[str], str]]]
+
+
 class Description(BaseModel):
     zh_cn: Optional[str] = Field(None, alias='zh-cn')
     en: Optional[str] = None
@@ -608,6 +612,8 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
 
         See Also:
             :meth:`save_unpivot`
+            :meth:`complement_save`
+            :meth:`complement_save_unpivot`
 
         """
         data, pov = self._build_dataframe_for_save(data, pov, data_column, comment_column)
@@ -650,7 +656,7 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
     ):
         """覆盖指定维度范围并保存数据
 
-        相比于:meth:`save`，在保存前，会将`data`按照`expression`补全笛卡尔积。
+        相比于 :meth:`save` ，在保存前，会将`data`按照`expression`补全笛卡尔积。
         并且不在`data`范围的数据以`None`填充
 
         Note:
@@ -664,14 +670,54 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
         Args:
             data: 需要保存的数据
             expression: 需要覆盖的范围（维度表达式）
-            default_hierarchy: 单expression中没指定对应维度时，默认取的层级函数，
+            default_hierarchy: 当expression中没指定对应维度时，默认取的层级函数，
                 即填充为 `default_hierarchy(#root,0)`
             pov: Point Of View，维度表达式或者KV键值对格式。
             data_column: 数据列的列名
             comment_column: 备注列的列名，默认为VirtualMeasure_220922
-            **kwargs: 其他可传给:meth:`save`的参数
+            **kwargs: 其他可传给 :meth:`save`的参数
+
+        See Also:
+            :meth:`save`
+            :meth:`save_unpivot`
+            :meth:`complement_save_unpivot`
 
         """
+        if not self._backend_del_availiable:
+            return await self._legacy_complement_save(
+                data=data,
+                expression=expression,
+                default_hierarchy=default_hierarchy,
+                pov=pov,
+                data_column=data_column,
+                comment_column=comment_column,
+                **kwargs
+            )
+
+        await self.delete(
+            expression,
+            data_audit=False,
+            default_hierarchy=default_hierarchy
+        )
+        await self.save(
+            data=data,
+            pov=pov,
+            data_column=data_column,
+            comment_column=comment_column,
+            **kwargs,
+        )
+
+
+    async def _legacy_complement_save(
+        self,
+        data: pd.DataFrame,
+        expression: Union[str, Dict[str, Union[List[str], str]]],
+        default_hierarchy: str = "Base",
+        pov: Optional[Union[str, Dict[str, str]]] = None,
+        data_column: str = DFLT_DATA_COLUMN,
+        comment_column: str = DFLT_COMMENT_COLUMN,
+        **kwargs
+    ):
         data, pov = self._build_dataframe_for_save(data, pov, data_column, comment_column)
         if data.empty:
             return
@@ -795,14 +841,49 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
             default_hierarchy: 单expression中没指定对应维度时，默认取的层级函数，
                 即填充为 `default_hierarchy(#root,0)`
             pov: Point Of View，维度表达式或者KV键值对格式。
-            need_check: 是否需要java接口校验脏数据
-            data_audit: 是否需要记录到数据审计
-            chunksize: 单次调用保存接口时最大的dataframe行数。
-              当data的行数超过此值时，将会分多次进行保存。
             save_nan: 当把数据列成员转换到行上时，data为空的数据是否保存
-            callback: 是否回调
+            **kwargs: 其他可传给 :meth:`save_unpivot`的参数
+
+        See Also:
+            :meth:`save`
+            :meth:`save_unpivot`
+            :meth:`complement_save`
 
         """
+        if not self._backend_del_availiable:
+            return await self._legacy_complement_save_unpivot(
+                data=data,
+                unpivot_dim=unpivot_dim,
+                expression=expression,
+                default_hierarchy=default_hierarchy,
+                pov=pov,
+                save_nan=save_nan,
+                **kwargs
+            )
+
+        await self.delete(
+            expression,
+            data_audit=False,
+            default_hierarchy=default_hierarchy
+        )
+        await self.save_unpivot(
+            data=data,
+            unpivot_dim=unpivot_dim,
+            pov=pov,
+            save_nan=save_nan,
+            **kwargs,
+        )
+
+    async def _legacy_complement_save_unpivot(
+        self,
+        data: pd.DataFrame,
+        unpivot_dim: str,
+        expression: Union[str, Dict[str, Union[List[str], str]]],
+        default_hierarchy: str = "Base",
+        pov: Optional[Union[str, Dict[str, str]]] = None,
+        save_nan: bool = False,
+        **kwargs
+    ):
         data, pov = self._build_dataframe_for_save_unpivot(
             data, unpivot_dim, pov, save_nan
         )
@@ -989,13 +1070,33 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
 
         return await self.mdx_execution(script)
 
+    @future_property
+    async def _server_version(self) -> Tuple[int, ...]:
+        api: FinancialModelAPI = await self.wait_for('async_api')
+        version = await api.extra.git_version()
+        if version.lower().startswith('v'):
+            version = version[1:]
+        parts = []
+        for part in version.split('.'):
+            try:
+                parts.append(int(part))
+            except (TypeError, ValueError):
+                continue
+        return tuple(parts)
+
+    @future_property
+    async def _backend_del_availiable(self):
+        version = await self.__class__._server_version.wait_for(self)
+        return version >= (1, 1, 1, 2, 1)
+
     async def delete(
         self,
-        expression: Union[str, Dict[str, Union[List[str], str]]],
+        expression: Union[TypeDimensionExpr, List[TypeDimensionExpr]],
         chunksize: Optional[int] = None,
         use_mdx: bool = False,
-        callback: bool = True,
+        callback: bool = False,
         data_audit: bool = True,
+        default_hierarchy: str = "Base",
     ):
         """删除数据
 
@@ -1013,6 +1114,8 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
             use_mdx: 是否使用MDX脚本实现，默认为否，等效于调用 :meth:`delete_with_mdx`
             callback: 是否回调
             data_audit: 是否记录审计日志
+            default_hierarchy: 当expression中没指定对应维度时，默认取的层级函数，
+                即填充为 `default_hierarchy(#root,0)`
 
         .. admonition:: 示例
 
@@ -1037,6 +1140,63 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
             :meth:`insert_null` :meth:`delete_with_mdx`
 
         """
+        if (
+            not self._backend_del_availiable
+            or use_mdx
+            or callback
+        ):
+            if isinstance(expression, list):
+                raise ValueError(
+                    f"pass expresssion as list is not yet supported. "
+                    f"backend version: {self._server_version}")
+            return await self._legacy_delete(
+                expression,
+                chunksize=chunksize,
+                use_mdx=use_mdx,
+                callback=callback,
+                data_audit=data_audit,
+            )
+
+        if not isinstance(expression, list):
+            expression = [expression]
+
+        clear_scopes = []
+        for expr in expression:
+            if isinstance(expr, dict):
+                expr = dict_to_expr(expr)
+
+            expr_str, pov = self._split_expr(
+                expr, {},
+                default_hierarchy=default_hierarchy,
+                validate_expr=True
+            )
+            expr_parts = []
+            if expr_str:
+                expr_parts.append(expr_str)
+            if pov:
+                expr_parts.append(dict_to_expr(pov))
+
+            clear_scopes.append("->".join(expr_parts))
+
+        return await self.async_api.calculate.clear_data_ex(
+            SyncClearDataDto(
+                cubeName=self.element_name,
+                folderId=self.element_info.folderId,
+                clearScriptList=clear_scopes,
+                entryMode=self.entry_mode,
+                entryObject='python',
+                dataAuditSwitch=data_audit
+            )
+        )
+
+    async def _legacy_delete(
+        self,
+        expression: Union[str, Dict[str, Union[List[str], str]]],
+        chunksize: Optional[int] = None,
+        use_mdx: bool = False,
+        callback: bool = True,
+        data_audit: bool = True,
+    ):
         if use_mdx:
             return await self.delete_with_mdx(expression)
 
@@ -1652,7 +1812,9 @@ class FinancialCube(AsyncFinancialCube, metaclass=SyncMeta):
             expression: Union[str, Dict[str, Union[List[str], str]]],
             chunksize: Optional[int] = None,
             use_mdx: bool = False,
-            callback: bool = True
+            callback: bool = True,
+            data_audit: bool = True,
+            default_hierarchy: str = "Base",
         ):
             ...
 

{deepfos-1.1.74 → deepfos-1.1.75}/deepfos.egg-info/PKG-INFO

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