refactor: log add workspace_id

Author: wxg0103

apps/application/views/application.py

@@ -48,7 +48,8 @@ class Application(APIView):
     )
     @has_permissions(PermissionConstants.APPLICATION_READ.get_workspace_permission())
     @log(menu='Application', operate='Create an application',
-         get_operation_object=lambda r, k: {'name': r.data.get('name')})
+         get_operation_object=lambda r, k: {'name': r.data.get('name')},
+         workspace_id=lambda r, k: k.get('workspace_id'))
     def post(self, request: Request, workspace_id: str):
         return result.success(
             ApplicationSerializer(data={'workspace_id': workspace_id, 'user_id': request.user.id}).insert(request.data))
@@ -99,7 +100,7 @@ class Import(APIView):
             tags=[_('Application')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_READ)
-        @log(menu='Application', operate="Import Application")
+        @log(menu='Application', operate="Import Application", workspace_id=lambda r, k: k.get('workspace_id'))
         def post(self, request: Request, workspace_id: str):
             return result.success(ApplicationSerializer(
                 data={'user_id': request.user.id, 'workspace_id': workspace_id,
@@ -120,7 +121,8 @@ class Export(APIView):
         )
         @has_permissions(PermissionConstants.APPLICATION_EXPORT.get_workspace_application_permission())
         @log(menu='Application', operate="Export Application",
-             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id'))
         def post(self, request: Request, workspace_id: str, application_id: str):
             return ApplicationOperateSerializer(
                 data={'application_id': application_id,
@@ -140,7 +142,8 @@ class Operate(APIView):
         )
         @has_permissions(PermissionConstants.APPLICATION_DELETE.get_workspace_application_permission())
         @log(menu='Application', operate='Deleting application',
-             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id'))
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id')
              )
         def delete(self, request: Request, workspace_id: str, application_id: str):
             return result.success(ApplicationOperateSerializer(
@@ -159,7 +162,8 @@ def delete(self, request: Request, workspace_id: str, application_id: str):
         )
         @has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission())
         @log(menu='Application', operate="Modify the application",
-             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id'))
         def put(self, request: Request, workspace_id: str, application_id: str):
             return result.success(
                 ApplicationOperateSerializer(
@@ -195,7 +199,8 @@ class Publish(APIView):
             tags=[_('Application')]  # type: ignore
         )
         @log(menu='Application', operate='Publishing an application',
-             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id'))
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id')
              )
         def put(self, request: Request, application_id: str):
             return result.success(

apps/application/views/application_api_key.py

@@ -5,7 +5,7 @@
 from rest_framework.views import APIView
 
 from application.api.application_api_key import ApplicationKeyAPI
-from application.models import ApplicationApiKey
+from application.models import ApplicationApiKey, Application
 from application.serializers.application_api_key import ApplicationKeySerializer
 from common.auth import TokenAuth
 from common.auth.authentication import has_permissions
@@ -14,11 +14,11 @@
 from common.result import result, success, DefaultResultSerializer
 
 
-def get_application_operation_object(application_api_key_id):
-    application_api_key_model = QuerySet(model=ApplicationApiKey).filter(id=application_api_key_id).first()
-    if application_api_key_model is not None:
+def get_application_operation_object(application_id):
+    application_model = QuerySet(model=Application).filter(id=application_id).first()
+    if application_model is not None:
         return {
-            "name": application_api_key_model.name
+            "name": application_model.name
         }
     return {}
 
@@ -37,7 +37,8 @@ class ApplicationKey(APIView):
         tags=[_('Application Api Key')]  # type: ignore
     )
     @log(menu='Application', operate="Add ApiKey",
-         get_operation_object=lambda r, k: get_application_operation_object(k.get('application_api_key_id')))
+         get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+         workspace_id=lambda r, k: k.get('workspace_id'))
     @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
     def post(self, request: Request, workspace_id: str, application_id: str):
         return result.success(ApplicationKeySerializer(
@@ -73,6 +74,9 @@ class Operate(APIView):
             tags=[_('Application Api Key')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
+        @log(menu='Application', operate="Modify application API_KEY",
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id'))
         def put(self, request: Request, workspace_id: str, application_id: str, api_key_id: str):
             return result.success(
                 ApplicationKeySerializer.Operate(
@@ -91,6 +95,9 @@ def put(self, request: Request, workspace_id: str, application_id: str, api_key_
             tags=[_('Application Api Key')]  # type: ignore
         )
         @has_permissions(PermissionConstants.APPLICATION_OVERVIEW_API_KEY.get_workspace_application_permission())
+        @log(menu='Application', operate="Delete application API_KEY",
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id'))
         def delete(self, request: Request, workspace_id: str, application_id: str, api_key_id: str):
             return result.success(
                 ApplicationKeySerializer.Operate(

apps/application/views/application_version.py

@@ -92,7 +92,8 @@ def get(self, request: Request, workspace_id: str, application_id: str, work_flo
         )
         @has_permissions(PermissionConstants.APPLICATION_EDIT.get_workspace_application_permission())
         @log(menu='Application', operate="Modify application version information",
-             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')))
+             get_operation_object=lambda r, k: get_application_operation_object(k.get('application_id')),
+             workspace_id=lambda r, k: k.get('workspace_id'))
         def put(self, request: Request, workspace_id: str, application_id: str, work_flow_version_id: str):
             return result.success(
                 ApplicationVersionSerializer.Operate(

apps/common/log/log.py

@@ -57,7 +57,7 @@ def _get_details(request):
 
 
 def log(menu: str, operate, get_user=_get_user, get_ip_address=_get_ip_address, get_details=_get_details,
-        get_operation_object=None):
+        get_operation_object=None, workspace_id="None"):
     """
     记录审计日志
     @param menu: 操作菜单 str
@@ -92,7 +92,7 @@ def run(view, request, **kwargs):
                     _operate = operate(request)
                 # 插入审计日志
                 Log(menu=menu, operate=_operate, user=user, status=status, ip_address=ip, details=details,
-                    operation_object=operation_object).save()
+                    operation_object=operation_object, workspace_id=workspace_id).save()
 
         return run
 

apps/folders/views/folder.py

@@ -10,25 +10,18 @@
 from common.log.log import log
 from common.result import result
 from folders.api.folder import FolderCreateAPI, FolderEditAPI, FolderReadAPI, FolderTreeReadAPI, FolderDeleteAPI
-from folders.models.folder import FolderCreateRequest, FolderEditRequest
-from folders.serializers.folder import FolderSerializer, FolderTreeSerializer
+from folders.serializers.folder import FolderSerializer, FolderTreeSerializer, get_folder_type
 
 
-def get_folder_create_operation_object(folder_name):
-    folder_model = QuerySet(model=FolderCreateRequest).filter(name=folder_name).first()
+def get_folder_operation_object(folder_id, source):
+    Folder = get_folder_type(source)
+    folder_model = QuerySet(model=Folder).filter(id=folder_id).first()
     if folder_model is not None:
         return {
             'name': folder_model.name
         }
     return {}
 
-def get_folder_edit_operation_object(folder_name):
-    folder_model = QuerySet(model=FolderEditRequest).filter(name=folder_name).first()
-    if folder_model is not None:
-        return {
-            'name': folder_model.name
-        }
-    return {}
 
 class FolderView(APIView):
     authentication_classes = [TokenAuth]
@@ -46,7 +39,8 @@ class FolderView(APIView):
     @has_permissions(lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.CREATE,
                                                   resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}"))
     @log(menu='folder', operate='Create folder',
-         get_operation_object=lambda r,k: get_folder_create_operation_object(k.get('folder_name'))
+         get_operation_object=lambda r, k: {'name': r.data.get('name')},
+         workspace_id=lambda r, k: k.get('workspace_id')
          )
     def post(self, request: Request, workspace_id: str, source: str):
         return result.success(FolderSerializer.Create(
@@ -87,7 +81,8 @@ class Operate(APIView):
         @has_permissions(lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.EDIT,
                                                       resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}"))
         @log(menu='folder', operate='Edit folder',
-             get_operation_object=lambda r, k: get_folder_edit_operation_object(k.get('folder_name'))
+             get_operation_object=lambda r, k: get_folder_operation_object(k.get('folder_id'), k.get('source')),
+             workspace_id=lambda r, k: k.get('workspace_id')
              )
         def put(self, request: Request, workspace_id: str, source: str, folder_id: str):
             return result.success(FolderSerializer.Operate(
@@ -121,7 +116,10 @@ def get(self, request: Request, workspace_id: str, source: str, folder_id: str):
         )
         @has_permissions(lambda r, kwargs: Permission(group=Group(kwargs.get('source')), operate=Operate.DELETE,
                                                       resource_path=f"/WORKSPACE/{kwargs.get('workspace_id')}"))
-        @log(menu='folder', operate='Delete folder')
+        @log(menu='folder', operate='Delete folder',
+             get_operation_object=lambda r, k: get_folder_operation_object(k.get('folder_id'), k.get('source')),
+             workspace_id=lambda r, k: k.get('workspace_id')
+             )
         def delete(self, request: Request, workspace_id: str, source: str, folder_id: str):
             return result.success(FolderSerializer.Operate(
                 data={'id': folder_id, 'workspace_id': workspace_id, 'source': source}

apps/knowledge/views/common.py

@@ -3,7 +3,6 @@
 from knowledge.models import Document
 
 
-
 def get_document_operation_object(document_id: str):
     document_model = QuerySet(model=Document).filter(id=document_id).first()
     if document_model is not None:
@@ -13,6 +12,7 @@ def get_document_operation_object(document_id: str):
         }
     return {}
 
+
 def get_document_operation_object_batch(document_id_list: str):
     document_model_list = QuerySet(model=Document).filter(id__in=document_id_list)
     if document_model_list is not None:
@@ -32,4 +32,4 @@ def get_knowledge_document_operation_object(knowledge_dict: dict, document_dict:
         'dataset_type': knowledge_dict.get("type", ""),
         'document_name': document_dict.get("name", ""),
         'document_type': document_dict.get("type", ""),
-    }
+    }