deepfos 1.1.38__tar.gz → 1.1.40__tar.gz

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

@@ -1,3 +1,15 @@
+## [1.1.40] - 2024-07-23
+
+### 变更
+
+* DeepModel insert_df不排除外部对象链接
+
+## [1.1.39] - 2024-07-16
+
+### 新增
+
+* 用户中心api封装用户组详情修改接口
+
 ## [1.1.38] - 2024-06-21
 
 ### 新增

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

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

{deepfos-1.1.38 → deepfos-1.1.40}/deepfos/__init__.py

@@ -3,3 +3,4 @@ from .options import OPTION, set_option, show_option
 
 from . import _version
 __version__ = _version.get_versions()['version']
+__product_version__ = '3.0.0'

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-02T02:20:30+0000",
+ "date": "2024-07-23T02:39:33+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "13c09c30d5637a7c35615e4e528623fe5dbdfcc2",
- "version": "1.1.38"
+ "full-revisionid": "3e90e105e5c58d7b9a248b89626c7c9ae2d93173",
+ "version": "1.1.40"
 }
 '''  # END VERSION_JSON
 

{deepfos-1.1.38 → deepfos-1.1.40}/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.38 → deepfos-1.1.40}/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.38 → deepfos-1.1.40}/deepfos/element/deepmodel.py

@@ -420,7 +420,7 @@ class ObjectStructure:
         self.fields = {
             field.name: FieldFactory(field)
             for field in structure
-            if not field.computable and field.name != 'id' and not field.external
+            if not field.computable and field.name != 'id'
         }
         # Make one for batch insert pg
         if include_id:

{deepfos-1.1.38 → deepfos-1.1.40}/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.38 → deepfos-1.1.40}/deepfos.egg-info/PKG-INFO

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