ref: fix more mypy issues (#54470)

<!-- Describe your PR here. -->

Author: asottile-sentry

pyproject.toml

@@ -241,7 +241,6 @@ module = [
     "sentry.api.endpoints.organization_member.details",
     "sentry.api.endpoints.organization_member.index",
     "sentry.api.endpoints.organization_member.requests.invite.details",
-    "sentry.api.endpoints.organization_member.requests.invite.index",
     "sentry.api.endpoints.organization_member.requests.join",
     "sentry.api.endpoints.organization_member_unreleased_commits",
     "sentry.api.endpoints.organization_metrics",
@@ -901,7 +900,6 @@ module = [
     "tests.sentry.api.test_event_search",
     "tests.sentry.api.test_invite_helper",
     "tests.sentry.api.test_issue_search",
-    "tests.sentry.auth.test_access",
     "tests.sentry.digests.test_notifications",
     "tests.sentry.eventstore.test_base",
     "tests.sentry.grouping.test_result",
@@ -1001,51 +999,9 @@ module = [
     "tests.sentry.mail.test_actions",
     "tests.sentry.manager.test_group_manager",
     "tests.sentry.manager.test_team_manager",
-    "tests.sentry.mediators.external_issues.test_creator",
-    "tests.sentry.mediators.external_issues.test_issue_link_creator",
-    "tests.sentry.mediators.external_requests.test_alert_rule_action_requester",
-    "tests.sentry.mediators.external_requests.test_issue_link_requester",
-    "tests.sentry.mediators.external_requests.test_select_requester",
-    "tests.sentry.mediators.project_rules.test_creator",
-    "tests.sentry.mediators.project_rules.test_updater",
-    "tests.sentry.mediators.sentry_app_installations.test_installation_notifier",
-    "tests.sentry.mediators.token_exchange.test_grant_exchanger",
-    "tests.sentry.mediators.token_exchange.test_refresher",
-    "tests.sentry.mediators.token_exchange.test_validator",
-    "tests.sentry.middleware.integrations.parsers.test_slack",
-    "tests.sentry.middleware.test_auth",
-    "tests.sentry.middleware.test_proxy",
-    "tests.sentry.middleware.test_ratelimit_middleware",
-    "tests.sentry.middleware.test_stats",
-    "tests.sentry.middleware.test_subdomain",
-    "tests.sentry.models.test_notificationaction",
-    "tests.sentry.models.test_organization",
     "tests.sentry.models.test_organizationmember",
     "tests.sentry.models.test_project",
-    "tests.sentry.monitors.endpoints.test_monitor_ingest_checkin_details",
-    "tests.sentry.monitors.test_models",
-    "tests.sentry.nodestore.bigtable.test_backend",
-    "tests.sentry.notifications.notifications.organization_request.test_integration_request",
-    "tests.sentry.notifications.notifications.test_digests",
-    "tests.sentry.notifications.test_utils",
-    "tests.sentry.notifications.utils.test_tasks",
-    "tests.sentry.options.test_store",
-    "tests.sentry.pipeline.test_pipeline",
-    "tests.sentry.plugins.bases.test_issue2",
-    "tests.sentry.processing.realtime_metrics.test_redis",
-    "tests.sentry.profiles.consumers.test_process",
-    "tests.sentry.profiles.test_task",
-    "tests.sentry.ratelimits.test_cardinality",
-    "tests.sentry.ratelimits.test_config",
-    "tests.sentry.ratelimits.test_redis",
-    "tests.sentry.ratelimits.utils.test_get_rate_limit_value",
-    "tests.sentry.ratelimits.utils.test_get_ratelimit_key",
-    "tests.sentry.receivers.test_onboarding",
-    "tests.sentry.relay.test_config",
-    "tests.sentry.relay.test_projectconfig_cache",
     "tests.sentry.release_health.release_monitor",
-    "tests.sentry.release_health.release_monitor.test_metrics",
-    "tests.sentry.release_health.release_monitor.test_sessions",
     "tests.sentry.release_health.test_tasks",
     "tests.sentry.replays.consumers.test_recording",
     "tests.sentry.replays.test_project_replay_recording_segment_details",

src/sentry/api/invite_helper.py

@@ -4,8 +4,8 @@
 from logging import Logger
 from typing import Dict, Optional
 
+from django.http.request import HttpRequest
 from django.utils.crypto import constant_time_compare
-from rest_framework.request import Request
 
 from sentry import audit_log, features
 from sentry.models import AuthIdentity, AuthProvider, User, UserEmail
@@ -20,15 +20,15 @@
 
 
 def add_invite_details_to_session(
-    request: Request, member_id: int, token: str, organization_id: int
+    request: HttpRequest, member_id: int, token: str, organization_id: int
 ) -> None:
     """Add member ID and token to the request session"""
     request.session["invite_token"] = token
     request.session["invite_member_id"] = member_id
     request.session["invite_organization_id"] = organization_id
 
 
-def remove_invite_details_from_session(request: Request) -> None:
+def remove_invite_details_from_session(request: HttpRequest) -> None:
     """Deletes invite details from the request session"""
     request.session.pop("invite_member_id", None)
     request.session.pop("invite_token", None)
@@ -42,7 +42,7 @@ class InviteDetails:
     invite_organization_id: Optional[int]
 
 
-def get_invite_details(request: Request) -> InviteDetails:
+def get_invite_details(request: HttpRequest) -> InviteDetails:
     """Returns tuple of (token, member_id) from request session"""
     return InviteDetails(
         invite_token=request.session.get("invite_token", None),
@@ -55,7 +55,7 @@ class ApiInviteHelper:
     @classmethod
     def from_session_or_email(
         cls,
-        request: Request,
+        request: HttpRequest,
         organization_id: int,
         email: str,
         logger: Logger | None = None,
@@ -99,7 +99,7 @@ def from_session_or_email(
     @classmethod
     def from_session(
         cls,
-        request: Request,
+        request: HttpRequest,
         logger: Logger | None = None,
     ) -> ApiInviteHelper | None:
         invite_details = get_invite_details(request)
@@ -128,7 +128,7 @@ def from_session(
 
     def __init__(
         self,
-        request: Request,
+        request: HttpRequest,
         invite_context: RpcUserInviteContext,
         token: str | None,
         logger: Logger | None = None,

src/sentry/mediators/param.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Callable, Generic, TypeVar, overload
+from typing import TYPE_CHECKING, Callable, Generic, Literal, TypeVar, overload
 
 from typing_extensions import Self
 
@@ -77,6 +77,26 @@ class Param(Generic[T]):
         >>>     name = Param(str, default=lambda self: self.user['name'])
     """
 
+    @overload
+    def __init__(
+        self: Param[T | None],
+        type: type[T],
+        *,
+        required: Literal[False],
+        default: T | Callable[..., T] | None = None,
+    ) -> None:
+        ...
+
+    @overload
+    def __init__(
+        self: Param[T],
+        type: type[T],
+        *,
+        required: bool = ...,
+        default: T | Callable[..., T] | None = None,
+    ) -> None:
+        ...
+
     def __init__(
         self,
         type: type[T],

src/sentry/mediators/project_rules/updater.py

@@ -9,7 +9,7 @@
 class Updater(Mediator):
     rule = Param(Rule)
     name = Param(str, required=False)
-    owner = Param(Actor, required=False)
+    owner = Param(int, required=False)
     environment = Param(int, required=False)
     project = Param(Project)
     action_match = Param(str, required=False)
@@ -33,11 +33,11 @@ def call(self):
         self.rule.save()
         return self.rule
 
-    @if_param("name")
     def _update_name(self):
-        self.rule.label = self.name
+        if self.name:
+            self.rule.label = self.name
 
-    def _update_owner(self):
+    def _update_owner(self) -> None:
         self.rule.owner = Actor.objects.get(id=self.owner) if self.owner else None
 
     def _update_environment(self):

src/sentry/middleware/auth.py

@@ -4,11 +4,12 @@
 
 from django.contrib.auth import get_user as auth_get_user
 from django.contrib.auth.models import AnonymousUser
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 from django.utils.deprecation import MiddlewareMixin
 from django.utils.functional import SimpleLazyObject
 from rest_framework.authentication import get_authorization_header
 from rest_framework.exceptions import AuthenticationFailed
-from rest_framework.request import Request
 
 from sentry.api.authentication import (
     ApiKeyAuthentication,
@@ -57,7 +58,7 @@ def impl(self) -> Any:
             return RequestAuthenticationMiddleware(self.get_response)
         return HybridCloudAuthenticationMiddleware(self.get_response)
 
-    def process_request(self, request: Request):
+    def process_request(self, request: HttpRequest) -> None:
         if request.path.startswith("/api/0/internal/rpc/"):
             # Avoid doing RPC authentication when we're already
             # in an RPC request.
@@ -66,12 +67,14 @@ def process_request(self, request: Request):
 
         return self.impl.process_request(request)
 
-    def process_exception(self, request: Request, exception):
+    def process_exception(
+        self, request: HttpRequest, exception: Exception
+    ) -> HttpResponseBase | None:
         return self.impl.process_exception(request, exception)
 
 
 class RequestAuthenticationMiddleware(MiddlewareMixin):
-    def process_request(self, request: Request):
+    def process_request(self, request: HttpRequest) -> None:
         request.user_from_signed_request = False
 
         # If there is a valid signature on the request we override the
@@ -107,15 +110,19 @@ def process_request(self, request: Request):
         # default to anonymous user and use IP ratelimit
         request.user = SimpleLazyObject(lambda: get_user(request))
 
-    def process_exception(self, request: Request, exception):
+    def process_exception(
+        self, request: HttpRequest, exception: Exception
+    ) -> HttpResponseBase | None:
         if isinstance(exception, AuthUserPasswordExpired):
             from sentry.web.frontend.accounts import expired
 
             return expired(request, exception.user)
+        else:
+            return None
 
 
 class HybridCloudAuthenticationMiddleware(MiddlewareMixin):
-    def process_request(self, request: Request):
+    def process_request(self, request: HttpRequest) -> None:
         from sentry.web.frontend.accounts import expired
 
         auth_result = auth_service.authenticate(request=authentication_request_from(request))
@@ -135,5 +142,7 @@ def process_request(self, request: Request):
         else:
             request.user = AnonymousUser()
 
-    def process_exception(self, request: Request, exception: Exception):
+    def process_exception(
+        self, request: HttpRequest, exception: Exception
+    ) -> HttpResponseBase | None:
         pass

src/sentry/middleware/proxy.py

@@ -1,16 +1,18 @@
+from typing import Any
+
 from django.conf import settings
 from django.core.exceptions import MiddlewareNotUsed
+from django.http.request import HttpRequest
 from django.utils.deprecation import MiddlewareMixin
-from rest_framework.request import Request
 
 
 class SetRemoteAddrFromForwardedFor(MiddlewareMixin):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
         if not getattr(settings, "SENTRY_USE_X_FORWARDED_FOR", True):
             raise MiddlewareNotUsed
         super().__init__(*args, **kwargs)
 
-    def _remove_port_number(self, ip_address):
+    def _remove_port_number(self, ip_address: str) -> str:
         if "[" in ip_address and "]" in ip_address:
             # IPv6 address with brackets, possibly with a port number
             return ip_address[ip_address.find("[") + 1 : ip_address.find("]")]
@@ -20,7 +22,7 @@ def _remove_port_number(self, ip_address):
             return ip_address.rsplit(":", 1)[0]
         return ip_address
 
-    def process_request(self, request: Request):
+    def process_request(self, request: HttpRequest) -> None:
         try:
             real_ip = request.META["HTTP_X_FORWARDED_FOR"]
         except KeyError:

src/sentry/middleware/ratelimit.py

@@ -5,9 +5,8 @@
 from typing import Callable
 
 from django.conf import settings
-from django.http.response import HttpResponse
-from rest_framework.request import Request
-from rest_framework.response import Response
+from django.http.request import HttpRequest
+from django.http.response import HttpResponse, HttpResponseBase
 
 from sentry.ratelimits import (
     above_rate_limit_check,
@@ -32,16 +31,18 @@ class RatelimitMiddleware:
     See: https://docs.djangoproject.com/en/4.0/topics/http/middleware/#writing-your-own-middleware
     """
 
-    def __init__(self, get_response: Callable[[Request], Response]):
+    def __init__(self, get_response: Callable[[HttpRequest], HttpResponseBase]):
         self.get_response = get_response
 
-    def __call__(self, request: Request) -> Response:
+    def __call__(self, request: HttpRequest) -> HttpResponseBase:
         # process_view is automatically called by Django
         response = self.get_response(request)
         self.process_response(request, response)
         return response
 
-    def process_view(self, request: Request, view_func, view_args, view_kwargs) -> Response | None:
+    def process_view(
+        self, request: HttpRequest, view_func, view_args, view_kwargs
+    ) -> HttpResponseBase | None:
         """Check if the endpoint call will violate."""
 
         with metrics.timer("middleware.ratelimit.process_view"):
@@ -116,7 +117,9 @@ def process_view(self, request: Request, view_func, view_args, view_kwargs) -> R
                 )
         return None
 
-    def process_response(self, request: Request, response: Response) -> Response:
+    def process_response(
+        self, request: HttpRequest, response: HttpResponseBase
+    ) -> HttpResponseBase:
         with metrics.timer("middleware.ratelimit.process_response"):
             try:
                 rate_limit_metadata: RateLimitMeta | None = getattr(

src/sentry/middleware/subdomain.py

@@ -4,8 +4,8 @@
 
 from django.core.exceptions import DisallowedHost
 from django.http import HttpResponseRedirect
-from rest_framework.request import Request
-from rest_framework.response import Response
+from django.http.request import HttpRequest
+from django.http.response import HttpResponseBase
 
 from sentry import options
 
@@ -18,15 +18,15 @@ class SubdomainMiddleware:
     If no subdomain is extracted, then request.subdomain is None.
     """
 
-    def __init__(self, get_response: Callable[[Request], Response]):
+    def __init__(self, get_response: Callable[[HttpRequest], HttpResponseBase]):
         self.base_hostname = options.get("system.base-hostname")
 
         if self.base_hostname:
             self.base_hostname = self.base_hostname.rstrip("/")
 
         self.get_response = get_response
 
-    def __call__(self, request: Request) -> Response:
+    def __call__(self, request: HttpRequest) -> HttpResponseBase:
         request.subdomain = None
 
         if not self.base_hostname:

src/sentry/monitors/models.py

@@ -248,7 +248,7 @@ class Monitor(Model):
         default=MonitorType.UNKNOWN,
         choices=[(k, str(v)) for k, v in MonitorType.as_choices()],
     )
-    config = JSONField(default=dict)
+    config: models.Field[dict[str, Any], dict[str, Any]] = JSONField(default=dict)
     date_added = models.DateTimeField(default=timezone.now)
 
     class Meta:

src/sentry/notifications/notifications/base.py

@@ -203,7 +203,7 @@ def get_settings_url(self, recipient: RpcActor, provider: ExternalProviders) ->
             )
         )
 
-    def determine_recipients(self) -> Iterable[RpcActor]:
+    def determine_recipients(self) -> list[RpcActor]:
         raise NotImplementedError
 
     def get_notification_providers(self) -> Iterable[ExternalProviders]:

src/sentry/notifications/notifications/codeowners_auto_sync.py

@@ -16,7 +16,7 @@ class AutoSyncNotification(ProjectNotification):
     notification_setting_type = NotificationSettingTypes.DEPLOY
     template_path = "sentry/emails/codeowners-auto-sync-failure"
 
-    def determine_recipients(self) -> Iterable[RpcActor]:
+    def determine_recipients(self) -> list[RpcActor]:
         return RpcActor.many_from_object(self.organization.get_owners())
 
     @property