fix(typing): Fix typing in 561 files (#98197)

Hackweek! This branch contains 1,349 type-error fixes and fully types
561 additional files. (That's 12% of all errors & 23% of untyped files.)

This differs from #98132 because it: 
* Updates `notifications.py` to allow for literal-`'None'` string
identifiers
* Adds a new test case to `test_notifications.py` to ensure literal
string `'None'`s are handled gracefully

These come in response to [an
issue](https://sentry.sentry.io/issues/6835281181/?project=1) we saw
where we were trying to cast `'None'` to int. Turns out that doesn't
work so hot! This PR contains a new commit with fixes.

We saw no other problems coming from this commit.

---------

Co-authored-by: Isabella Enriquez <isabella.enriquez@sentry.io>
Co-authored-by: Shayna Chambless <shayna.chambless@sentry.io>
Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>
Co-authored-by: Christinarlong <60594860+Christinarlong@users.noreply.github.com>

Author: 5 people

fixtures/integrations/jira/stub_client.py

@@ -44,7 +44,7 @@ def get_transitions(self, issue_key):
     def transition_issue(self, issue_key, transition_id):
         pass
 
-    def user_id_field(self):
+    def user_id_field(self) -> str:
         return "accountId"
 
     def get_user(self, user_id):

pyproject.toml

@@ -8,19 +8,20 @@
 
 from sentry.api.fields import AvatarField
 from sentry.api.serializers import serialize
+from sentry.db.models.base import Model
 from sentry.models.avatars.base import AvatarBase
 from sentry.models.avatars.control_base import ControlAvatarBase
 
 AvatarT = TypeVar("AvatarT", bound=AvatarBase)
 
 
-class AvatarSerializer(serializers.Serializer):
+class AvatarSerializer(serializers.Serializer[dict[str, Any]]):
     avatar_photo = AvatarField(required=False)
     avatar_type = serializers.ChoiceField(
         choices=(("upload", "upload"), ("gravatar", "gravatar"), ("letter_avatar", "letter_avatar"))
     )
 
-    def validate(self, attrs):
+    def validate(self, attrs: dict[str, Any]) -> dict[str, Any]:
         attrs = super().validate(attrs)
         if attrs.get("avatar_type") == "upload":
             model_type = self.context["type"]
@@ -46,7 +47,7 @@ def validate(self, attrs):
 
 class AvatarMixin(Generic[AvatarT]):
     object_type: ClassVar[str]
-    serializer_cls: ClassVar[type[serializers.Serializer]] = AvatarSerializer
+    serializer_cls: ClassVar[type[serializers.Serializer[dict[str, Any]]]] = AvatarSerializer
 
     @property
     def model(self) -> type[AvatarT]:
@@ -56,21 +57,25 @@ def get(self, request: Request, **kwargs: Any) -> Response:
         obj = kwargs.pop(self.object_type, None)
         return Response(serialize(obj, request.user, **kwargs))
 
-    def get_serializer_context(self, obj, **kwargs: Any):
+    def get_serializer_context(self, obj: Model, **kwargs: Any) -> dict[str, Any]:
         return {"type": self.model, "kwargs": {self.object_type: obj}}
 
-    def get_avatar_filename(self, obj):
+    def get_avatar_filename(self, obj: Model) -> str:
         return f"{obj.id}.png"
 
-    def parse(self, request: Request, **kwargs: Any) -> tuple[Any, serializers.Serializer]:
+    def parse(
+        self, request: Request, **kwargs: Any
+    ) -> tuple[Model, serializers.Serializer[dict[str, Any]]]:
         obj = kwargs.pop(self.object_type, None)
 
         serializer = self.serializer_cls(
             data=request.data, context=self.get_serializer_context(obj)
         )
         return (obj, serializer)
 
-    def save_avatar(self, obj: Any, serializer: serializers.Serializer, **kwargs: Any) -> AvatarT:
+    def save_avatar(
+        self, obj: Model, serializer: serializers.Serializer[dict[str, Any]], **kwargs: Any
+    ) -> AvatarT:
         result = serializer.validated_data
 
         return self.model.save_avatar(

src/sentry/api/bases/avatar.py

@@ -1,17 +1,21 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
 import sentry_sdk
+from django.db.models import QuerySet
 from rest_framework.permissions import SAFE_METHODS
 from rest_framework.request import Request
+from rest_framework.views import APIView
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.base import Endpoint
 from sentry.api.bases.project import ProjectPermission
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.demo_mode.utils import is_demo_mode_enabled, is_demo_user
 from sentry.integrations.tasks import create_comment, update_comment
+from sentry.models.activity import Activity
 from sentry.models.group import Group, GroupStatus, get_group_with_redirect
 from sentry.models.grouplink import GroupLink
 from sentry.models.organization import Organization
@@ -34,7 +38,8 @@ class GroupPermission(ProjectPermission):
         "DELETE": ["event:admin"],
     }
 
-    def has_object_permission(self, request: Request, view, group):
+    def has_object_permission(self, request: Request, view: APIView, group: Any) -> bool:
+        assert isinstance(group, Group)
         return super().has_object_permission(request, view, group.project)
 
 
@@ -43,8 +48,13 @@ class GroupEndpoint(Endpoint):
     permission_classes = (GroupPermission,)
 
     def convert_args(
-        self, request: Request, issue_id, organization_id_or_slug=None, *args, **kwargs
-    ):
+        self,
+        request: Request,
+        issue_id: str,
+        organization_id_or_slug: str | None = None,
+        *args: Any,
+        **kwargs: Any,
+    ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         # TODO(tkaemming): Ideally, this would return a 302 response, rather
         # than just returning the data that is bound to the new group. (It
         # technically shouldn't be a 301, since the response could change again
@@ -96,12 +106,12 @@ def convert_args(
 
         return (args, kwargs)
 
-    def get_external_issue_ids(self, group):
+    def get_external_issue_ids(self, group: Group) -> QuerySet[Any]:
         return GroupLink.objects.filter(
             project_id=group.project_id, group_id=group.id, linked_type=GroupLink.LinkedType.issue
         ).values_list("linked_id", flat=True)
 
-    def create_external_comment(self, request: Request, group, group_note):
+    def create_external_comment(self, request: Request, group: Group, group_note: Activity) -> None:
         for external_issue_id in self.get_external_issue_ids(group):
             create_comment.apply_async(
                 kwargs={
@@ -111,7 +121,7 @@ def create_external_comment(self, request: Request, group, group_note):
                 }
             )
 
-    def update_external_comment(self, request: Request, group, group_note):
+    def update_external_comment(self, request: Request, group: Group, group_note: Activity) -> None:
         for external_issue_id in self.get_external_issue_ids(group):
             update_comment.apply_async(
                 kwargs={
@@ -133,15 +143,16 @@ class GroupAiPermission(GroupPermission):
     # We want to allow POST requests in order to showcase AI features in demo mode
     ALLOWED_METHODS = tuple(list(SAFE_METHODS) + ["POST"])
 
-    def has_permission(self, request: Request, view) -> bool:
+    def has_permission(self, request: Request, view: APIView) -> bool:
         if is_demo_user(request.user):
             if not is_demo_mode_enabled() or request.method not in self.ALLOWED_METHODS:
                 return False
 
             return True
         return super().has_permission(request, view)
 
-    def has_object_permission(self, request: Request, view, group) -> bool:
+    def has_object_permission(self, request: Request, view: APIView, group: Any) -> bool:
+        assert isinstance(group, Group)
         if is_demo_user(request.user):
             if not is_demo_mode_enabled() or request.method not in self.ALLOWED_METHODS:
                 return False

src/sentry/api/bases/group.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.request import Request
 
@@ -24,7 +26,13 @@ class IncidentPermission(OrganizationPermission):
 
 
 class IncidentEndpoint(OrganizationEndpoint):
-    def convert_args(self, request: Request, incident_identifier, *args, **kwargs):
+    def convert_args(
+        self,
+        request: Request,
+        incident_identifier: str,
+        *args: Any,
+        **kwargs: Any,
+    ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         args, kwargs = super().convert_args(request, *args, **kwargs)
         organization = kwargs["organization"]
 

src/sentry/api/bases/incident.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 import itertools
-from collections.abc import Callable, Sequence
+from collections.abc import Callable, Iterable, Sequence
 from datetime import timedelta
 from typing import Any, cast
 from urllib.parse import quote as urlquote
 
 import sentry_sdk
+from django.contrib.auth.models import AnonymousUser
 from django.http.request import HttpRequest
 from django.utils import timezone
 from rest_framework.exceptions import ParseError, ValidationError
@@ -27,9 +28,9 @@
 from sentry.api.serializers.snuba import SnubaTSResultSerializer
 from sentry.api.utils import handle_query_errors
 from sentry.discover.arithmetic import is_equation, strip_equation
-from sentry.discover.models import DatasetSourcesTypes, DiscoverSavedQueryTypes
+from sentry.discover.models import DatasetSourcesTypes, DiscoverSavedQuery, DiscoverSavedQueryTypes
 from sentry.exceptions import InvalidSearchQuery
-from sentry.models.dashboard_widget import DashboardWidgetTypes
+from sentry.models.dashboard_widget import DashboardWidget, DashboardWidgetTypes
 from sentry.models.dashboard_widget import DatasetSourcesTypes as DashboardDatasetSourcesTypes
 from sentry.models.group import Group
 from sentry.models.organization import Organization
@@ -43,6 +44,7 @@
 from sentry.snuba.dataset import Dataset
 from sentry.snuba.metrics.extraction import MetricSpecType
 from sentry.snuba.utils import DATASET_LABELS, DATASET_OPTIONS, get_dataset
+from sentry.users.models.user import User
 from sentry.users.services.user.serial import serialize_generic_user
 from sentry.utils import snuba
 from sentry.utils.cursors import Cursor
@@ -51,7 +53,7 @@
 from sentry.utils.snuba import MAX_FIELDS, SnubaTSResult
 
 
-def get_query_columns(columns, rollup):
+def get_query_columns(columns: list[str], rollup: int) -> list[str]:
     """
     Backwards compatibility for incidents which uses the old
     column aliases as it straddles both versions of events/discover.
@@ -113,7 +115,7 @@ def get_teams(self, request: Request, organization: Organization) -> list[Team]:
         if not request.user:
             return []
 
-        teams = get_teams(request, organization)
+        teams: Iterable[Team] = get_teams(request, organization)
         if not teams:
             teams = Team.objects.get_for_user(organization, request.user)
 
@@ -249,7 +251,14 @@ def handle_on_demand(self, request: Request) -> tuple[bool, MetricSpecType]:
 
         return use_on_demand_metrics, on_demand_metric_type
 
-    def save_split_decision(self, widget, has_errors, has_transactions_data, organization, user):
+    def save_split_decision(
+        self,
+        widget: DashboardWidget,
+        has_errors: bool,
+        has_transactions_data: bool,
+        organization: Organization,
+        user: User | AnonymousUser,
+    ) -> int | None:
         """This can be removed once the discover dataset has been fully split"""
         source = DashboardDatasetSourcesTypes.INFERRED.value
         if has_errors and not has_transactions_data:
@@ -273,15 +282,19 @@ def save_split_decision(self, widget, has_errors, has_transactions_data, organiz
         return decision
 
     def save_discover_saved_query_split_decision(
-        self, query, dataset_inferred_from_query, has_errors, has_transactions_data
-    ):
+        self,
+        query: DiscoverSavedQuery,
+        dataset_inferred_from_query: int | None,
+        has_errors: bool,
+        has_transactions_data: bool,
+    ) -> int | None:
         """
         This can be removed once the discover dataset has been fully split.
         If dataset is ambiguous (i.e., could be either transactions or errors),
         default to errors.
         """
         dataset_source = DatasetSourcesTypes.INFERRED.value
-        if dataset_inferred_from_query:
+        if dataset_inferred_from_query is not None:
             decision = dataset_inferred_from_query
             sentry_sdk.set_tag("discover.split_reason", "inferred_from_query")
         elif has_errors and not has_transactions_data:
@@ -314,7 +327,7 @@ def handle_unit_meta(
             units[key], meta[key] = self.get_unit_and_type(key, value)
         return meta, units
 
-    def get_unit_and_type(self, field, field_type):
+    def get_unit_and_type(self, field: str, field_type: str) -> tuple[str | None, str]:
         if field_type in SIZE_UNITS:
             return field_type, "size"
         elif field_type in DURATION_UNITS:
@@ -427,7 +440,7 @@ def handle_data(
 
         return results
 
-    def handle_error_upsampling(self, project_ids: Sequence[int], results: dict[str, Any]):
+    def handle_error_upsampling(self, project_ids: Sequence[int], results: dict[str, Any]) -> None:
         """
         If the query is for error upsampled projects, we convert various functions under the hood.
         We need to rename these fields before returning the results to the client, to hide the conversion.
@@ -704,7 +717,9 @@ def serialize_multiple_axis(
 
         return result
 
-    def update_meta_with_accuracy(self, meta, event_result, query_column) -> None:
+    def update_meta_with_accuracy(
+        self, meta: dict[str, Any], event_result: SnubaTSResult, query_column: str
+    ) -> None:
         if "processed_timeseries" in event_result.data:
             processed_timeseries = event_result.data["processed_timeseries"]
             meta["accuracy"] = {
@@ -724,7 +739,7 @@ def serialize_accuracy_data(
         data: Any,
         column: str,
         null_zero: bool = False,
-    ):
+    ) -> list[dict[str, Any]]:
         serialized_values = []
         for timestamp, group in itertools.groupby(data, key=lambda r: r["time"]):
             for row in group:

src/sentry/api/bases/organization_events.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import Any
+
 from rest_framework.request import Request
 
 from sentry import features
@@ -22,7 +24,9 @@ def feature_flags(self) -> list[str]:
             "Requires set 'feature_flags' property to restrict this endpoint."
         )
 
-    def convert_args(self, request: Request, *args, **kwargs):
+    def convert_args(
+        self, request: Request, *args: Any, **kwargs: Any
+    ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         parsed_args, parsed_kwargs = super().convert_args(request, *args, **kwargs)
         organization = parsed_kwargs.get("organization")
         feature_gate = [

src/sentry/api/bases/organization_flag.py

@@ -60,18 +60,18 @@ class MemberIdField(serializers.IntegerField):
     Allow "me" in addition to integers
     """
 
-    def to_internal_value(self, data):
+    def to_internal_value(self, data: float | int | str) -> Any:
         if data == "me":
             return data
         return super().to_internal_value(data)
 
-    def run_validation(self, data=empty):
+    def run_validation(self, data: object | None = empty) -> object | None:
         if data == "me":
             return data
         return super().run_validation(data)
 
 
-class MemberSerializer(serializers.Serializer):
+class MemberSerializer(serializers.Serializer[dict[str, int | Literal["me"]]]):
     id = MemberIdField(min_value=0, max_value=BoundedAutoField.MAX_VALUE, required=True)
 
 

src/sentry/api/bases/organizationmember.py

@@ -121,9 +121,9 @@ class ProjectEndpoint(Endpoint):
     def convert_args(
         self,
         request: Request,
-        *args,
-        **kwargs,
-    ):
+        *args: Any,
+        **kwargs: Any,
+    ) -> tuple[tuple[Any, ...], dict[str, Any]]:
         if args and args[0] is not None:
             organization_id_or_slug: int | str = args[0]
             # Required so it behaves like the original convert_args, where organization_id_or_slug was another parameter
@@ -193,7 +193,9 @@ def convert_args(
         kwargs["project"] = project
         return (args, kwargs)
 
-    def get_filter_params(self, request: Request, project, date_filter_optional=False):
+    def get_filter_params(
+        self, request: Request, project: Project, date_filter_optional: bool = False
+    ) -> dict[str, Any]:
         """Similar to the version on the organization just for a single project."""
         # get the top level params -- projects, time range, and environment
         # from the request
@@ -203,7 +205,7 @@ def get_filter_params(self, request: Request, project, date_filter_optional=Fals
             raise ProjectEventsError(str(e))
 
         environments = [env.name for env in get_environments(request, project.organization)]
-        params = {"start": start, "end": end, "project_id": [project.id]}
+        params: dict[str, Any] = {"start": start, "end": end, "project_id": [project.id]}
         if environments:
             params["environment"] = environments