Ruff: add isort (DefectDojo#9754)

* Add isort

* Fix isort

dojo/admin.py

@@ -1,8 +1,18 @@
 from auditlog.models import LogEntry
 from django.contrib import admin
-from polymorphic.admin import PolymorphicParentModelAdmin, PolymorphicChildModelAdmin
-from dojo.models import Question, TextQuestion, ChoiceQuestion, Choice, \
-    Answer, TextAnswer, ChoiceAnswer, Engagement_Survey, Answered_Survey
+from polymorphic.admin import PolymorphicChildModelAdmin, PolymorphicParentModelAdmin
+
+from dojo.models import (
+    Answer,
+    Answered_Survey,
+    Choice,
+    ChoiceAnswer,
+    ChoiceQuestion,
+    Engagement_Survey,
+    Question,
+    TextAnswer,
+    TextQuestion,
+)
 
 admin.site.unregister(LogEntry)
 

dojo/announcement/signals.py

@@ -1,7 +1,8 @@
-from dojo.models import Announcement, UserAnnouncement, Dojo_User
+from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
-from django.conf import settings
+
+from dojo.models import Announcement, Dojo_User, UserAnnouncement
 
 
 @receiver(post_save, sender=Dojo_User)

dojo/announcement/urls.py

@@ -1,4 +1,5 @@
 from django.urls import re_path
+
 from dojo.announcement import views
 
 urlpatterns = [

dojo/announcement/views.py

@@ -1,18 +1,18 @@
 import logging
 
-from django.shortcuts import render
 from django.contrib import messages
+from django.http import HttpResponseRedirect
+from django.shortcuts import render
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
 from django.utils.translation import gettext
-from django.http import HttpResponseRedirect
-from dojo.utils import add_breadcrumb
+from django.utils.translation import gettext_lazy as _
 
-from dojo.forms import AnnouncementCreateForm, AnnouncementRemoveForm
-from dojo.models import Announcement, UserAnnouncement
 from dojo.authorization.authorization_decorators import (
     user_is_configuration_authorized,
 )
+from dojo.forms import AnnouncementCreateForm, AnnouncementRemoveForm
+from dojo.models import Announcement, UserAnnouncement
+from dojo.utils import add_breadcrumb
 
 logger = logging.getLogger(__name__)
 

dojo/api_v2/exception_handler.py

@@ -1,4 +1,5 @@
-from dojo.models import System_Settings
+import logging
+
 from django.core.exceptions import ValidationError
 from django.db.models.deletion import RestrictedError
 from rest_framework.response import Response
@@ -8,7 +9,8 @@
     HTTP_500_INTERNAL_SERVER_ERROR,
 )
 from rest_framework.views import exception_handler
-import logging
+
+from dojo.models import System_Settings
 
 logger = logging.getLogger(__name__)
 

dojo/api_v2/mixins.py

@@ -1,12 +1,14 @@
-from django.db import DEFAULT_DB_ALIAS
+import itertools
+
 from django.contrib.admin.utils import NestedObjects
+from django.db import DEFAULT_DB_ALIAS
 from drf_spectacular.utils import extend_schema
-from rest_framework.decorators import action
 from rest_framework import status
 from rest_framework.authtoken.models import Token
+from rest_framework.decorators import action
+
 from dojo.api_v2 import serializers
-from dojo.models import Question, Answer
-import itertools
+from dojo.models import Answer, Question
 
 
 class DeletePreviewModelMixin:

dojo/api_v2/permissions.py

@@ -1,39 +1,41 @@
 import re
+
+from django.shortcuts import get_object_or_404
+from rest_framework import permissions, serializers
 from rest_framework.exceptions import (
     ParseError,
     PermissionDenied,
     ValidationError,
 )
+
 from dojo.api_v2.serializers import (
     get_import_meta_data_from_dict,
     get_product_id_from_dict,
 )
+from dojo.authorization.authorization import (
+    user_has_configuration_permission,
+    user_has_global_permission,
+    user_has_permission,
+)
+from dojo.authorization.roles_permissions import Permissions
 from dojo.importers.reimporter.utils import (
     get_target_engagement_if_exists,
     get_target_product_by_id_if_exists,
     get_target_product_if_exists,
-    get_target_test_if_exists,
     get_target_product_type_if_exists,
+    get_target_test_if_exists,
 )
 from dojo.models import (
+    Cred_Mapping,
+    Dojo_Group,
     Endpoint,
     Engagement,
     Finding,
     Finding_Group,
-    Product_Type,
     Product,
+    Product_Type,
     Test,
-    Dojo_Group,
-    Cred_Mapping,
 )
-from django.shortcuts import get_object_or_404
-from rest_framework import permissions, serializers
-from dojo.authorization.authorization import (
-    user_has_global_permission,
-    user_has_permission,
-    user_has_configuration_permission,
-)
-from dojo.authorization.roles_permissions import Permissions
 
 
 def check_post_permission(request, post_model, post_pk, post_permission):

dojo/api_v2/prefetch/mixins.py

@@ -1,5 +1,6 @@
-from rest_framework.response import Response
 from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
+from rest_framework.response import Response
+
 from .prefetcher import _Prefetcher
 
 

dojo/api_v2/prefetch/prefetcher.py

@@ -1,8 +1,10 @@
-from rest_framework.serializers import ModelSerializer
-from . import utils
 import inspect
 import sys
 
+from rest_framework.serializers import ModelSerializer
+
+from . import utils
+
 # Reduce the scope of search for serializers.
 SERIALIZER_DEFS_MODULE = "dojo.api_v2.serializers"
 

dojo/api_v2/serializers.py

@@ -1,13 +1,38 @@
+import json
+import logging
 import re
-from dojo.finding.queries import get_authorized_findings
-from dojo.group.utils import get_auth_group_name
-from django.contrib.auth.models import Group
+from datetime import datetime
 from typing import List
+
+import six
+import tagulous
+from django.conf import settings
+from django.contrib.auth.models import Group, Permission
+from django.contrib.auth.password_validation import validate_password
+from django.core.exceptions import PermissionDenied, ValidationError
+from django.db.utils import IntegrityError
+from django.urls import reverse
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
 from drf_spectacular.utils import extend_schema_field
+from rest_framework import serializers
 from rest_framework.exceptions import NotFound
 from rest_framework.fields import DictField, MultipleChoiceField
-from datetime import datetime
-from dojo.endpoint.utils import endpoint_filter
+
+import dojo.jira_link.helper as jira_helper
+from dojo.authorization.authorization import user_has_permission
+from dojo.authorization.roles_permissions import Permissions
+from dojo.endpoint.utils import endpoint_filter, endpoint_meta_import
+from dojo.finding.helper import (
+    save_vulnerability_ids,
+    save_vulnerability_ids_template,
+)
+from dojo.finding.queries import get_authorized_findings
+from dojo.group.utils import get_auth_group_name
+from dojo.importers.importer.importer import DojoDefaultImporter as Importer
+from dojo.importers.reimporter.reimporter import (
+    DojoDefaultReImporter as ReImporter,
+)
 from dojo.importers.reimporter.utils import (
     get_or_create_engagement,
     get_target_engagement_if_exists,
@@ -16,113 +41,86 @@
     get_target_test_if_exists,
 )
 from dojo.models import (
+    DEFAULT_NOTIFICATION,
     IMPORT_ACTIONS,
+    NOTIFICATION_CHOICES,
     SEVERITIES,
-    SLA_Configuration,
+    SEVERITY_CHOICES,
     STATS_FIELDS,
+    Announcement,
+    Answer,
+    Answered_Survey,
+    App_Analysis,
+    Check_List,
+    ChoiceAnswer,
+    ChoiceQuestion,
+    Cred_Mapping,
+    Cred_User,
+    Development_Environment,
+    Dojo_Group,
+    Dojo_Group_Member,
     Dojo_User,
-    Finding_Group,
-    Product,
+    DojoMeta,
+    Endpoint,
+    Endpoint_Params,
+    Endpoint_Status,
     Engagement,
-    Test,
+    Engagement_Presets,
+    Engagement_Survey,
+    FileUpload,
     Finding,
-    User,
-    Stub_Finding,
-    Risk_Acceptance,
+    Finding_Group,
     Finding_Template,
-    Test_Type,
-    Development_Environment,
-    NoteHistory,
-    JIRA_Issue,
-    Tool_Product_Settings,
-    Tool_Configuration,
-    Tool_Type,
-    Product_Type,
+    General_Survey,
+    Global_Role,
     JIRA_Instance,
-    Endpoint,
+    JIRA_Issue,
     JIRA_Project,
-    Cred_Mapping,
-    Notes,
-    DojoMeta,
+    Language_Type,
+    Languages,
+    Network_Locations,
     Note_Type,
-    App_Analysis,
-    Endpoint_Status,
-    Cred_User,
+    NoteHistory,
+    Notes,
+    Notifications,
+    Product,
+    Product_API_Scan_Configuration,
+    Product_Group,
+    Product_Member,
+    Product_Type,
+    Product_Type_Group,
+    Product_Type_Member,
+    Question,
+    Regulation,
+    Risk_Acceptance,
+    Role,
+    SLA_Configuration,
     Sonarqube_Issue,
     Sonarqube_Issue_Transition,
-    Endpoint_Params,
-    Regulation,
+    Stub_Finding,
     System_Settings,
-    FileUpload,
-    SEVERITY_CHOICES,
+    Test,
     Test_Import,
     Test_Import_Finding_Action,
-    Product_Type_Member,
-    Product_Member,
-    Product_Group,
-    Product_Type_Group,
-    Dojo_Group,
-    Role,
-    Global_Role,
-    Dojo_Group_Member,
-    Language_Type,
-    Languages,
-    Notifications,
-    NOTIFICATION_CHOICES,
-    Engagement_Presets,
-    Network_Locations,
+    Test_Type,
+    TextAnswer,
+    TextQuestion,
+    Tool_Configuration,
+    Tool_Product_Settings,
+    Tool_Type,
+    User,
     UserContactInfo,
-    Product_API_Scan_Configuration,
-    DEFAULT_NOTIFICATION,
     Vulnerability_Id,
     Vulnerability_Id_Template,
     get_current_date,
-    Question,
-    TextQuestion,
-    ChoiceQuestion,
-    Answer,
-    TextAnswer,
-    ChoiceAnswer,
-    Engagement_Survey,
-    Answered_Survey,
-    General_Survey,
-    Check_List,
-    Announcement,
 )
-
 from dojo.tools.factory import (
-    requires_file,
     get_choices_sorted,
+    requires_file,
     requires_tool_type,
 )
-from dojo.utils import is_scan_file_too_large
-from django.conf import settings
-from rest_framework import serializers
-from django.core.exceptions import ValidationError, PermissionDenied
-from django.contrib.auth.password_validation import validate_password
-from django.contrib.auth.models import Permission
-from django.utils import timezone
-from django.urls import reverse
-from django.db.utils import IntegrityError
-import six
-from django.utils.translation import gettext_lazy as _
-import json
-import dojo.jira_link.helper as jira_helper
-import logging
-import tagulous
-from dojo.endpoint.utils import endpoint_meta_import
-from dojo.importers.importer.importer import DojoDefaultImporter as Importer
-from dojo.importers.reimporter.reimporter import (
-    DojoDefaultReImporter as ReImporter,
-)
-from dojo.authorization.authorization import user_has_permission
-from dojo.authorization.roles_permissions import Permissions
-from dojo.finding.helper import (
-    save_vulnerability_ids,
-    save_vulnerability_ids_template,
-)
 from dojo.user.utils import get_configuration_permissions_codenames
-
+from dojo.utils import is_scan_file_too_large
 
 logger = logging.getLogger(__name__)
 deduplicationLogger = logging.getLogger("dojo.specific-loggers.deduplication")