Fix isort

dashboard/celery/__init__.py

@@ -14,7 +14,6 @@
 import flower.utils.broker
 from celery import Celery, Task
 from django.conf import settings
-
 from websecmap.celery.worker import QUEUES_MATCHING_ROLES
 
 log = logging.getLogger(__package__)

dashboard/internet_nl_dashboard/admin.py

@@ -15,13 +15,13 @@
 from import_export import resources
 from import_export.admin import ImportExportModelAdmin
 from jet.admin import CompactInline
+from websecmap.organizations.models import Url
+from websecmap.scanners.models import Endpoint
 
 from dashboard.internet_nl_dashboard import models
 from dashboard.internet_nl_dashboard.forms import CustomAccountModelForm
 from dashboard.internet_nl_dashboard.models import (Account, AccountInternetNLScan, DashboardUser,
                                                     UploadLog, UrlList)
-from websecmap.organizations.models import Url
-from websecmap.scanners.models import Endpoint
 
 log = logging.getLogger(__package__)
 

dashboard/internet_nl_dashboard/logic/urllist_dashboard_report.py

@@ -6,13 +6,13 @@
 import pytz
 from celery import group
 from deepdiff import DeepDiff
-
-from dashboard.internet_nl_dashboard.models import UrlList, UrlListReport
 from websecmap.celery import Task, app
 from websecmap.organizations.models import Url
 from websecmap.reporting.report import (aggegrate_url_rating_scores, get_latest_urlratings_fast,
                                         relevant_urls_at_timepoint)
 
+from dashboard.internet_nl_dashboard.models import UrlList, UrlListReport
+
 log = logging.getLogger(__package__)
 
 

dashboard/internet_nl_dashboard/logic/urllist_dashboard_report_historically.py

@@ -4,11 +4,11 @@
 
 import pytz
 from celery import group
-
-from dashboard.internet_nl_dashboard.models import UrlList, UrlListReport
 from websecmap.celery import Task, app
 from websecmap.pro.urllist_report import rate_urllist_on_moment
 
+from dashboard.internet_nl_dashboard.models import UrlList, UrlListReport
+
 log = logging.getLogger(__package__)
 
 

dashboard/internet_nl_dashboard/logic/urllist_management.py

@@ -2,11 +2,11 @@
 
 from django.db.models import Prefetch
 from tldextract import tldextract
-
-from dashboard.internet_nl_dashboard.models import Account, UrlList
 from websecmap.organizations.models import Url
 from websecmap.scanners.models import Endpoint
 
+from dashboard.internet_nl_dashboard.models import Account, UrlList
+
 
 def get_urllists_from_account(account: Account) -> List:
     """

dashboard/internet_nl_dashboard/management/commands/check_running_dashboard_scans.py

@@ -1,8 +1,9 @@
 import logging
 
+from websecmap.app.management.commands._private import TaskCommand
+
 from dashboard.internet_nl_dashboard.scanners.scan_internet_nl_per_account import \
     check_running_dashboard_scans
-from websecmap.app.management.commands._private import TaskCommand
 
 log = logging.getLogger(__name__)
 

dashboard/internet_nl_dashboard/management/commands/report_dashboard_urllists.py

@@ -1,8 +1,9 @@
 import logging
 
-from dashboard.internet_nl_dashboard.logic import urllist_dashboard_report
 from websecmap.app.management.commands._private import ScannerTaskCommand
 
+from dashboard.internet_nl_dashboard.logic import urllist_dashboard_report
+
 log = logging.getLogger(__name__)
 
 

dashboard/internet_nl_dashboard/management/commands/report_dashboard_urllists_historically.py

@@ -1,8 +1,9 @@
 import logging
 
-from dashboard.internet_nl_dashboard.logic import urllist_dashboard_report_historically
 from websecmap.app.management.commands._private import ScannerTaskCommand
 
+from dashboard.internet_nl_dashboard.logic import urllist_dashboard_report_historically
+
 log = logging.getLogger(__name__)
 
 

dashboard/internet_nl_dashboard/management/commands/run_dashboard_scans.py

@@ -1,8 +1,9 @@
 import logging
 
-from dashboard.internet_nl_dashboard.scanners import scan_internet_nl_per_account
 from websecmap.app.management.commands._private import ScannerTaskCommand
 
+from dashboard.internet_nl_dashboard.scanners import scan_internet_nl_per_account
+
 log = logging.getLogger(__name__)
 
 

dashboard/internet_nl_dashboard/models.py

@@ -6,7 +6,6 @@
 from django.contrib.auth.models import User
 from django.db import models
 from requests.auth import HTTPBasicAuth
-
 from websecmap.organizations.models import Url
 from websecmap.reporting.models import SeriesOfUrlsReportMixin
 from websecmap.scanners.models import InternetNLScan

dashboard/internet_nl_dashboard/scanners/scan_internet_nl_per_account.py

@@ -2,16 +2,16 @@
 from typing import List
 
 from celery import Task, group
-
-from dashboard.celery import app
-from dashboard.internet_nl_dashboard.models import Account, AccountInternetNLScan, UrlList
 from websecmap.organizations.models import Url
 from websecmap.scanners.models import InternetNLScan
 from websecmap.scanners.scanner import add_model_filter
 from websecmap.scanners.scanner.dns_endpoints import compose_discover_task
 from websecmap.scanners.scanner.internet_nl_mail import (get_scan_status,
                                                          handle_running_scan_reponse, register_scan)
 
+from dashboard.celery import app
+from dashboard.internet_nl_dashboard.models import Account, AccountInternetNLScan, UrlList
+
 # done: create more flexible filters
 # done: map mail scans to an endpoint (changed the scanner for it)
 # done: make nice tracking name for internet nl that is echoed in the scan results.

dashboard/internet_nl_dashboard/views/dashboard.py

@@ -2,11 +2,11 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
+from websecmap.app.common import JSEncoder
 
 from dashboard.internet_nl_dashboard.logic.dashboard import get_recent_reports, get_report
 from dashboard.internet_nl_dashboard.views import (LOGIN_URL, get_account,
                                                    inject_default_language_cookie)
-from websecmap.app.common import JSEncoder
 
 
 @login_required(login_url=LOGIN_URL)

dashboard/internet_nl_dashboard/views/download_spreadsheet.py

@@ -4,10 +4,10 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, JsonResponse
 from django.utils.text import slugify
+from websecmap.app.common import JSEncoder
 
 from dashboard.internet_nl_dashboard.logic.report_to_spreadsheet import create_spreadsheet
 from dashboard.internet_nl_dashboard.views.__init__ import LOGIN_URL, get_account
-from websecmap.app.common import JSEncoder
 
 log = logging.getLogger(__package__)
 

dashboard/internet_nl_dashboard/views/scan_monitor.py

@@ -3,11 +3,11 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
+from websecmap.app.common import JSEncoder
 
 from dashboard.internet_nl_dashboard.logic.scan_monitor import get_running_scans
 from dashboard.internet_nl_dashboard.views import (LOGIN_URL, get_account,
                                                    inject_default_language_cookie)
-from websecmap.app.common import JSEncoder
 
 log = logging.getLogger(__package__)
 

dashboard/internet_nl_dashboard/views/spreadsheet.py

@@ -5,12 +5,12 @@
 from django.core.files.storage import FileSystemStorage
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
+from websecmap.app.common import JSEncoder
 
 from dashboard.internet_nl_dashboard.logic.spreadsheet import complete_import, get_upload_history
 from dashboard.internet_nl_dashboard.views.__init__ import (LOGIN_URL, get_account,
                                                             get_dashboarduser,
                                                             inject_default_language_cookie)
-from websecmap.app.common import JSEncoder
 
 log = logging.getLogger(__package__)
 

dashboard/internet_nl_dashboard/views/urllist.py

@@ -3,14 +3,14 @@
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import render
+from websecmap.app.common import JSEncoder
 
 from dashboard.internet_nl_dashboard.logic.urllist_management import (create_list,
                                                                       get_urllist_content,
                                                                       get_urllists_from_account,
                                                                       save_urllist_content)
 from dashboard.internet_nl_dashboard.views import (LOGIN_URL, get_account,
                                                    inject_default_language_cookie)
-from websecmap.app.common import JSEncoder
 
 
 @login_required(login_url=LOGIN_URL)

tests/test_per_account_scanner.py

@@ -5,11 +5,12 @@
 """
 import logging
 
-from dashboard.internet_nl_dashboard.models import Account, UrlList
-from dashboard.internet_nl_dashboard.scanners.scan_internet_nl_per_account import compose_task
 from websecmap.organizations.models import Url
 from websecmap.scanners.models import Endpoint
 
+from dashboard.internet_nl_dashboard.models import Account, UrlList
+from dashboard.internet_nl_dashboard.scanners.scan_internet_nl_per_account import compose_task
+
 log = logging.getLogger('test')
 
 

tests/test_rate_urllist.py

@@ -6,17 +6,17 @@
 from datetime import datetime
 
 import pytz
-
 import websecmap
-from dashboard.internet_nl_dashboard.logic.urllist_dashboard_report import rate_urllists_now
-from dashboard.internet_nl_dashboard.logic.urllist_management import create_list
-from dashboard.internet_nl_dashboard.models import Account, UrlListReport
 from websecmap.organizations.models import Url
 from websecmap.reporting.models import UrlReport
 from websecmap.reporting.report import create_timeline, create_url_report
 from websecmap.scanners import ALL_SCAN_TYPES
 from websecmap.scanners.models import Endpoint, EndpointGenericScan
 
+from dashboard.internet_nl_dashboard.logic.urllist_dashboard_report import rate_urllists_now
+from dashboard.internet_nl_dashboard.logic.urllist_management import create_list
+from dashboard.internet_nl_dashboard.models import Account, UrlListReport
+
 # mock get_allowed_to_report as constance tries to connect to redis.