deepfos 1.1.37__tar.gz → 1.1.39__tar.gz

{deepfos-1.1.37 → deepfos-1.1.39}/CHANGELOG.md

@@ -1,3 +1,23 @@
+## [1.1.39] - 2024-07-16
+
+### 新增
+
+* 用户中心api封装用户组详情修改接口
+
+## [1.1.38] - 2024-06-21
+
+### 新增
+
+* DeepModel增加获取查询语句接口
+
+### 变更
+
+* 无
+
+### 文档
+
+* 无
+
 ## [1.1.37] - 2024-06-14
 
 ### 新增

{deepfos-1.1.37 → deepfos-1.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.37
+Version: 1.1.39
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-06-20T03:28:41+0000",
+ "date": "2024-07-18T05:22:46+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "7f98da1b818edb559a68f03f99464a02b1af6899",
- "version": "1.1.37"
+ "full-revisionid": "34556e8bf4fa85558117403f5410ccd173164c10",
+ "version": "1.1.39"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/api/account.py

@@ -3,7 +3,7 @@ APIs provided by system-login-api
 
 generated by api_code_gen.py
   - **filename** : ``account.py``
-  - **json timestamp** : ``2023-03-29 13:28:56``
+  - **json timestamp** : ``2024-07-16 14:17:08``
 """
 from deepfos.api.base import RootAPI, ChildAPI, get, post
 from .models.account import *
@@ -68,6 +68,17 @@ class ApiUserGroup(ChildAPI):
           'header': {"enterprise-id": sysutils.get_enterprise_id_cached()},
           'param': {'groupId': groupId, 'spaceId': spaceId},
         }
+    
+    @post('space/modify-group')
+    def space_modify_group(self, userGroupModifyDTO: UserGroupModifyDTO) -> Union[bool, Awaitable[bool]]:
+        """
+        用户组详情修改
+    
+        """
+        return {
+          'body': userGroupModifyDTO,
+          'header': {"enterprise-id": sysutils.get_enterprise_id_cached()},
+        }
 
 
 class UserImport(ChildAPI):

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/api/deepmodel.py

@@ -98,6 +98,34 @@ class DeepQLAPI(ChildAPI):
         return {'body': {'module': module, 'query': query, 'variables': variables}}
 
 
+class PresentationAPI(ChildAPI):
+    endpoint = '/presentation-layer'
+
+    @get('ql-selector/ql-record-info')
+    def ql_record_info(self, qlType: str, recordCode: str) -> Union[QlRecordVO, Awaitable[QlRecordVO]]:
+        """获取单条记录
+
+        Args:
+            qlType: 查询类型 'deepql'|'analysisql'
+            recordCode: 查询编码
+
+        """
+        return {'param': {'qlType': qlType, 'recordCode': recordCode}}
+
+    @get('ql-selector/ql-records')
+    def ql_records(self, qlType: str = None, qlRecordType: str = None) -> Union[List[QlRecordVO], Awaitable[List[QlRecordVO]]]:
+        """获取所有的ql记录
+
+        Args:
+            qlType: 查询类型 'deepql'|'analysisql'
+            qlRecordType: 记录类型：个人PERSONAL /公共：PUBLIC
+
+        Returns:
+
+        """
+        return {'param': {'qlType': qlType, 'qlRecordType': qlRecordType}}
+
+
 class ExtraAPI(ChildAPI):
     endpoint = '/'
 
@@ -134,6 +162,10 @@ class DeepModelAPI(DynamicRootAPI, builtin=True):
     def sharding(self) -> ShardingAPI:
         return ShardingAPI(self)
 
+    @cached_property
+    def presentation(self) -> PresentationAPI:
+        return PresentationAPI(self)
+
     @cached_property
     def extra(self) -> ExtraAPI:
         return ExtraAPI(self)

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/api/models/account.py

@@ -3,7 +3,7 @@ Models used by /
 
 generated by model_code_gen.py
   - **filename** : ``account.py``
-  - **json timestamp** : ``2023-03-29 13:28:56``
+  - **json timestamp** : ``2024-07-16 14:17:08``
 """
 
 
@@ -17,6 +17,7 @@ __all__ = [
     'ImportSendEmailDTO',
     'ImportUserErrorDTO',
     'PlatFormSecretVO',
+    'RoleInfoDetailSaveDTO',
     'SpaceVO',
     'UserGroupChildrenVO',
     'UserGroupImportDTO',
@@ -26,11 +27,13 @@ __all__ = [
     'UserImportDTO',
     'UserInfoVO',
     'UserRoleImportDTO',
+    'UserRoleInfoSaveDTO',
     'ImportUserListParamsUserGroupImportDTO',
     'ImportUserListParamsUserGroupRelationshipDTO',
     'ImportUserListParamsUserImportDTO',
     'ImportUserListParamsUserRoleImportDTO',
-    'UserGroupDetailVO'
+    'UserGroupDetailVO',
+    'UserGroupModifyDTO'
 ]
 
 
@@ -115,6 +118,15 @@ class PlatFormSecretVO(BaseModel):
     platformSecret: Optional[str]
 
 
+class RoleInfoDetailSaveDTO(BaseModel):
+    #: 父级角色编码
+    code: str
+    #: 选中的角色code
+    roleList: List[str]
+    #: 父级标识
+    tag: str
+
+
 class SpaceVO(BaseModel):
     """Space VO
 
@@ -322,6 +334,13 @@ class UserRoleImportDTO(BaseModel):
     username: Optional[str]
 
 
+class UserRoleInfoSaveDTO(BaseModel):
+    #: 角色列表
+    children: Optional[List[RoleInfoDetailSaveDTO]]
+    #: 平台code
+    platformCode: str
+
+
 class ImportUserListParamsUserGroupImportDTO(BaseModel):
     """Import User List Params DTO«User Group Import DTO»
 
@@ -437,4 +456,28 @@ class UserGroupDetailVO(BaseModel):
     userList: Optional[List[UserInfoVO]]
 
 
+class UserGroupModifyDTO(BaseModel):
+    """User Group Modify DTO
+
+    .. admonition:: 引用接口
+
+        - **POST** ``/api/user/group/space/modify-group``
+        - **POST** ``/s/user/group/space/modify-group-batch``
+    """
+    #: 子组列表
+    childrenGroupIdList: Optional[List[str]]
+    #: 描述
+    description: Optional[Any]
+    #: 用户组id
+    groupId: str
+    #: 用户组名
+    groupName: str
+    #: 空间
+    spaceId: Optional[str]
+    #: 用户id
+    userList: Optional[List[str]]
+    #: 角色列表
+    userRoleInfoSaveDTOList: Optional[List[UserRoleInfoSaveDTO]]
+
+
 

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/api/models/deepmodel.py

@@ -20,7 +20,9 @@ __all__ = [
     "RuleParam",
     "SequenceInstance",
     "_IndexParam",
-    "SimpleSpaceConnectionConfig"
+    "SimpleSpaceConnectionConfig",
+    "QlGlobalVariableVO",
+    "QlRecordVO"
 ]
 
 
@@ -266,5 +268,41 @@ class SimpleSpaceConnectionConfig(BaseModel):
     updateTime: Optional[str]
 
 
+class QlGlobalVariableVO(BaseModel):
+    #: 编码
+    code: Optional[str]
+    #: 类型
+    type: Optional[str]
+    #: 值
+    value: Optional[str]
+
+
+class QlRecordVO(BaseModel):
+    #: 应用标识
+    app: Optional[str]
+    #: 空间标识
+    space: Optional[str]
+    #: 用户id
+    userId: Optional[str]
+    #: 创建时间
+    createTime: Optional[str]
+    #: 应用标识
+    globalVariables: Optional[List[QlGlobalVariableVO]]
+    #: 主键标识
+    qlRecordId: Optional[str]
+    #: QL类型：deepql|graphql|analysisql
+    qlType: Optional[str]
+    #: ql编码
+    recordCode: Optional[str]
+    #: 记录内容
+    recordContent: Optional[str]
+    #: 记录名称
+    recordName: Optional[str]
+    #: 记录类型：个人PERSONAL /公共：PUBLIC
+    recordType: Optional[str]
+    #: 变量
+    variables: Any
+
+
 ObjectParam.update_forward_refs()
 ObjectLinkParam.update_forward_refs()

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/dimension.py

@@ -166,12 +166,12 @@ class AsyncDimension(ElementBase[DimensionAPI]):
         strict: bool = False,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self._add_memo = CIMultiDict()
         self._del_memo = CIMultiDict()
         self._upd_memo = CIMultiDict()
         self.__member_memo = None if strict else CIMultiDict()
         self._strict = strict
+        super().__init__(element_name, folder_id, path, server_name)
 
     @cached_property
     def _datatable_class(self) -> T_AsyncDatatableClass:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/lib/sysutils.py

@@ -1,5 +1,5 @@
 """系统相关工具类/函数"""
-
+import asyncio
 import base64
 import gzip
 import itertools
@@ -8,7 +8,7 @@ import time
 from datetime import datetime
 from enum import Enum
 from io import TextIOWrapper
-from typing import Dict, Any, Union, List, IO, TypeVar
+from typing import Dict, Any, Union, List, IO, TypeVar, Optional
 import pandas as pd
 import math
 import hashlib
@@ -23,6 +23,7 @@ from deepfos.api.models.deepfos_task import (
     PeriodicTaskCreateInfo, ScheduledTaskCreateInfo
 )
 from deepfos.element.base import ElementBase
+from .asynchronous import evloop
 from .utils import split_dataframe
 from deepfos.options import OPTION
 from deepfos.api.models import BaseModel
@@ -33,6 +34,7 @@ from deepfos.api.system import SystemAPI
 from deepfos.api import account as acc_api
 from deepfos.api.models import account as account_model
 from deepfos.cache import SpaceSeperatedLRUCache
+from deepfos.api.models.account import UserGroupModifyDTO
 
 _VALUE_KEY = 'value'
 _DTNAME_KEY = 'dataTableName'
@@ -665,3 +667,37 @@ def resolve_account_api_extra_header():
         'timestamp': timestamp,
         'sign': calc_account_api_signature(timestamp, platform_secret, platform_code)
     }
+
+
+def batch_modify_user_group(payloads: List[UserGroupModifyDTO], max_worker: int = None):
+    """批量调用用户中心用户组详情修改接口
+
+    Args:
+        payloads: 符合UserGroupModifyDTO定义的列表，将直接用作接口请求体
+        max_worker: 最大并发数
+
+    Returns: 与请求体顺序一致的返回结果列表
+
+    """
+    if max_worker is not None:
+        if max_worker <= 0:
+            raise ValueError('max_worker must be > 0 ')
+    else:
+        max_worker = len(payloads)
+
+    result: List[Optional[bool]] = [None] * len(payloads)
+    api = acc_api.AccountAPI(sync=False).user_group.space_modify_group
+
+    async def call_api(idx: int, p: UserGroupModifyDTO, sem: asyncio.Semaphore):
+        async with sem:
+            result[idx] = await api(p)
+
+    async def inner():
+        semaphore = asyncio.Semaphore(max_worker)
+        await asyncio.gather(*(
+            call_api(idx, payload, semaphore)
+            for idx, payload in enumerate(payloads)
+        ))
+
+    evloop.run(inner())
+    return result

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deepfos
-Version: 1.1.37
+Version: 1.1.39
 Summary: Collecions of useful and handy tools for deepfos platform
 Home-page: http://py.deepfos.com
 Author: deepfos-python-team
@@ -12,3 +12,19 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >=3.8.3
+Requires-Dist: pandas==1.2.0
+Requires-Dist: requests==2.25.1
+Requires-Dist: pymysql==0.9.3
+Requires-Dist: aiohttp==3.8.4
+Requires-Dist: pydantic==1.8.2
+Requires-Dist: cachetools==4.2.2
+Requires-Dist: loguru==0.5.3
+Requires-Dist: PyPika==0.48.8
+Requires-Dist: aiomysql==0.0.22
+Requires-Dist: clickhouse-driver==0.2.2
+Requires-Dist: aioredis==2.0.1
+Requires-Dist: redis==4.5.3
+Requires-Dist: deepfos-ipc~=1.2.3
+Requires-Dist: typing-extensions==4.5.0
+Requires-Dist: edgedb~=1.4.0
+Requires-Dist: asyncpg~=0.29.0

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/bizmodel.py

@@ -171,10 +171,10 @@ class AsyncBusinessModel(ElementBase[BusinessModelAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tables: Dict[str, TableNode] = {}
         self.__logic_tables = LogicTable()
         self.__dflt_ptn_id = UNSET
+        super().__init__(element_name, folder_id, path, server_name)
 
     @cached_property
     def default_partition_id(self) -> Optional[str]:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/datatable.py

@@ -593,8 +593,8 @@ class AsyncDataTableMySQL(ElementBase):
         table_name: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tbl_name = table_name
+        super().__init__(element_name, folder_id, path, server_name)
 
     def _safe_get_txn_conf(self) -> _TxnConfig:
         try:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/finmodel.py

@@ -174,10 +174,10 @@ class AsyncFinancialCube(ElementBase[FinancialModelAPI]):
         entry_object='python',
         server_name: Optional[str] = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         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)
+        super().__init__(element_name, folder_id, path, server_name)
 
     @future_property(on_demand=True)
     async def meta(self) -> CubeModel:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/journal.py

@@ -66,8 +66,8 @@ class AsyncJournalModel(ElementBase[JournalModelAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name, folder_id, path, server_name)
         self.__tbl_name = None
+        super().__init__(element_name, folder_id, path, server_name)
 
     @future_property
     async def config(self) -> JournalModelConfig:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/pyscript.py

@@ -275,11 +275,11 @@ class PythonScript(ElementBase[PythonAPI]):
         task_name: str = None,
         should_log: bool = False
     ):
+        self.should_log = should_log
+        self.task_name = task_name
         super().__init__(
             element_name=element_name, folder_id=folder_id, path=path
         )
-        self.should_log = should_log
-        self.task_name = task_name
 
     @future_property
     async def env(self) -> Tuple[str, str, Dict]:

{deepfos-1.1.37 → deepfos-1.1.39}/deepfos/element/variable.py

@@ -182,11 +182,11 @@ class AsyncVariable(ElementBase[VariableAPI]):
         path: str = None,
         server_name: str = None,
     ):
-        super().__init__(element_name=element_name, folder_id=folder_id, path=path, server_name=server_name)
         self.__group = Group()
         self.__description = None
         self.__gv_memo = None
         self.__uv_memo = None
+        super().__init__(element_name=element_name, folder_id=folder_id, path=path, server_name=server_name)
 
     @property
     def _group(self) -> Group: