deepfos 1.1.40__tar.gz → 1.1.42__tar.gz

{deepfos-1.1.40 → deepfos-1.1.42}/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.1.42] - 2024-09-19
+
+### 新增
+
+* 维度1.2 API 封装多维实体维度配置表查询和增量保存接口
+
+## [1.1.41] - 2024-08-26
+
+### 变更
+
+* DeepModel get_object方法改为执行object查询语句
+* DeepModel 查询和执行方法在kwargs的key缺省时自动补充None值
+
 ## [1.1.40] - 2024-07-23
 
 ### 变更

{deepfos-1.1.40 → deepfos-1.1.42}/PKG-INFO

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

{deepfos-1.1.40 → deepfos-1.1.42}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-23T02:39:33+0000",
+ "date": "2024-09-24T05:39:42+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "3e90e105e5c58d7b9a248b89626c7c9ae2d93173",
- "version": "1.1.40"
+ "full-revisionid": "14152a2be32b02192ca40c87779a76367645c6a4",
+ "version": "1.1.42"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.40 → deepfos-1.1.42}/deepfos/api/V1_2/dimension.py

@@ -213,6 +213,26 @@ class DimObjectAPI(ChildAPI):
         return {'param': {'folderId': folderId, 'name': name, 'path': path}}
 
 
+class DimensionConfig(ChildAPI):
+    endpoint = '/dimension/config'
+
+    @get('entity')
+    def entity(self, dimensionName: str = None, folderId: str = None, path: str = None) -> Union[List[MultidimensionalEntityConfigMemberVO], Awaitable[List[MultidimensionalEntityConfigMemberVO]]]:
+        """
+        多维实体维度配置表查询全部数据
+
+        """
+        return {'param': {'dimensionName': dimensionName, 'folderId': folderId, 'path': path}}
+
+    @post('entity/increment')
+    def entity_increment(self, multidimensionalEntityConfigIncrementDTO: MultidimensionalEntityConfigIncrementDTO) -> Union[None, Awaitable[None]]:
+        """
+        多维实体维度配置表增量保存数据
+
+        """
+        return {'body': multidimensionalEntityConfigIncrementDTO}
+
+
 class DimensionAPI(DynamicRootAPI, builtin=True):
     """维度组件接口"""
     module_type = 'DIM'
@@ -256,3 +276,10 @@ class DimensionAPI(DynamicRootAPI, builtin=True):
         维度与模型对象相关接口
         """
         return DimObjectAPI(self)
+
+    @cached_property
+    def config(self) -> DimensionConfig:
+        """
+        维度配置相关接口
+        """
+        return DimensionConfig(self)

{deepfos-1.1.40 → deepfos-1.1.42}/deepfos/api/V1_2/models/dimension.py

@@ -98,7 +98,11 @@ __all__ = [
     'MultiEntityRelationDimension',
     'RelationCub',
     'ModelSyncInfo',
-    'MultiEntityConfigResult'
+    'MultiEntityConfigResult',
+    'MultidimensionalEntityConfigMemberDTO',
+    'DimensionElementInfo',
+    'MultidimensionalEntityConfigIncrementDTO',
+    'MultidimensionalEntityConfigMemberVO',
 ]
 
 
@@ -2832,3 +2836,79 @@ class DimensionInfoAndMemberObj(BaseModel):
     dimensionInfo: Optional[DimensionInfoObj]
     #: dimensionMemberList
     dimensionMemberList: Optional[List[DimensionMemberChangeObj]]
+
+
+class MultidimensionalEntityConfigMemberVO(BaseModel):
+    #: isActive
+    isActive: Optional[int]
+    #: name
+    name: Optional[str]
+    #: parentName
+    parentName: Optional[str]
+    #: period
+    period: Optional[str]
+    #: scenario
+    scenario: Optional[str]
+    #: version
+    version: Optional[str]
+    #: year
+    year: Optional[str]
+
+
+class ConfigDeleteFilter(BaseModel):
+    #: period
+    period: Optional[str]
+    #: scenario
+    scenario: Optional[str]
+    #: version
+    version: Optional[str]
+    #: year
+    year: Optional[str]
+
+
+class MultidimensionalEntityConfigMemberDTO(BaseModel):
+    #: 是否active 默认1 0 否 1是
+    isActive: Optional[int]
+    #: 维度成员编码
+    name: Optional[str]
+    #: 维度成员父级编码
+    parentName: Optional[str]
+    #: 期间
+    period: Optional[str]
+    #: 场景
+    scenario: Optional[str]
+    #: 版本
+    version: Optional[str]
+    #: 年份
+    year: Optional[str]
+
+
+class DimensionElementInfo(BaseModel):
+    """Dimension Element Info
+
+    .. admonition:: 引用接口
+
+        - **POST** ``/dimension/config/entity/export``
+    """
+    #: 维度名称
+    dimensionName: str
+    #: 维度folderId
+    folderId: Optional[str]
+    #: path 和 folderId 取一个,优先path
+    path: Optional[str]
+
+
+class MultidimensionalEntityConfigIncrementDTO(BaseModel):
+    """Multidimensional Entity Config Increment DTO
+
+    .. admonition:: 引用接口
+
+        - **POST** ``/dimension/config/entity``
+        - **POST** ``/dimension/config/entity/increment``
+    """
+    #: 实体维度配置表需要删除的数据，参数为空则不删除任何数据
+    delete: List[ConfigDeleteFilter]
+    #: 维度元素信息
+    dimensionElementInfo: DimensionElementInfo
+    #: 实体维度配置表数据
+    multidimensionalEntityConfigMemberList: List[MultidimensionalEntityConfigMemberDTO]

{deepfos-1.1.40 → deepfos-1.1.42}/deepfos/db/edb.py

@@ -1,4 +1,5 @@
 import asyncio
+from typing import Dict
 
 from edgedb import AsyncIOClient, errors, enums, describe, abstract
 from edgedb.abstract import (
@@ -34,6 +35,25 @@ def collect_output_frame(ele_desc: describe.AnyType):
     return ele_desc.name
 
 
+def normalize_kw(query: str, kw: Dict):
+    from deepfos.lib.edb_lexer import EdgeQLLexer
+    lexer = EdgeQLLexer()
+    lexer.setinputstr(query)
+    expected_args = list(
+        map(
+            lambda t: t.text[1::],
+            filter(lambda x: x.type == 'ARGUMENT', lexer.lex())
+        )
+    )
+    result = {}
+    for arg_name in expected_args:
+        if arg_name in kw:
+            result[arg_name] = kw[arg_name]
+        else:
+            result.setdefault(arg_name)
+    return result
+
+
 class _AsyncEdgeDBConnection(AsyncIOConnection):
     async def raw_query(self, query_context, capabilities=enums.Capability.NONE):
         if self.is_closed():
@@ -41,6 +61,13 @@ class _AsyncEdgeDBConnection(AsyncIOConnection):
 
         reconnect = False
         i = 0
+        query = query_context.query.query
+        kwargs = query_context.query.kwargs
+        query_context = query_context._replace(
+            query=query_context.query._replace(
+                kwargs=normalize_kw(query, kwargs)
+            )
+        )
         args = dict(
             query=query_context.query.query,
             args=query_context.query.args,

{deepfos-1.1.40 → deepfos-1.1.42}/deepfos/element/deepmodel.py

@@ -858,12 +858,15 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
 
     @cached_property
     def objects(self) -> Dict[str, ObjectTypeFrame]:
-        return {
-            name: format_obj(obj)
-            for name, obj in chain(
-                self.user_objects.items(), self.system_objects.items()
-            )
-        }
+        result = {name: format_obj(obj) for name, obj in self.user_objects.items()}
+        for name, obj in self.system_objects.items():
+            # In case of duplicate name both in app obj& space obj
+            if name in result:
+                result[f'{self.spacemodule}::{name}'] = format_obj(obj)
+            else:
+                result[name] = format_obj(obj)
+
+        return result
 
     @staticmethod
     def _prepare_variables(kwargs):
@@ -1267,7 +1270,15 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
             logger.info("data为空，无DML执行")
             return
 
-        obj = format_obj(self.get_object(object_name))
+        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)
@@ -1348,24 +1359,33 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
                 kwargs={kw_name: part.to_json(orient='records', double_precision=15)}
             ))
 
-    def get_object(self, object_name: str) -> edgedb.Object:
+    async def get_object(
+        self,
+        object_name: str,
+        raw: bool = True
+    ) -> Optional[Union[ObjectTypeFrame, edgedb.Object]]:
         """获取指定对象名的对象
 
         Args:
-            object_name: 对象名
+            object_name: 对象名，如对象名未提供module name部分，则默认module name为当前app module
+                        如需查询其他module的对象，应以 module_name::object_name 的形式提供
+            raw: 是否获取edgedb.Object数据，为False时将转换为ObjectTypeFrame数据
+                默认为True
 
         """
-        if object_name in self.user_objects:
-            obj = self.user_objects[object_name]
-        elif object_name in self.system_objects:
-            obj = self.system_objects[object_name]
-        else:
-            raise ObjectNotExist(
-                f'DeepModel对象[{object_name}]在当前应用不存在，无法插入数据'
-            )
-        if obj.external:
-            raise ExternalObjectReadOnly('外部对象只可读')
-        return obj
+        if '::' not in object_name:
+            object_name = f'{self.appmodule}::{object_name}'
+        objs = await AsyncDeepModel.query_object(
+            self,
+            f"{OBJECT_QUERY} filter .name = '{object_name}'",
+        )
+        if len(objs) == 0:
+            return
+
+        if raw:
+            return objs[0]
+
+        return format_obj(objs[0])
 
     async def _get_bkey(
         self,
@@ -1467,7 +1487,15 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
         if data.empty:
             return
 
-        obj = format_obj(self.get_object(object_name))
+        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(),
@@ -1632,7 +1660,7 @@ class AsyncDeepModel(ElementBase[DeepModelAPI]):
 class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
     synchronize = (
         'query_object', 'query', 'query_df',
-        'execute',
+        'execute', 'get_object',
         'insert_df', 'insert_df_pg'
     )
 
@@ -1653,6 +1681,13 @@ class DeepModel(AsyncDeepModel, metaclass=SyncMeta):
         ) -> Optional[List]:
             ...
 
+        def get_object(
+            self,
+            object_name: str,
+            raw: bool = True
+        ) -> Optional[Union[ObjectTypeFrame, edgedb.Object]]:
+            ...
+
         def insert_df(
             self,
             object_name: str,