ci: Use Mypy directly (#5119)

Author: khvn26

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
       - id: python-typecheck
         name: python-typecheck
         language: system
-        entry: poetry -C api run python scripts/typecheck.py
+        entry: poetry -C api run mypy .
         require_serial: true
         pass_filenames: false
         types: [python]
@@ -52,5 +52,5 @@ repos:
         args: ["-C", "api"]
 
 ci:
-  skip: [python-typecheck]
+  skip: [python-typecheck, isort]
   autoupdate_commit_msg: "ci: pre-commit autoupdate"

api/Makefile

@@ -45,7 +45,7 @@ lint:
 
 .PHONY: typecheck
 typecheck:
-	poetry run python scripts/typecheck.py $(opts)
+	poetry run mypy .
 
 .PHONY: docker-up
 docker-up:

api/api/migrations/0001_initial.py

@@ -22,7 +22,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=2000)),
-                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),  # type: ignore[arg-type]  # noqa: E501
                 ('api_key', models.UUIDField(default=uuid.uuid4)),
             ],
         ),
@@ -31,7 +31,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=2000)),
-                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),  # type: ignore[arg-type]  # noqa: E501
             ],
         ),
         migrations.CreateModel(
@@ -54,7 +54,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('identifier', models.CharField(max_length=2000)),
-                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),  # type: ignore[arg-type]  # noqa: E501
                 ('version', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='identities', to='api.Environment')),
             ],
             options={
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(max_length=2000)),
-                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),
+                ('created_date', models.DateTimeField(auto_now_add=True, verbose_name=b'DateCreated')),  # type: ignore[arg-type]  # noqa: E501
                 ('organisation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='projects', to='api.Organisation')),
             ],
         ),

api/api/openapi.py

@@ -1,8 +1,8 @@
 import inspect
 from typing import Any
 
-from drf_yasg.inspectors import SwaggerAutoSchema
-from drf_yasg.openapi import SCHEMA_DEFINITIONS, Response, Schema
+from drf_yasg.inspectors import SwaggerAutoSchema  # type: ignore[import-untyped]
+from drf_yasg.openapi import SCHEMA_DEFINITIONS, Response, Schema  # type: ignore[import-untyped]
 from pydantic import BaseModel
 from pydantic.json_schema import GenerateJsonSchema, JsonSchemaValue
 from pydantic_core import core_schema
@@ -30,10 +30,10 @@ def nullable_schema(self, schema: core_schema.NullableSchema) -> JsonSchemaValue
         if type := elem.get("type"):
             return {"type": type, "x-nullable": True}
         # Assuming a reference here (which we can not annotate)
-        return elem
+        return elem  # type: ignore[no-any-return]
 
 
-class PydanticResponseCapableSwaggerAutoSchema(SwaggerAutoSchema):
+class PydanticResponseCapableSwaggerAutoSchema(SwaggerAutoSchema):  # type: ignore[misc]
     """
     A `SwaggerAutoSchema` subclass that allows to generate view response Swagger docs
     from a Pydantic model.

api/api/serializers.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
 
 
-class ErrorSerializer(serializers.Serializer):
+class ErrorSerializer(serializers.Serializer):  # type: ignore[type-arg]
     message = serializers.CharField()

api/api/urls/v1.py

@@ -1,8 +1,8 @@
 from app_analytics.views import SDKAnalyticsFlags, SelfHostedTelemetryAPIView
 from django.conf import settings
 from django.urls import include, path, re_path
-from drf_yasg import openapi
-from drf_yasg.views import get_schema_view
+from drf_yasg import openapi  # type: ignore[import-untyped]
+from drf_yasg.views import get_schema_view  # type: ignore[import-untyped]
 from rest_framework import authentication, permissions, routers
 
 from environments.identities.traits.views import SDKTraits
@@ -82,7 +82,7 @@
 ]
 
 if settings.SPLIT_TESTING_INSTALLED:
-    from split_testing.views import (
+    from split_testing.views import (  # type: ignore[import-not-found]
         ConversionEventTypeView,
         CreateConversionEventView,
         SplitTestViewSet,

api/api_keys/authentication.py

@@ -10,14 +10,14 @@
 
 
 class MasterAPIKeyAuthentication(authentication.BaseAuthentication):
-    def authenticate(self, request):
+    def authenticate(self, request):  # type: ignore[no-untyped-def]
         key = key_parser.get(request)
         if not key:
             return None
 
         with suppress(MasterAPIKey.DoesNotExist):
-            key = MasterAPIKey.objects.get_from_key(key)
-            if not key.has_expired:
-                return APIKeyUser(key), None
+            key = MasterAPIKey.objects.get_from_key(key)  # type: ignore[assignment]
+            if not key.has_expired:  # type: ignore[attr-defined]
+                return APIKeyUser(key), None  # type: ignore[arg-type]
 
         raise exceptions.AuthenticationFailed("Valid Master API Key not found.")

api/api_keys/models.py

@@ -1,31 +1,31 @@
 from django.conf import settings
 from django.db import models
-from django_lifecycle import BEFORE_UPDATE, LifecycleModelMixin, hook
+from django_lifecycle import BEFORE_UPDATE, LifecycleModelMixin, hook  # type: ignore[import-untyped]
 from rest_framework_api_key.models import AbstractAPIKey, APIKeyManager
-from softdelete.models import SoftDeleteManager, SoftDeleteObject
+from softdelete.models import SoftDeleteManager, SoftDeleteObject  # type: ignore[import-untyped]
 
 from organisations.models import Organisation
 
 
-class MasterAPIKeyManager(APIKeyManager, SoftDeleteManager):
+class MasterAPIKeyManager(APIKeyManager, SoftDeleteManager):  # type: ignore[misc]
     pass
 
 
-class MasterAPIKey(AbstractAPIKey, LifecycleModelMixin, SoftDeleteObject):
+class MasterAPIKey(AbstractAPIKey, LifecycleModelMixin, SoftDeleteObject):  # type: ignore[django-manager-missing,misc]  # noqa: E501  # noqa: E501
     organisation = models.ForeignKey(
         Organisation,
         on_delete=models.CASCADE,
         related_name="master_api_keys",
     )
 
-    objects = MasterAPIKeyManager()
+    objects = MasterAPIKeyManager()  # type: ignore[misc]
     is_admin = models.BooleanField(default=True)
 
     @hook(BEFORE_UPDATE, when="is_admin", was=False, is_now=True)
-    def delete_role_api_keys(
+    def delete_role_api_keys(  # type: ignore[no-untyped-def]
         self,
     ):
         if settings.IS_RBAC_INSTALLED:
-            from rbac.models import MasterAPIKeyRole
+            from rbac.models import MasterAPIKeyRole  # type: ignore[import-not-found]
 
             MasterAPIKeyRole.objects.filter(master_api_key=self.id).delete()

api/api_keys/serializers.py

@@ -4,7 +4,7 @@
 from .models import MasterAPIKey
 
 
-class MasterAPIKeySerializer(serializers.ModelSerializer):
+class MasterAPIKeySerializer(serializers.ModelSerializer):  # type: ignore[type-arg]
     key = serializers.CharField(
         read_only=True,
         help_text="Since we don't store the api key itself(i.e: we only store the hash) this key will be none "
@@ -27,12 +27,12 @@ class Meta:
         )
         read_only_fields = ("prefix", "created", "key")
 
-    def create(self, validated_data):
+    def create(self, validated_data):  # type: ignore[no-untyped-def]
         obj, key = MasterAPIKey.objects.create_key(**validated_data)
-        obj.key = key
+        obj.key = key  # type: ignore[attr-defined]
         return obj
 
-    def validate_is_admin(self, is_admin: bool):
+    def validate_is_admin(self, is_admin: bool):  # type: ignore[no-untyped-def]
         if is_admin is False and not settings.IS_RBAC_INSTALLED:
             raise serializers.ValidationError(
                 "RBAC is not installed, cannot create non-admin key"

api/api_keys/user.py

@@ -40,7 +40,7 @@ def is_master_api_key_user(self) -> bool:
 
     @property
     def organisations(self) -> QuerySet[Organisation]:
-        return Organisation.objects.filter(id=self.key.organisation_id)
+        return Organisation.objects.filter(id=self.key.organisation_id)  # type: ignore[no-any-return]
 
     def belongs_to(self, organisation_id: int) -> bool:
         return self.key.organisation_id == organisation_id
@@ -73,15 +73,15 @@ def is_group_admin(self, group_id: int) -> bool:
         return False
 
     def has_project_permission(
-        self, permission: str, project: "Project", tag_ids: typing.List[int] = None
+        self, permission: str, project: "Project", tag_ids: typing.List[int] = None  # type: ignore[assignment]
     ) -> bool:
         return project in self.get_permitted_projects(permission, tag_ids)
 
     def has_environment_permission(
         self,
         permission: str,
         environment: "Environment",
-        tag_ids: typing.List[int] = None,
+        tag_ids: typing.List[int] = None,  # type: ignore[assignment]
     ) -> bool:
         return environment in self.get_permitted_environments(
             permission, environment.project, tag_ids
@@ -95,7 +95,7 @@ def has_organisation_permission(
         )
 
     def get_permitted_projects(
-        self, permission_key: str, tag_ids: typing.List[int] = None
+        self, permission_key: str, tag_ids: typing.List[int] = None  # type: ignore[assignment]
     ) -> QuerySet["Project"]:
         return get_permitted_projects_for_master_api_key(
             self.key, permission_key, tag_ids
@@ -105,7 +105,7 @@ def get_permitted_environments(
         self,
         permission_key: str,
         project: "Project",
-        tag_ids: typing.List[int] = None,
+        tag_ids: typing.List[int] = None,  # type: ignore[assignment]
         prefetch_metadata: bool = False,
     ) -> QuerySet["Environment"]:
         return get_permitted_environments_for_master_api_key(