Enable the isort rules for ruff and fix linting issues (#3698)

* Enable the isort rules for ruff

* Fix imports

* Add elasticsearch_cluster to known first parties

* Link to documentation

Co-authored-by: Dhruv Bhanushali <[email protected]>

* Add test to known first parties, update files

---------

Co-authored-by: Dhruv Bhanushali <[email protected]>

api/api/views/audio_views.py

@@ -15,9 +15,9 @@
     source_collection,
     stats,
     tag_collection,
+    waveform,
 )
 from api.docs.audio_docs import thumbnail as thumbnail_docs
-from api.docs.audio_docs import waveform
 from api.models import Audio
 from api.serializers.audio_serializers import (
     AudioCollectionRequestSerializer,

api/conf/settings/security.py

@@ -1,10 +1,10 @@
 from socket import gethostbyname, gethostname
 
-from decouple import config
+from django.core.exceptions import ImproperlyConfigured
 
-from conf.settings.base import INSTALLED_APPS, MIDDLEWARE, ENVIRONMENT
+from decouple import config
 
-from django.core.exceptions import ImproperlyConfigured
+from conf.settings.base import ENVIRONMENT, INSTALLED_APPS, MIDDLEWARE
 
 
 # Quick-start development settings - unsuitable for production

api/test/factory/models/audio.py

@@ -1,10 +1,9 @@
-from test.factory.faker import Faker
-from test.factory.models.media import IdentifierFactory, MediaFactory
-
 import factory
 from factory.django import DjangoModelFactory
 
 from api.models.audio import Audio, AudioAddOn, AudioReport, MatureAudio
+from test.factory.faker import Faker
+from test.factory.models.media import IdentifierFactory, MediaFactory
 
 
 class MatureAudioFactory(DjangoModelFactory):

api/test/factory/models/image.py

@@ -1,9 +1,8 @@
-from test.factory.models.media import MediaFactory, MediaReportFactory
-
 import factory
 from factory.django import DjangoModelFactory
 
 from api.models.image import Image, ImageReport, MatureImage
+from test.factory.models.media import MediaFactory, MediaReportFactory
 
 
 class MatureImageFactory(DjangoModelFactory):

api/test/factory/models/media.py

@@ -1,4 +1,3 @@
-from test.factory.faker import Faker
 from uuid import uuid4
 
 from django.conf import settings
@@ -11,6 +10,7 @@
 
 from api.constants.licenses import ALL_LICENSES
 from api.models.media import AbstractMedia
+from test.factory.faker import Faker
 
 
 CREATED_BY_FIXTURE_MARKER = "__created_by_test_fixture"

api/test/factory/models/oauth2.py

@@ -1,5 +1,3 @@
-from test.factory.faker import Faker
-
 from django.utils import timezone
 
 import factory
@@ -11,6 +9,7 @@
     OAuth2Verification,
     ThrottledApplication,
 )
+from test.factory.faker import Faker
 
 
 class ThrottledApplicationFactory(DjangoModelFactory):

api/test/media_integration.py

@@ -6,10 +6,11 @@
 
 import json
 import re
-from test.constants import API_URL
 
 import requests
 
+from test.constants import API_URL
+
 
 def search(fixture):
     """Return results for test query."""

api/test/test_audio_integration.py

@@ -6,6 +6,12 @@
 """
 
 import json
+
+import pytest
+import requests
+from django_redis import get_redis_connection
+
+from api.utils.check_dead_links import CACHE_PREFIX
 from test.constants import API_URL
 from test.media_integration import (
     creator_collection,
@@ -28,12 +34,6 @@
     uuid_validation,
 )
 
-import pytest
-import requests
-from django_redis import get_redis_connection
-
-from api.utils.check_dead_links import CACHE_PREFIX
-
 
 @pytest.fixture
 def force_result_validity():

api/test/test_auth.py

@@ -1,6 +1,6 @@
 import time
 import uuid
-from test.constants import API_URL
+from unittest.mock import patch
 
 from django.urls import reverse
 from django.utils.http import urlencode
@@ -9,7 +9,8 @@
 from oauth2_provider.models import AccessToken
 
 from api.models import OAuth2Verification, ThrottledApplication
-from unittest.mock import patch
+from test.constants import API_URL
+
 
 cache_availability_params = pytest.mark.parametrize(
     "is_cache_reachable, cache_name",

api/test/test_backwards_compat.py

@@ -6,10 +6,11 @@
 """
 
 import uuid
-from test.constants import API_URL
 
 import requests
 
+from test.constants import API_URL
+
 
 def test_old_stats_endpoint():
     response = requests.get(

api/test/test_dead_link_filter.py

@@ -1,4 +1,3 @@
-from test.constants import API_URL
 from unittest.mock import patch
 from uuid import uuid4
 
@@ -8,6 +7,7 @@
 import requests
 
 from api.controllers.elasticsearch.helpers import DEAD_LINK_RATIO
+from test.constants import API_URL
 
 
 @pytest.fixture

api/test/test_examples.py

@@ -1,10 +1,11 @@
 import json
 import os
 import subprocess
-from test.constants import API_URL
 
 import pytest
 
+from test.constants import API_URL
+
 
 os.environ["AUDIO_REQ_TOKEN"] = ""
 os.environ["AUDIO_REQ_ORIGIN"] = API_URL

api/test/test_image_integration.py

@@ -6,6 +6,11 @@
 """
 
 import json
+from urllib.parse import urlencode
+
+import pytest
+import requests
+
 from test.constants import API_URL
 from test.media_integration import (
     creator_collection,
@@ -26,10 +31,6 @@
     tag_collection,
     uuid_validation,
 )
-from urllib.parse import urlencode
-
-import pytest
-import requests
 
 
 identifier = "cdbd3bf6-1745-45bb-b399-61ee149cd58a"

api/test/test_v1_integration.py

@@ -6,14 +6,14 @@
 """
 
 import json
-from test.constants import API_URL
 
 import pytest
 import requests
 
 from api.constants.licenses import LICENSE_GROUPS
 from api.models import Image
 from api.utils.watermark import watermark
+from test.constants import API_URL
 
 
 @pytest.fixture

api/test/unit/conftest.py

@@ -1,10 +1,4 @@
 from dataclasses import dataclass
-from test.factory import models as model_factories
-from test.factory.models.media import (
-    CREATED_BY_FIXTURE_MARKER,
-    MediaFactory,
-    MediaReportFactory,
-)
 from unittest.mock import MagicMock
 
 from rest_framework.test import APIClient, APIRequestFactory
@@ -37,6 +31,12 @@
     MediaSearchRequestSerializer,
     MediaSerializer,
 )
+from test.factory import models as model_factories
+from test.factory.models.media import (
+    CREATED_BY_FIXTURE_MARKER,
+    MediaFactory,
+    MediaReportFactory,
+)
 
 
 @pytest.fixture

api/test/unit/controllers/elasticsearch/test_related.py

@@ -1,9 +1,3 @@
-from test.factory.es_http import (
-    MOCK_LIVE_RESULT_URL_PREFIX,
-    create_mock_es_http_image_response_with_identifier,
-    create_mock_es_http_image_search_response,
-)
-from test.factory.models import ImageFactory
 from unittest import mock
 
 import pook
@@ -14,6 +8,12 @@
     FILTERED_PROVIDERS_CACHE_KEY,
     FILTERED_PROVIDERS_CACHE_VERSION,
 )
+from test.factory.es_http import (
+    MOCK_LIVE_RESULT_URL_PREFIX,
+    create_mock_es_http_image_response_with_identifier,
+    create_mock_es_http_image_search_response,
+)
+from test.factory.models import ImageFactory
 
 
 pytestmark = pytest.mark.django_db

api/test/unit/controllers/test_search_controller.py

@@ -4,12 +4,6 @@
 import re
 from collections.abc import Callable
 from enum import Enum, auto
-from test.factory.es_http import (
-    MOCK_DEAD_RESULT_URL_PREFIX,
-    MOCK_LIVE_RESULT_URL_PREFIX,
-    create_mock_es_http_image_search_response,
-)
-from test.factory.models.content_provider import ContentProviderFactory
 from unittest import mock
 from unittest.mock import patch
 from uuid import uuid4
@@ -26,6 +20,12 @@
 from api.utils import tallies
 from api.utils.dead_link_mask import get_query_hash, save_query_mask
 from api.utils.search_context import SearchContext
+from test.factory.es_http import (
+    MOCK_DEAD_RESULT_URL_PREFIX,
+    MOCK_LIVE_RESULT_URL_PREFIX,
+    create_mock_es_http_image_search_response,
+)
+from test.factory.models.content_provider import ContentProviderFactory
 
 
 pytestmark = pytest.mark.django_db

api/test/unit/management/commands/test_generatewaveforms.py

@@ -1,7 +1,5 @@
 import subprocess
 from io import StringIO
-from test.factory.faker import WaveformProvider
-from test.factory.models.audio import AudioAddOnFactory, AudioFactory
 from unittest import mock
 
 from django.core.management import call_command
@@ -12,6 +10,8 @@
 from psycopg.errors import NotNullViolation
 
 from api.models.audio import Audio, AudioAddOn
+from test.factory.faker import WaveformProvider
+from test.factory.models.audio import AudioAddOnFactory, AudioFactory
 
 
 @mock.patch("api.models.audio.generate_peaks")

api/test/unit/models/test_audio.py

@@ -1,10 +1,10 @@
 import uuid
-from test.factory.faker import WaveformProvider
 from unittest import mock
 
 import pytest
 
 from api.models.audio import Audio, AudioAddOn
+from test.factory.faker import WaveformProvider
 
 
 @pytest.fixture

api/test/unit/serializers/test_media_serializers.py

@@ -1,6 +1,5 @@
 import random
 import uuid
-from test.factory.models.oauth2 import AccessTokenFactory
 from unittest.mock import MagicMock, patch
 
 from django.conf import settings
@@ -14,6 +13,7 @@
 from api.serializers.audio_serializers import AudioSearchRequestSerializer
 from api.serializers.image_serializers import ImageSearchRequestSerializer
 from api.serializers.media_serializers import MediaSearchRequestSerializer
+from test.factory.models.oauth2 import AccessTokenFactory
 
 
 @pytest.fixture

api/test/unit/utils/test_image_proxy.py

@@ -1,7 +1,6 @@
 import asyncio
 import itertools
 from dataclasses import replace
-from test.factory.models.image import ImageFactory
 from unittest.mock import patch
 from urllib.parse import urlencode
 
@@ -23,6 +22,7 @@
 )
 from api.utils.image_proxy import get as _photon_get
 from api.utils.tallies import get_monthly_timestamp
+from test.factory.models.image import ImageFactory
 
 
 TEST_IMAGE_DOMAIN = "subdomain.example.com"

api/test/unit/utils/test_throttle.py

@@ -1,6 +1,3 @@
-from test.factory.models.image import ImageFactory
-from test.factory.models.oauth2 import AccessTokenFactory
-
 from django.http import HttpResponse
 from rest_framework.settings import api_settings
 from rest_framework.test import force_authenticate
@@ -10,6 +7,8 @@
 
 from api.utils import throttle
 from api.views.media_views import MediaViewSet
+from test.factory.models.image import ImageFactory
+from test.factory.models.oauth2 import AccessTokenFactory
 
 
 cache_availability_params = pytest.mark.parametrize(

api/test/unit/views/test_image_views.py

@@ -1,13 +1,13 @@
 import json
 from pathlib import Path
-from test.factory.models.image import ImageFactory
 from unittest.mock import patch
 
 import pook
 import pytest
 from PIL import UnidentifiedImageError
 
 from api.views.image_views import ImageViewSet
+from test.factory.models.image import ImageFactory
 
 
 _MOCK_IMAGE_PATH = Path(__file__).parent / ".." / ".." / "factory"

automations/python/models/label.py

@@ -1,6 +1,7 @@
-from models.label_group import LabelGroup
 from shared.data import get_data
 
+from models.label_group import LabelGroup
+
 
 class Label:
 

automations/python/shared/labels.py

@@ -2,6 +2,7 @@
 
 from models.label import Label
 from models.label_group import LabelGroup
+
 from shared.data import get_data