ref: improve annotations for Outbox Managers

src/sentry/models/apitoken.py

@@ -119,9 +119,7 @@ class ApiToken(ReplicatedControlModel, HasApiScopes):
     expires_at = models.DateTimeField(null=True, default=default_expiration)
     date_added = models.DateTimeField(default=timezone.now)
 
-    objects: ClassVar[ControlOutboxProducingManager[ApiToken]] = ApiTokenManager(
-        cache_fields=("token",)
-    )
+    objects: ClassVar[ApiTokenManager] = ApiTokenManager(cache_fields=("token",))
 
     class Meta:
         app_label = "sentry"

src/sentry/models/integrations/organization_integration.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Self
 
 from django.db import models
 from django.utils import timezone
@@ -37,9 +37,7 @@ class OrganizationIntegration(ReplicatedControlModel):
     # After the grace period, we will mark the status as disabled.
     grace_period_end = models.DateTimeField(null=True, blank=True, db_index=True)
 
-    objects: ClassVar[
-        ControlOutboxProducingManager[OrganizationIntegration]
-    ] = ControlOutboxProducingManager()
+    objects: ClassVar[ControlOutboxProducingManager[Self]] = ControlOutboxProducingManager()
 
     class Meta:
         app_label = "sentry"

src/sentry/models/organizationmemberteam.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping, MutableMapping
-from typing import Any, ClassVar
+from typing import Any, ClassVar, Self
 
 from django.db import models
 
@@ -20,9 +20,7 @@ class OrganizationMemberTeam(ReplicatedRegionModel):
     Identifies relationships between organization members and the teams they are on.
     """
 
-    objects: ClassVar[
-        RegionOutboxProducingManager[OrganizationMemberTeam]
-    ] = RegionOutboxProducingManager()
+    objects: ClassVar[RegionOutboxProducingManager[Self]] = RegionOutboxProducingManager()
 
     __relocation_scope__ = RelocationScope.Organization
     category = OutboxCategory.ORGANIZATION_MEMBER_TEAM_UPDATE