add flake8-plugins to CI and fix linter warnings

Author: f1xgun

.flake8

@@ -1,11 +1,6 @@
 [flake8]
 max-line-length = 120
 
-ignore =
-  VNE002
-  VNE003
-  W503
-
 exclude =
   ./.cache,
   ./.git,
@@ -20,4 +15,4 @@ exclude =
   ./.vscode,
   *migrations*,
 
-  enable-extensions = print, VNE
+  enable-extensions = print, VNE, B, A, C4, BLK

.pre-commit-config.yaml

@@ -6,6 +6,14 @@ repos:
             exclude: ^.*\b(migrations)\b.*$
             language_version: python3
     - repo: https://github.com/pycqa/flake8
-      rev: 5.0.4 
+      rev: 6.1.0
       hooks:
           - id: flake8
+            additional_dependencies:
+            - flake8-print
+            - flake8-variables-names
+            - flake8-bugbear
+            - flake8-builtins
+            - flake8-comprehensions
+            - flake8-broken-line
+            - flake8-mutable

chats/models.py

@@ -85,7 +85,7 @@ class ProjectChat(BaseChat):
         created_at: A DateTimeField indicating date of creation.
     """
 
-    id = models.PositiveIntegerField(primary_key=True, unique=True)
+    id = models.PositiveIntegerField(primary_key=True, unique=True)  # noqa A003 VNE003
     project = models.ForeignKey(
         Project, on_delete=models.CASCADE, related_name="project_chats"
     )
@@ -126,7 +126,7 @@ class DirectChat(BaseChat):
         get_users: returns list of users, who are in chat
     """
 
-    id = models.CharField(primary_key=True, max_length=64)
+    id = models.CharField(primary_key=True, max_length=64)  # noqa A003 VNE003
     users = models.ManyToManyField(User, related_name="direct_chats")
 
     def get_users(self):
@@ -287,7 +287,7 @@ class Meta:
 
 
 class FileToMessage(models.Model):
-    file = models.OneToOneField(
+    file = models.OneToOneField(  # noqa VNE002
         UserFile,
         on_delete=models.CASCADE,
         related_name="file_to_message",

chats/utils.py

@@ -108,12 +108,12 @@ async def create_file_to_message(
 
 async def match_files_and_messages(file_urls, messages):
     for url in file_urls:
-        file = await sync_to_async(UserFile.objects.get)(pk=url)
+        user_file = await sync_to_async(UserFile.objects.get)(pk=url)
         # implicitly matches a file and a message
         await create_file_to_message(
             direct_message=messages["direct_message"],
             project_message=messages["project_message"],
-            file=file,
+            file=user_file,
         )
 
 

chats/websockets_settings.py

@@ -27,5 +27,5 @@ class EventGroupType(str, Enum):
 
 @dataclass(frozen=True)
 class Event:
-    type: EventType
+    type: EventType  # noqa: A003, VNE003
     content: dict

core/management/commands/migrate_education.py

@@ -12,6 +12,7 @@ class Command(BaseCommand):
     """
     Use: python manage.py migrate_education.
     """
+
     def handle(self, *args, **kwargs):
         self.stdout.write("Start manual migration ...")
         try:
@@ -22,9 +23,7 @@ def handle(self, *args, **kwargs):
                 )
             )
         except Exception as e:
-            self.stderr.write(
-                self.style.ERROR(f"Migration failed: {str(e)}")
-            )
+            self.stderr.write(self.style.ERROR(f"Migration failed: {str(e)}"))
 
 
 @transaction.atomic
@@ -33,12 +32,16 @@ def migrate_organization_to_education() -> int:
     Migrate old field `organization` to new model `Education`.
     Returns count migrated users.
     """
-    users_with_irganization = CustomUser.objects.exclude(organization=None).exclude(organization="")
-    UserEducation.objects.bulk_create([
-        UserEducation(
-            user=user,
-            organization_name=user.organization,
-        )
-        for user in users_with_irganization
-    ])
+    users_with_irganization = CustomUser.objects.exclude(organization=None).exclude(
+        organization=""
+    )
+    UserEducation.objects.bulk_create(
+        [
+            UserEducation(
+                user=user,
+                organization_name=user.organization,
+            )
+            for user in users_with_irganization
+        ]
+    )
     return users_with_irganization.count()

core/management/commands/migrate_old_to_new_fields_trigram.py

@@ -21,17 +21,22 @@ class Command(BaseCommand):
         $CREATE EXTENSION pg_trgm;
     Migrate old fields to new.
     """
+
     def handle(self, *args, **kwargs):
         self.stdout.write("Starting manual migrations...")
         try:
             start = time()
             migrate_old_to_new_fields_trigram()
             end = time()
-            self.stdout.write(self.style.SUCCESS(
-                f"Manual trigram migrations completed successfully, timing: {end - start}")
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f"Manual trigram migrations completed successfully, timing: {end - start}"
+                )
             )
         except Exception as e:
-            self.stderr.write(self.style.ERROR(f"Manual trigram migrations failed: {str(e)}"))
+            self.stderr.write(
+                self.style.ERROR(f"Manual trigram migrations failed: {str(e)}")
+            )
 
 
 @transaction.atomic
@@ -64,7 +69,10 @@ def migrate_old_to_new_fields_trigram() -> None:
 
         # Migration `key_skills` -> `skills`.
         # (Only users who have not filled `skills`, but have filled in `key_skills`).
-        if user.key_skills and not SkillToObject.objects.filter(object_id=user.id).exists():
+        if (
+            user.key_skills
+            and not SkillToObject.objects.filter(object_id=user.id).exists()
+        ):
             for skill_name in user.key_skills.lower().split(","):
                 if not skill_name:
                     continue  # Skipping empty lines
@@ -85,7 +93,10 @@ def migrate_old_to_new_fields_trigram() -> None:
 
         # Boolean field is responsible for transferring data if both fields
         # were already there or were transferred = `True` (default value = `False`).
-        if user.v2_speciality and SkillToObject.objects.filter(object_id=user.id).exists():
+        if (
+            user.v2_speciality
+            and SkillToObject.objects.filter(object_id=user.id).exists()
+        ):
             user.dataset_migration_applied = True
 
         user.save()

core/management/commands/reverse_migrate_education.py

@@ -17,13 +17,16 @@ def add_arguments(self, parser: CommandParser) -> None:
         parser.add_argument(
             "--confirm",
             action="store_true",
-            help="Confirm delete Users educations from UserEducation model"
+            help="Confirm delete Users educations from UserEducation model",
         )
 
     def handle(self, *args, **kwargs):
         confirm = kwargs["confirm"]
-        self.stdout.write(self.style.WARNING(
-            "You are about to DELETE ALL INSTANCES in the UserEducation model."))
+        self.stdout.write(
+            self.style.WARNING(
+                "You are about to DELETE ALL INSTANCES in the UserEducation model."
+            )
+        )
 
         if not confirm:
             answer = input("Type 'yes' to continue, or 'no' to cancel: ").lower()
@@ -35,7 +38,9 @@ def handle(self, *args, **kwargs):
 
         try:
             deleted_instances = delete_all_instances_usereducation()
-            self.stdout.write(self.style.SUCCESS("Manual migrations completed successfully."))
+            self.stdout.write(
+                self.style.SUCCESS("Manual migrations completed successfully.")
+            )
             self.stdout.write(self.style.SUCCESS(f"Deleted: {deleted_instances}"))
         except Exception as e:
             self.stderr.write(self.style.ERROR(f"Manual migrations failed: {str(e)}"))

core/management/commands/reverse_old_to_new_fields.py

@@ -12,6 +12,7 @@ class Command(BaseCommand):
     """
     DO NOT USE IN PROD, ONLY DEBUG.
     """
+
     def add_arguments(self, parser):
         parser.add_argument(
             "--confirm",
@@ -38,7 +39,9 @@ def handle(self, *args, **options):
         self.stdout.write("Starting manual migrations...")
         try:
             reverse()
-            self.stdout.write(self.style.SUCCESS("Manual migrations completed successfully."))
+            self.stdout.write(
+                self.style.SUCCESS("Manual migrations completed successfully.")
+            )
         except Exception as e:
             self.stderr.write(self.style.ERROR(f"Manual migrations failed: {str(e)}"))
 
@@ -50,4 +53,6 @@ def reverse():
         user.dataset_migration_applied = False
         user.v2_speciality = None
         user.save()
-    SkillToObject.objects.filter(content_type=ContentType.objects.get_for_model(CustomUser)).delete()
+    SkillToObject.objects.filter(
+        content_type=ContentType.objects.get_for_model(CustomUser)
+    ).delete()

core/serializers.py

@@ -29,7 +29,7 @@ class Meta:
 
 
 class SkillToObjectSerializer(serializers.ModelSerializer):
-    id = serializers.IntegerField(source="skill.id")
+    id = serializers.IntegerField(source="skill.id")  # noqa A003 VNE003
     name = serializers.CharField(source="skill.name")
     category = SkillCategorySerializer(source="skill.category")