deepfos 1.1.58__tar.gz → 1.1.61__tar.gz

{deepfos-1.1.58 → deepfos-1.1.61}/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [1.1.61] - 2025-06-10
+
+### 新增
+
+* 财务模型元素实例化支持定制数据来源类型
+
+### 更新
+
+* deepmodel query_df无论有无数据都在列信息上保持一致性
+
+
+## [1.1.59] - 2025-06-05
+
+### 更新
+
+* 更新numpy依赖版本
+
+
 ## [1.1.58] - 2025-06-05
 
 ### 更新

{deepfos-1.1.58 → deepfos-1.1.61}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.58
+Version: 1.1.61
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -29,4 +29,4 @@ Requires-Dist: deepfos-ipc~=1.3.1
 Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: edgedb~=1.4.0
 Requires-Dist: asyncpg~=0.29.0
-Requires-Dist: numpy<2.0.0,~=1.26.4
+Requires-Dist: numpy<2.0.0

{deepfos-1.1.58 → deepfos-1.1.61}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-06-04T02:32:02+0000",
+ "date": "2025-06-10T07:11:51+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "060ef0e7cf671031a50a201af4eaa235d2fbfe81",
- "version": "1.1.58"
+ "full-revisionid": "c3eecd62c64b23523634efd7f51fdb7fbaf967ac",
+ "version": "1.1.61"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.58 → deepfos-1.1.61}/deepfos/api/models/workflow.py

@@ -411,16 +411,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):

{deepfos-1.1.58 → deepfos-1.1.61}/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.58 → deepfos-1.1.61}/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.58 → deepfos-1.1.61}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.58
+Version: 1.1.61
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -29,4 +29,4 @@ Requires-Dist: deepfos-ipc~=1.3.1
 Requires-Dist: typing-extensions>=4.8.0
 Requires-Dist: edgedb~=1.4.0
 Requires-Dist: asyncpg~=0.29.0
-Requires-Dist: numpy<2.0.0,~=1.26.4
+Requires-Dist: numpy<2.0.0

{deepfos-1.1.58 → deepfos-1.1.61}/deepfos.egg-info/requires.txt

@@ -15,4 +15,4 @@ deepfos-ipc~=1.3.1
 typing-extensions>=4.8.0
 edgedb~=1.4.0
 asyncpg~=0.29.0
-numpy<2.0.0,~=1.26.4
+numpy<2.0.0

{deepfos-1.1.58 → deepfos-1.1.61}/setup.cfg

@@ -35,7 +35,7 @@ install_requires =
 	typing-extensions>=4.8.0
 	edgedb~=1.4.0
 	asyncpg~=0.29.0
-	numpy~=1.26.4,<2.0.0
+	numpy<2.0.0
 python_requires = 
 	>=3.8.3