perf: 修改 导入

apps/assets/api/asset/database.py

@@ -1,6 +1,6 @@
-
 from assets.models import Database
 from assets.serializers import DatabaseSerializer
+
 from .asset import AssetViewSet
 
 __all__ = ['DatabaseViewSet']
@@ -9,11 +9,6 @@ __all__ = ['DatabaseViewSet']
 class DatabaseViewSet(AssetViewSet):
     model = Database
 
-    def get_queryset(self):
-        queryset = super().get_queryset()
-        print("Datbase is: ", queryset)
-        return queryset
-
     def get_serializer_classes(self):
         serializer_classes = super().get_serializer_classes()
         serializer_classes['default'] = DatabaseSerializer

apps/assets/api/asset/network.py

@@ -0,0 +1,15 @@
+
+from assets.serializers import HostSerializer
+from assets.models import Network
+from .asset import AssetViewSet
+
+__all__ = ['NetworkViewSet']
+
+
+class NetworkViewSet(AssetViewSet):
+    model = Network
+
+    def get_serializer_classes(self):
+        serializer_classes = super().get_serializer_classes()
+        serializer_classes['default'] = HostSerializer
+        return serializer_classes

apps/assets/api/mixin.py

@@ -81,7 +81,7 @@ class SerializeToTreeNodeMixin:
 
 
 class NodeFilterMixin:
-    pagination_class = NodeAssetTreePagination
+    # pagination_class = NodeAssetTreePagination
     request: Request
 
     @lazyproperty

apps/assets/serializers/asset/category.py

@@ -1,10 +1,10 @@
 from rest_framework import serializers
 
+from assets.models import DeviceInfo, Host, Database, Network, Cloud
 from .common import AssetSerializer
-from assets.models import DeviceInfo, Host, Database
 
 __all__ = [
-    'DeviceSerializer', 'HostSerializer', 'DatabaseSerializer'
+    'DeviceSerializer', 'HostSerializer', 'DatabaseSerializer',
 ]
 
 
@@ -30,24 +30,14 @@ class HostSerializer(AssetSerializer):
 class DatabaseSerializer(AssetSerializer):
     class Meta(AssetSerializer.Meta):
         model = Database
-        fields_mini = [
+        fields = AssetSerializer.Meta.fields + ['db_name']
-            'id', 'name', 'ip', 'port', 'db_name',
+
-        ]
+
-        fields_small = fields_mini + [
+class NetworkSerializer(AssetSerializer):
-            'is_active', 'comment',
+    class Meta(AssetSerializer.Meta):
-        ]
+        model = Network
-        fields_fk = [
+
-            'domain', 'domain_display', 'platform',
+
-        ]
+class CloudSerializer(AssetSerializer):
-        fields_m2m = [
+    class Meta(AssetSerializer.Meta):
-            'nodes', 'nodes_display', 'labels', 'labels_display',
+        model = Cloud
-        ]
-        read_only_fields = [
-            'category', 'category_display', 'type', 'type_display',
-            'created_by', 'date_created',
-        ]
-        fields = fields_small + fields_fk + fields_m2m + read_only_fields
-        extra_kwargs = {
-            **AssetSerializer.Meta.extra_kwargs,
-            'db_name': {'required': True}
-        }

apps/authentication/models.py

@@ -129,7 +129,7 @@ class ConnectionToken(OrgModelMixin, JMSBaseModel):
     actions = expired_at = None  # actions 和 expired_at 在 check_valid() 中赋值
 
     def check_valid(self):
-        from perms.utils.asset.permission import validate_permission as asset_validate_permission
+        from perms.utils.permission import validate_permission as asset_validate_permission
         from perms.utils.application.permission import validate_permission as app_validate_permission
 
         if self.is_expired:

apps/perms/api/asset_permission_relation.py

@@ -9,7 +9,7 @@ from orgs.mixins.api import OrgBulkModelViewSet
 from orgs.utils import current_org
 from perms import serializers
 from perms import models
-from perms.utils.asset.user_permission import UserGrantedAssetsQueryUtils
+from perms.utils.user_permission import UserGrantedAssetsQueryUtils
 
 __all__ = [
     'AssetPermissionUserRelationViewSet', 'AssetPermissionUserGroupRelationViewSet',

apps/perms/api/user_group_permission.py

@@ -11,7 +11,7 @@ from perms.models import AssetPermission
 from assets.models import Asset, Node
 from . import user_permission as uapi
 from perms import serializers
-from perms.utils.asset.permission import get_asset_system_user_ids_with_actions_by_group
+from perms.utils.permission import get_asset_system_user_ids_with_actions_by_group
 from assets.api.mixin import SerializeToTreeNodeMixin
 from users.models import UserGroup
 

apps/perms/api/user_permission/assets/mixin.py

@@ -7,7 +7,7 @@ from common.utils import get_logger
 from perms.pagination import NodeGrantedAssetPagination, AllGrantedAssetPagination
 from assets.models import Asset, Node
 from perms import serializers
-from perms.utils.asset.user_permission import UserGrantedAssetsQueryUtils
+from perms.utils.user_permission import UserGrantedAssetsQueryUtils
 
 logger = get_logger(__name__)
 

apps/perms/api/user_permission/common.py

@@ -12,7 +12,7 @@ from rest_framework.generics import (
 )
 
 from orgs.utils import tmp_to_root_org
-from perms.utils.asset.permission import get_asset_system_user_ids_with_actions_by_user, validate_permission
+from perms.utils.permission import get_asset_system_user_ids_with_actions_by_user, validate_permission
 from common.permissions import IsValidUser
 from common.utils import get_logger, lazyproperty
 

apps/perms/api/user_permission/mixin.py

@@ -7,7 +7,7 @@ from common.mixins.api import RoleAdminMixin as _RoleAdminMixin
 from common.mixins.api import RoleUserMixin as _RoleUserMixin
 from orgs.utils import tmp_to_root_org
 from users.models import User
-from perms.utils.asset.user_permission import UserGrantedTreeRefreshController
+from perms.utils.user_permission import UserGrantedTreeRefreshController
 
 
 class PermBaseMixin:

apps/perms/api/user_permission/nodes.py

@@ -13,7 +13,7 @@ from .mixin import AssetRoleAdminMixin, AssetRoleUserMixin
 from perms.hands import User
 from perms import serializers
 
-from perms.utils.asset.user_permission import UserGrantedNodesQueryUtils
+from perms.utils.user_permission import UserGrantedNodesQueryUtils
 
 
 logger = get_logger(__name__)

apps/perms/api/user_permission/nodes_with_assets.py

@@ -11,7 +11,7 @@ from orgs.utils import tmp_to_root_org
 from common.permissions import IsValidUser
 from common.utils import get_logger, get_object_or_none
 from .mixin import AssetRoleUserMixin, AssetRoleAdminMixin
-from perms.utils.asset.user_permission import (
+from perms.utils.user_permission import (
     UserGrantedTreeBuildUtils, get_user_all_asset_perm_ids,
     UserGrantedNodesQueryUtils, UserGrantedAssetsQueryUtils,
 )

apps/perms/signal_handlers/refresh_perms.py

@@ -10,7 +10,7 @@ from common.utils import get_logger
 from common.exceptions import M2MReverseNotAllowed
 from common.const.signals import POST_ADD, POST_REMOVE, POST_CLEAR
 from perms.models import AssetPermission
-from perms.utils.asset.user_permission import UserGrantedTreeRefreshController
+from perms.utils.user_permission import UserGrantedTreeRefreshController
 
 
 logger = get_logger(__file__)

apps/perms/tasks.py

@@ -16,7 +16,7 @@ from perms.notifications import (
     PermedAppsWillExpireUserMsg, AppPermsWillExpireForOrgAdminMsg
 )
 from perms.models import AssetPermission, ApplicationPermission
-from perms.utils.asset.user_permission import UserGrantedTreeRefreshController
+from perms.utils.user_permission import UserGrantedTreeRefreshController
 
 logger = get_logger(__file__)
 

apps/perms/utils/__init__.py

@@ -1,4 +1,2 @@
-# coding: utf-8
+from .permission import *
-#
+from .user_permission import *
-
-from .asset import *

apps/perms/utils/asset/__init__.py

@@ -1,2 +0,0 @@
-from .permission import *
-from .user_permission import *

apps/perms/utils/permission.py

@@ -6,7 +6,7 @@ from django.db.models import Q
 from common.utils import get_logger
 from perms.models import AssetPermission, Action
 from perms.hands import Asset, User, UserGroup, Node
-from perms.utils.asset.user_permission import get_user_all_asset_perm_ids
+from perms.utils.user_permission import get_user_all_asset_perm_ids
 
 logger = get_logger(__file__)
 

apps/perms/utils/user_permission.py

@@ -12,7 +12,10 @@ from common.utils.common import lazyproperty, timeit
 from assets.utils import NodeAssetsUtil
 from common.utils import get_logger
 from common.decorator import on_transaction_commit
-from orgs.utils import tmp_to_org, current_org, ensure_in_real_or_default_org, tmp_to_root_org
+from orgs.utils import (
+    tmp_to_org, current_org,
+    ensure_in_real_or_default_org, tmp_to_root_org
+)
 from assets.models import (
     Asset, FavoriteAsset, AssetQuerySet, NodeQuerySet
 )