Reintroduce isort in the pre-commit

docker-app/qfieldcloud/authentication/authentication.py

@@ -3,11 +3,12 @@
 from django.http.request import HttpRequest
 from django.utils import timezone
 from django.utils.translation import gettext as _
-from qfieldcloud.core.models import User
 from rest_framework.authentication import (
     TokenAuthentication as DjangoRestFrameworkTokenAuthentication,
 )
 
+from qfieldcloud.core.models import User
+
 from ..core.exceptions import AuthenticationViaTokenFailedError
 from .models import AuthToken
 

docker-app/qfieldcloud/authentication/migrations/0001_initial.py

@@ -1,10 +1,11 @@
 # Generated by Django 3.2.7 on 2021-10-01 22:01
 
 import django.db.models.deletion
-import qfieldcloud.authentication.models
 from django.conf import settings
 from django.db import migrations, models
 
+import qfieldcloud.authentication.models
+
 
 class Migration(migrations.Migration):
     initial = True

docker-app/qfieldcloud/authentication/tests/test_authentication.py

@@ -3,10 +3,11 @@
 
 from django.core.files.base import ContentFile
 from django.utils.timezone import now
+from rest_framework.test import APITransactionTestCase
+
 from qfieldcloud.authentication.models import AuthToken
 from qfieldcloud.core.models import Organization, Person, Team
 from qfieldcloud.core.tests.utils import setup_subscription_plans
-from rest_framework.test import APITransactionTestCase
 
 logging.disable(logging.CRITICAL)
 

docker-app/qfieldcloud/core/adapters.py

@@ -1,10 +1,11 @@
 from allauth.account import app_settings
 from allauth.account.adapter import DefaultAccountAdapter
+from allauth.account.models import EmailConfirmationHMAC
 from django.core.exceptions import ValidationError
+from django.http import HttpRequest
 from invitations.adapters import BaseInvitationsAdapter
+
 from qfieldcloud.core.models import Person
-from allauth.account.models import EmailConfirmationHMAC
-from django.http import HttpRequest
 
 
 class AccountAdapter(DefaultAccountAdapter, BaseInvitationsAdapter):

docker-app/qfieldcloud/core/admin.py

@@ -37,6 +37,8 @@
 from django.views.decorators.cache import never_cache
 from invitations.admin import InvitationAdmin as InvitationAdminBase
 from invitations.utils import get_invitation_model
+from rest_framework.authtoken.models import TokenProxy
+
 from qfieldcloud.core import exceptions
 from qfieldcloud.core.models import (
     ApplyJob,
@@ -58,7 +60,6 @@
 from qfieldcloud.core.paginators import LargeTablePaginator
 from qfieldcloud.core.templatetags.filters import filesizeformat10
 from qfieldcloud.core.utils2 import delta_utils, jobs, pg_service_file
-from rest_framework.authtoken.models import TokenProxy
 
 admin.site.unregister(LogEntry)
 

docker-app/qfieldcloud/core/cron.py

@@ -7,11 +7,11 @@
 from invitations.utils import get_invitation_model
 from sentry_sdk import capture_message
 
+from qfieldcloud.filestorage.models import File
+
 from ..core.models import ApplyJob, ApplyJobDelta, Delta, Job, Project
 from ..core.utils2 import storage
 from .invitations_utils import send_invitation
-from qfieldcloud.filestorage.models import File
-
 
 logger = logging.getLogger(__name__)
 

docker-app/qfieldcloud/core/drf_utils.py

@@ -1,7 +1,8 @@
+from typing import Iterable
+
 from django.db.models import QuerySet
 from rest_framework import filters, views
 from rest_framework.request import Request
-from typing import Iterable
 
 
 class QfcOrderingFilter(filters.OrderingFilter):

docker-app/qfieldcloud/core/fields.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
-from typing import Protocol, cast, Any
 from collections.abc import Callable
-from django.db import models
-from django.db.models.fields.files import FieldFile
+from typing import Any, Protocol, cast
+
 from django.core.files.storage import storages
-from django.db.models.fields.files import ImageFieldFile, ImageField
+from django.db import models
+from django.db.models.fields.files import FieldFile, ImageField, ImageFieldFile
 
 
 class FileStorageNameModelProtocol(Protocol):

docker-app/qfieldcloud/core/invitations_utils.py

@@ -9,6 +9,7 @@
 from invitations.adapters import get_invitations_adapter
 from invitations.signals import invite_url_sent
 from invitations.utils import get_invitation_model
+
 from qfieldcloud.core import permissions_utils
 from qfieldcloud.core.models import Person
 

docker-app/qfieldcloud/core/management/commands/extracts3data.py

@@ -4,9 +4,9 @@
 from typing import Generator, Iterable
 
 import mypy_boto3_s3
-from django.core.management.base import BaseCommand, CommandParser
-from django.core.files.storage import get_storage_class
 from django.conf import settings
+from django.core.files.storage import get_storage_class
+from django.core.management.base import BaseCommand, CommandParser
 from storages.backends.s3boto3 import S3Boto3Storage
 
 logger = logging.getLogger(__name__)

docker-app/qfieldcloud/core/middleware/timezone.py

@@ -1,4 +1,5 @@
 import zoneinfo
+
 from django.conf import settings
 from django.utils import timezone
 

docker-app/qfieldcloud/core/migrations/0009_geodb.py

@@ -1,10 +1,11 @@
 # Generated by Django 2.2.17 on 2021-01-03 11:41
 
 import django.db.models.deletion
-import qfieldcloud.core.models
 from django.conf import settings
 from django.db import migrations, models
 
+import qfieldcloud.core.models
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0010_auto_20210106_1543.py

@@ -1,9 +1,10 @@
 # Generated by Django 2.2.17 on 2021-01-06 15:43
 
 import django.core.validators
-import qfieldcloud.core.validators
 from django.db import migrations, models
 
+import qfieldcloud.core.validators
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0017_auto_20210226_1939.py

@@ -1,9 +1,10 @@
 # Generated by Django 2.2.17 on 2021-02-26 19:39
 
 import django.core.validators
-import qfieldcloud.core.validators
 from django.db import migrations, models
 
+import qfieldcloud.core.validators
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0032_auto_20210419_1011.py

@@ -1,10 +1,11 @@
 # Generated by Django 3.2 on 2021-04-19 10:11
 
 import django.db.models.deletion
-import qfieldcloud.core.models
 from django.conf import settings
 from django.db import migrations, models
 
+import qfieldcloud.core.models
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0041_auto_20210705_0837.py

@@ -1,6 +1,7 @@
 # Generated by Django 3.2.5 on 2021-07-05 08:37
 
 from django.db import migrations, models
+
 from qfieldcloud.core.utils import get_qgis_project_file
 
 

docker-app/qfieldcloud/core/migrations/0044_alter_user_username.py

@@ -1,9 +1,10 @@
 # Generated by Django 3.2.8 on 2021-10-06 13:38
 
 import django.core.validators
-import qfieldcloud.core.validators
 from django.db import migrations, models
 
+import qfieldcloud.core.validators
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0058_auto_20220914_2049.py

@@ -2,10 +2,11 @@
 
 import django.db.models.deletion
 import migrate_sql.operations
-import qfieldcloud.core.models
 from django.conf import settings
 from django.db import migrations, models
 
+import qfieldcloud.core.models
+
 
 class Migration(migrations.Migration):
     dependencies = [

docker-app/qfieldcloud/core/migrations/0059_auto_20221028_1806.py

@@ -1,11 +1,12 @@
 # Generated by Django 3.2.16 on 2022-10-28 16:06
 
 import django.db.models.deletion
-import qfieldcloud.core.models
 from django.db import migrations, models
 from django.db.models import Q
 from django.utils import timezone
 
+import qfieldcloud.core.models
+
 
 def set_active_plan(apps, schema_editor):
     UserAccount = apps.get_model("core", "UserAccount")

docker-app/qfieldcloud/core/migrations/0077_alter_user_username.py

@@ -2,6 +2,7 @@
 
 import django.core.validators
 from django.db import migrations, models
+
 import qfieldcloud.core.validators
 
 

docker-app/qfieldcloud/core/migrations/0079_organizationmember_created_at_and_more.py

@@ -1,9 +1,9 @@
 # Generated by Django 4.2.16 on 2024-11-29 06:28
 
-from django.conf import settings
-from django.db import migrations, models
 import django.db.models.deletion
 import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

docker-app/qfieldcloud/core/migrations/0081_file_storage_project_and_more.py

@@ -1,11 +1,12 @@
 # Generated by Django 3.2.25 on 2024-06-18 01:02
 
 import django.core.validators
+from django.conf import settings
+from django.db import migrations, models
+
 import qfieldcloud.core.models
 import qfieldcloud.core.validators
 from qfieldcloud.core.fields import QfcImageField
-from django.db import migrations, models
-from django.conf import settings
 
 
 def get_file_storage_name():

docker-app/qfieldcloud/core/models.py

@@ -1,44 +1,43 @@
 from __future__ import annotations
 
 import logging
-from pathlib import Path
 import secrets
 import string
 import uuid
 from datetime import datetime, timedelta
 from enum import Enum
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, cast
-from deprecated import deprecated
 
 import django_cryptography.fields
+from deprecated import deprecated
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
 from django.contrib.auth.models import UserManager as DjangoUserManager
 from django.contrib.gis.db import models
 from django.core.exceptions import ValidationError
 from django.core.validators import (
+    FileExtensionValidator,
     MaxValueValidator,
     MinValueValidator,
     RegexValidator,
-    FileExtensionValidator,
 )
 from django.db import transaction
-from django.db.models import Case, Exists, F, OuterRef, Q
+from django.db.models import Case, Exists, F, OuterRef, Q, When
 from django.db.models import Value as V
-from django.db.models import When
 from django.db.models.aggregates import Count, Sum
 from django.db.models.fields.json import JSONField
-from django.urls import reverse_lazy, reverse
+from django.urls import reverse, reverse_lazy
 from django.utils.functional import cached_property
 from django.utils.safestring import SafeString, mark_safe
 from django.utils.translation import gettext as _
 from model_utils.managers import InheritanceManager, InheritanceManagerMixin
+from timezone_field import TimeZoneField
+
 from qfieldcloud.core import geodb_utils, utils, validators
+from qfieldcloud.core.fields import DynamicStorageFileField, QfcImageField, QfcImageFile
 from qfieldcloud.core.utils2 import storage
 from qfieldcloud.subscription.exceptions import ReachedMaxOrganizationMembersError
-from timezone_field import TimeZoneField
-from qfieldcloud.core.fields import DynamicStorageFileField, QfcImageField, QfcImageFile
-
 
 if TYPE_CHECKING:
     from qfieldcloud.filestorage.models import File

docker-app/qfieldcloud/core/permission_check.py

@@ -2,6 +2,7 @@
 
 from django.http.request import HttpRequest
 from django.http.response import HttpResponse, HttpResponseForbidden
+
 from qfieldcloud.core import permissions_utils
 
 

docker-app/qfieldcloud/core/permissions_utils.py

@@ -1,6 +1,7 @@
 from typing import Literal
 
 from django.utils.translation import gettext as _
+
 from qfieldcloud.authentication.models import AuthToken
 from qfieldcloud.core.models import (
     Delta,

docker-app/qfieldcloud/core/querysets_utils.py

@@ -4,6 +4,7 @@
 from django.db.models import F, Q, QuerySet
 from django.db.models import Value as V
 from django.db.models.functions import StrIndex
+
 from qfieldcloud.core.models import (
     Delta,
     Organization,

docker-app/qfieldcloud/core/rest_utils.py

@@ -2,10 +2,11 @@
 
 from django.conf import settings
 from django.core import exceptions
-from qfieldcloud.core import exceptions as qfieldcloud_exceptions
 from rest_framework import exceptions as rest_exceptions
 from rest_framework.response import Response
 
+from qfieldcloud.core import exceptions as qfieldcloud_exceptions
+
 logger = logging.getLogger(__name__)
 
 

docker-app/qfieldcloud/core/serializers.py

@@ -1,6 +1,12 @@
 from pathlib import Path
+from typing import Any
+
 from django.urls import reverse_lazy
 from django.utils.translation import gettext as _
+from rest_framework import serializers
+from rest_framework.exceptions import ValidationError
+from rest_framework.request import Request
+
 from qfieldcloud.authentication.models import AuthToken
 from qfieldcloud.core import exceptions
 from qfieldcloud.core.models import (
@@ -18,11 +24,6 @@
     User,
 )
 from qfieldcloud.filestorage.serializers import FileWithVersionsSerializer
-from rest_framework import serializers
-from rest_framework.exceptions import ValidationError
-from rest_framework.request import Request
-
-from typing import Any
 
 
 def get_avatar_url(user: User, request: Request | None = None) -> str | None:

docker-app/qfieldcloud/core/signals.py

@@ -1,5 +1,6 @@
 from axes.signals import user_locked_out
 from django.dispatch import receiver
+
 from qfieldcloud.core.exceptions import TooManyLoginAttemptsError