fix(typing): Fix type errors (#56802)

Fixing a few type errors while I was poking around the mypy typeignore
list.

Related #55193

pyproject.toml

@@ -507,7 +507,6 @@ module = [
     "sentry.integrations.vsts.issues",
     "sentry.integrations.vsts.repository",
     "sentry.integrations.vsts_extension.integration",
-    "sentry.issues.escalating",
     "sentry.issues.escalating_group_forecast",
     "sentry.issues.ingest",
     "sentry.issues.issue_occurrence",
@@ -668,7 +667,6 @@ module = [
     "sentry.tagstore.snuba.backend",
     "sentry.tagstore.types",
     "sentry.tasks.auth",
-    "sentry.tasks.auto_resolve_issues",
     "sentry.tasks.base",
     "sentry.tasks.beacon",
     "sentry.tasks.check_auth",
@@ -676,7 +674,6 @@ module = [
     "sentry.tasks.commit_context",
     "sentry.tasks.commits",
     "sentry.tasks.deliver_from_outbox",
-    "sentry.tasks.derive_code_mappings",
     "sentry.tasks.digests",
     "sentry.tasks.groupowner",
     "sentry.tasks.integrations",

src/sentry/issues/escalating.py

@@ -1,10 +1,12 @@
 """This module has the logic for querying Snuba for the hourly event count for a list of groups.
 This is later used for generating group forecasts for determining when a group may be escalating.
 """
+from __future__ import annotations
+
 import logging
 from collections import defaultdict
 from datetime import datetime, timedelta
-from typing import Any, Dict, List, Mapping, Optional, Sequence, Tuple, TypedDict
+from typing import Any, Dict, List, Mapping, Sequence, Tuple, TypedDict
 
 import jsonschema
 from django.db.models.signals import post_save
@@ -103,7 +105,7 @@ def _process_groups(
     groups: Sequence[Group],
     start_date: datetime,
     end_date: datetime,
-    category: Optional[GroupCategory] = None,
+    category: GroupCategory | None = None,
 ) -> List[GroupsCountResponse]:
     """Given a list of groups, query Snuba for their hourly bucket count.
     The category defines which Snuba dataset and entity we query."""
@@ -150,7 +152,7 @@ def _query_with_pagination(
     group_ids: Sequence[int],
     start_date: datetime,
     end_date: datetime,
-    category: Optional[GroupCategory],
+    category: GroupCategory | None = None,
 ) -> List[GroupsCountResponse]:
     """Query Snuba for event counts for the given list of project ids and groups ids in
     a time range."""
@@ -179,7 +181,7 @@ def _generate_query(
     offset: int,
     start_date: datetime,
     end_date: datetime,
-    category: Optional[GroupCategory],
+    category: GroupCategory | None = None,
 ) -> Query:
     """This simply generates a query based on the passed parameters"""
     group_id_col = Column("group_id")
@@ -260,7 +262,7 @@ def get_group_hourly_count(group: Group) -> int:
     return int(hourly_count)
 
 
-def is_escalating(group: Group) -> Tuple[bool, Optional[int]]:
+def is_escalating(group: Group) -> Tuple[bool, int | None]:
     """
     Return whether the group is escalating and the daily forecast if it exists.
     """
@@ -294,11 +296,11 @@ def parse_groups_past_counts(response: Sequence[GroupsCountResponse]) -> ParsedG
     return group_counts
 
 
-def _issue_category_dataset(category: Optional[GroupCategory]) -> Dataset:
+def _issue_category_dataset(category: GroupCategory | None = None) -> Dataset | str:
     return Dataset.Events.value if category == GroupCategory.ERROR else Dataset.IssuePlatform.value
 
 
-def _issue_category_entity(category: Optional[GroupCategory]) -> EntityKey:
+def _issue_category_entity(category: GroupCategory | None = None) -> EntityKey | str:
     return (
         EntityKey.Events.value if category == GroupCategory.ERROR else EntityKey.IssuePlatform.value
     )
@@ -307,16 +309,18 @@ def _issue_category_entity(category: Optional[GroupCategory]) -> EntityKey:
 def manage_issue_states(
     group: Group,
     group_inbox_reason: GroupInboxReason,
-    event: Optional[GroupEvent] = None,
-    snooze_details: Optional[Mapping[str, Any]] = None,
-    activity_data: Optional[Mapping[str, Any]] = None,
+    event: GroupEvent | None = None,
+    snooze_details: Mapping[str, Any] | None = None,
+    activity_data: Mapping[str, Any] | None = None,
 ) -> None:
     """
     Handles the downstream changes to the status/substatus of GroupInbox and Group for each GroupInboxReason
 
     `activity_data`: Additional activity data, such as escalating forecast
     """
-    data = {"event_id": event.event_id} if event else None
+    data: dict[str, str | Mapping[str, Any]] | None = (
+        {"event_id": event.event_id} if event else None
+    )
     if group_inbox_reason == GroupInboxReason.ESCALATING:
         updated = Group.objects.filter(id=group.id, status=GroupStatus.IGNORED).update(
             status=GroupStatus.UNRESOLVED, substatus=GroupSubStatus.ESCALATING

src/sentry/tasks/auto_resolve_issues.py

@@ -1,6 +1,7 @@
 from collections import defaultdict
 from datetime import datetime, timedelta
 from time import time
+from typing import Mapping
 
 from django.utils import timezone
 
@@ -36,7 +37,7 @@ def schedule_auto_resolution():
     options = ProjectOption.objects.filter(
         key__in=["sentry:resolve_age", "sentry:_last_auto_resolve"]
     )
-    opts_by_project = defaultdict(dict)
+    opts_by_project: Mapping[int, dict] = defaultdict(dict)
     for opt in options:
         opts_by_project[opt.project_id][opt.key] = opt.value
 

src/sentry/tasks/derive_code_mappings.py

@@ -11,7 +11,6 @@ from sentry.db.models.fields.node import NodeData
 from sentry.integrations.utils.code_mapping import CodeMapping, CodeMappingTreesHelper
 from sentry.locks import locks
 from sentry.models import Project
-from sentry.models.integrations.organization_integration import OrganizationIntegration
 from sentry.models.integrations.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.models.organization import Organization
 from sentry.models.repository import Repository
@@ -88,7 +87,7 @@ def derive_code_mappings(
     # When you look at the performance page the user is a default column
     set_user({"username": org.slug})
     set_tag("project.slug", project.slug)
-    extra = {
+    extra: Dict[str, Any] = {
         "organization.slug": org.slug,
     }
 
@@ -104,7 +103,7 @@ def derive_code_mappings(
         return
 
     installation, organization_integration = get_installation(org)
-    if not installation:
+    if not installation or not organization_integration:
         return
 
     trees = {}
@@ -194,7 +193,7 @@ def get_installation(
 
 def set_project_codemappings(
     code_mappings: List[CodeMapping],
-    organization_integration: OrganizationIntegration,
+    organization_integration: RpcOrganizationIntegration,
     project: Project,
 ) -> None:
     """