ref: fix typing for sentry.models.__init__

star imports were clobbering names with incompatible types

Author: asottile-sentry

pyproject.toml

@@ -643,7 +643,6 @@ module = [
     "sentry.migrations.0381_fix_org_slug_casing",
     "sentry.migrations.0407_recreate_perf_alert_subscriptions",
     "sentry.migrations.0418_add_actor_constraints",
-    "sentry.models",
     "sentry.models.actor",
     "sentry.models.apiapplication",
     "sentry.models.artifactbundle",

src/sentry/api/endpoints/filechange.py

@@ -6,7 +6,8 @@
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers import serialize
-from sentry.models import CommitFileChange, Release, ReleaseCommit, Repository
+from sentry.models import Release, ReleaseCommit, Repository
+from sentry.models.commitfilechange import CommitFileChange
 
 
 @region_silo_endpoint

src/sentry/api/endpoints/organization_release_meta.py

@@ -7,7 +7,8 @@
 from sentry.api.bases.organization import OrganizationReleasesBaseEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.serializers.models.release import expose_version_info
-from sentry.models import CommitFileChange, ProjectPlatform, Release, ReleaseCommit, ReleaseProject
+from sentry.models import ProjectPlatform, Release, ReleaseCommit, ReleaseProject
+from sentry.models.commitfilechange import CommitFileChange
 
 
 @region_silo_endpoint

src/sentry/api/endpoints/organization_users.py

@@ -6,7 +6,8 @@
 from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.serializers import serialize
 from sentry.api.serializers.models import OrganizationMemberWithProjectsSerializer
-from sentry.models import OrganizationMember, OrganizationMemberTeam, ProjectTeam
+from sentry.models import OrganizationMember, OrganizationMemberTeam
+from sentry.models.projectteam import ProjectTeam
 
 
 @region_silo_endpoint

src/sentry/api/serializers/models/filechange.py

@@ -1,6 +1,7 @@
 from sentry.api.serializers import Serializer, register
 from sentry.api.serializers.models.commit import get_users_for_commits
-from sentry.models import Commit, CommitFileChange, Repository
+from sentry.models import Commit, Repository
+from sentry.models.commitfilechange import CommitFileChange
 
 
 @register(CommitFileChange)

src/sentry/api/serializers/models/organization_member/expand/projects.py

@@ -1,7 +1,8 @@
 from collections import defaultdict
 from typing import Any, Mapping, MutableMapping, Sequence, cast
 
-from sentry.models import OrganizationMember, OrganizationMemberTeam, ProjectTeam, TeamStatus, User
+from sentry.models import OrganizationMember, OrganizationMemberTeam, TeamStatus, User
+from sentry.models.projectteam import ProjectTeam
 
 from ..base import OrganizationMemberSerializer
 from ..response import OrganizationMemberWithProjectsResponse

src/sentry/api/serializers/models/project.py

@@ -47,13 +47,13 @@
     ProjectBookmark,
     ProjectOption,
     ProjectPlatform,
-    ProjectTeam,
     Release,
     Team,
     User,
     UserReport,
 )
 from sentry.models.options.project_option import OPTION_KEYS
+from sentry.models.projectteam import ProjectTeam
 from sentry.notifications.helpers import (
     get_most_specific_notification_setting_value,
     transform_to_notification_settings_by_scope,

src/sentry/api/serializers/models/team.py

@@ -38,11 +38,11 @@
     OrganizationAccessRequest,
     OrganizationMember,
     OrganizationMemberTeam,
-    ProjectTeam,
     Team,
     TeamAvatar,
     User,
 )
+from sentry.models.projectteam import ProjectTeam
 from sentry.roles import organization_roles, team_roles
 from sentry.scim.endpoints.constants import SCIM_SCHEMA_GROUP
 from sentry.utils.query import RangeQuerySetWrapper

src/sentry/api/serializers/rest_framework/commit.py

@@ -1,7 +1,7 @@
 from rest_framework import serializers
 
 from sentry.api.serializers.rest_framework.list import ListField
-from sentry.models import CommitFileChange
+from sentry.models.commitfilechange import CommitFileChange
 
 
 class CommitPatchSetSerializer(serializers.Serializer):

src/sentry/deletions/__init__.py

@@ -90,6 +90,7 @@ def load_defaults():
     from sentry import models
     from sentry.discover.models import DiscoverSavedQuery
     from sentry.incidents.models import AlertRule
+    from sentry.models.commitfilechange import CommitFileChange
     from sentry.monitors import models as monitor_models
 
     from . import defaults
@@ -102,7 +103,7 @@ def load_defaults():
     default_manager.register(models.ApiToken, BulkModelDeletionTask)
     default_manager.register(models.Commit, defaults.CommitDeletionTask)
     default_manager.register(models.CommitAuthor, defaults.CommitAuthorDeletionTask)
-    default_manager.register(models.CommitFileChange, BulkModelDeletionTask)
+    default_manager.register(CommitFileChange, BulkModelDeletionTask)
     default_manager.register(models.Deploy, BulkModelDeletionTask)
     default_manager.register(DiscoverSavedQuery, defaults.DiscoverSavedQueryDeletionTask)
     default_manager.register(models.Distribution, BulkModelDeletionTask)

src/sentry/deletions/defaults/commit.py

@@ -3,7 +3,8 @@
 
 class CommitDeletionTask(ModelDeletionTask):
     def get_child_relations(self, instance):
-        from sentry.models import CommitFileChange, ReleaseCommit, ReleaseHeadCommit
+        from sentry.models import ReleaseCommit, ReleaseHeadCommit
+        from sentry.models.commitfilechange import CommitFileChange
 
         return [
             ModelRelation(CommitFileChange, {"commit_id": instance.id}),

src/sentry/deletions/defaults/project.py

@@ -6,6 +6,7 @@ def get_child_relations(self, instance):
         from sentry import models
         from sentry.discover.models import DiscoverSavedQueryProject
         from sentry.incidents.models import AlertRule, IncidentProject
+        from sentry.models.projectteam import ProjectTeam
         from sentry.monitors.models import Monitor
         from sentry.replays.models import ReplayRecordingSegment
         from sentry.snuba.models import QuerySubscription
@@ -34,7 +35,7 @@ def get_child_relations(self, instance):
             models.LatestAppConnectBuildsCheck,
             models.ProjectBookmark,
             models.ProjectKey,
-            models.ProjectTeam,
+            ProjectTeam,
             models.PromptsActivity,
             # order matters, ProjectCodeOwners to be deleted before RepositoryProjectPathConfig
             models.ProjectCodeOwners,

src/sentry/deletions/defaults/team.py

@@ -3,7 +3,7 @@
 
 class TeamDeletionTask(ModelDeletionTask):
     def get_child_relations(self, instance):
-        from sentry.models import ProjectTeam
+        from sentry.models.projectteam import ProjectTeam
 
         return [
             ModelRelation(ProjectTeam, {"team_id": instance.id}),

src/sentry/discover/endpoints/discover_key_transactions.py

@@ -14,7 +14,8 @@
 from sentry.api.utils import InvalidParams
 from sentry.discover.endpoints import serializers
 from sentry.discover.models import TeamKeyTransaction
-from sentry.models import ProjectTeam, Team
+from sentry.models import Team
+from sentry.models.projectteam import ProjectTeam
 
 
 class KeyTransactionPermission(OrganizationPermission):

src/sentry/integrations/github/webhook.py

@@ -18,14 +18,8 @@
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.constants import ObjectStatus
 from sentry.integrations.utils.scope import clear_tags_and_context
-from sentry.models import (
-    Commit,
-    CommitAuthor,
-    CommitFileChange,
-    Organization,
-    PullRequest,
-    Repository,
-)
+from sentry.models import Commit, CommitAuthor, Organization, PullRequest, Repository
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.services.hybrid_cloud.identity.service import identity_service
 from sentry.services.hybrid_cloud.integration.model import (
     RpcIntegration,

src/sentry/models/__init__.py

@@ -17,7 +17,7 @@
 from .broadcast import *  # NOQA
 from .commit import *  # NOQA
 from .commitauthor import *  # NOQA
-from .commitfilechange import *  # NOQA
+from .commitfilechange import CommitFileChange  # noqa
 from .counter import *  # NOQA
 from .dashboard import *  # NOQA
 from .dashboard_widget import *  # NOQA
@@ -82,7 +82,7 @@
 from .projectownership import *  # NOQA
 from .projectplatform import *  # NOQA
 from .projectredirect import *  # NOQA
-from .projectteam import *  # NOQA
+from .projectteam import ProjectTeam  # noqa
 from .promptsactivity import *  # NOQA
 from .pullrequest import *  # NOQA
 from .rawevent import *  # NOQA

src/sentry/models/project.py

@@ -326,13 +326,13 @@ def transfer_to(self, organization):
             Environment,
             EnvironmentProject,
             ExternalIssue,
-            ProjectTeam,
             RegionScheduledDeletion,
             ReleaseProject,
             ReleaseProjectEnvironment,
             Rule,
         )
         from sentry.models.actor import ACTOR_TYPES
+        from sentry.models.projectteam import ProjectTeam
         from sentry.monitors.models import Monitor
 
         old_org_id = self.organization_id
@@ -492,13 +492,8 @@ def copy_settings_from(self, project_id):
         Returns True if the settings have successfully been copied over
         Returns False otherwise
         """
-        from sentry.models import (
-            EnvironmentProject,
-            ProjectOption,
-            ProjectOwnership,
-            ProjectTeam,
-            Rule,
-        )
+        from sentry.models import EnvironmentProject, ProjectOption, ProjectOwnership, Rule
+        from sentry.models.projectteam import ProjectTeam
 
         model_list = [EnvironmentProject, ProjectOwnership, ProjectTeam, Rule]
 

src/sentry/models/release.py

@@ -37,11 +37,11 @@
 from sentry.models import (
     Activity,
     ArtifactBundle,
-    CommitFileChange,
     GroupInbox,
     GroupInboxRemoveAction,
     remove_group_from_inbox,
 )
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.models.grouphistory import GroupHistoryStatus, record_group_history
 from sentry.signals import issue_resolved
 from sentry.tasks.relay import schedule_invalidate_project_config

src/sentry/models/team.py

@@ -41,7 +41,8 @@ def get_for_user(
         Returns a list of all teams a user has some level of access to.
         """
         from sentry.auth.superuser import is_active_superuser
-        from sentry.models import OrganizationMember, OrganizationMemberTeam, Project, ProjectTeam
+        from sentry.models import OrganizationMember, OrganizationMemberTeam, Project
+        from sentry.models.projectteam import ProjectTeam
 
         if not user.is_authenticated:
             return []
@@ -230,10 +231,10 @@ def transfer_to(self, organization):
             OrganizationMember,
             OrganizationMemberTeam,
             Project,
-            ProjectTeam,
             ReleaseProject,
             ReleaseProjectEnvironment,
         )
+        from sentry.models.projectteam import ProjectTeam
 
         try:
             with transaction.atomic():

src/sentry/notifications/notifications/activity/release.py

@@ -4,7 +4,8 @@
 
 from sentry_relay import parse_release
 
-from sentry.models import Activity, Commit, CommitFileChange, OrganizationMember, Project
+from sentry.models import Activity, Commit, OrganizationMember, Project
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.notifications.types import NotificationSettingTypes
 from sentry.notifications.utils import (
     get_deploy,

src/sentry/search/events/datasets/field_aliases.py

@@ -7,7 +7,7 @@
 
 from sentry.discover.models import TeamKeyTransaction
 from sentry.exceptions import IncompatibleMetricsQuery
-from sentry.models import ProjectTeam
+from sentry.models.projectteam import ProjectTeam
 from sentry.search.events import builder, constants, fields
 from sentry.search.events.types import SelectType
 from sentry.utils.numbers import format_grouped_length

src/sentry/search/events/fields.py

@@ -10,7 +10,8 @@
 
 from sentry.discover.models import TeamKeyTransaction
 from sentry.exceptions import IncompatibleMetricsQuery, InvalidSearchQuery
-from sentry.models import ProjectTeam, ProjectTransactionThreshold
+from sentry.models import ProjectTransactionThreshold
+from sentry.models.projectteam import ProjectTeam
 from sentry.models.transaction_threshold import (
     TRANSACTION_METRICS,
     ProjectTransactionThresholdOverride,

src/sentry/services/hybrid_cloud/organization/serial.py

@@ -9,10 +9,10 @@
     OrganizationMember,
     OrganizationMemberTeam,
     Project,
-    ProjectTeam,
     Team,
     TeamStatus,
 )
+from sentry.models.projectteam import ProjectTeam
 from sentry.services.hybrid_cloud.organization import (
     RpcOrganization,
     RpcOrganizationFlags,

src/sentry/testutils/asserts.py

@@ -1,6 +1,7 @@
 from typing import Optional
 
-from sentry.models import AuditLogEntry, CommitFileChange
+from sentry.models import AuditLogEntry
+from sentry.models.commitfilechange import CommitFileChange
 
 
 def assert_mock_called_once_with_partial(mock, *args, **kwargs):

src/sentry/testutils/factories.py

@@ -48,7 +48,6 @@
     ArtifactBundle,
     Commit,
     CommitAuthor,
-    CommitFileChange,
     DocIntegration,
     DocIntegrationAvatar,
     Environment,
@@ -93,6 +92,7 @@
 )
 from sentry.models.actor import get_actor_id_for_user
 from sentry.models.apikey import ApiKey
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.models.integrations.integration_feature import Feature, IntegrationTypes
 from sentry.models.notificationaction import (
     ActionService,

src/sentry/utils/committers.py

@@ -25,7 +25,8 @@
 from sentry.api.serializers.models.commit import CommitSerializer, get_users_for_commits
 from sentry.api.serializers.models.release import Author
 from sentry.eventstore.models import Event
-from sentry.models import Commit, CommitFileChange, Group, Project, Release, ReleaseCommit
+from sentry.models import Commit, Group, Project, Release, ReleaseCommit
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.models.groupowner import GroupOwner, GroupOwnerType
 from sentry.services.hybrid_cloud.integration import integration_service
 from sentry.services.hybrid_cloud.user.service import user_service

src/sentry/utils/suspect_resolutions/commit_correlation.py

@@ -4,7 +4,8 @@
 from datetime import datetime, timedelta
 from typing import Sequence, Set
 
-from sentry.models import CommitFileChange, Group, GroupRelease, Release, ReleaseCommit
+from sentry.models import Group, GroupRelease, Release, ReleaseCommit
+from sentry.models.commitfilechange import CommitFileChange
 
 
 @dataclass

src/sentry_plugins/github/webhooks/events/push.py

@@ -5,7 +5,8 @@
 from django.http import Http404
 from django.utils import timezone
 
-from sentry.models import Commit, CommitAuthor, CommitFileChange, Integration, Repository
+from sentry.models import Commit, CommitAuthor, Integration, Repository
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.plugins.providers import RepositoryProvider
 from sentry.services.hybrid_cloud import coerce_id_from
 from sentry.services.hybrid_cloud.user.service import user_service

tests/apidocs/endpoints/releases/test_organization_release_commit_files.py

@@ -2,7 +2,8 @@
 from django.urls import reverse
 
 from fixtures.apidocs_test_case import APIDocsTestCase
-from sentry.models import Commit, CommitFileChange, ReleaseCommit
+from sentry.models import Commit, ReleaseCommit
+from sentry.models.commitfilechange import CommitFileChange
 
 
 class CommitFileChangeDocsTest(APIDocsTestCase):

tests/sentry/api/endpoints/test_commit_filechange.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
 
-from sentry.models import Commit, CommitFileChange, Release, ReleaseCommit, Repository
+from sentry.models import Commit, Release, ReleaseCommit, Repository
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.testutils import APITestCase
 from sentry.testutils.silo import region_silo_test
 

tests/sentry/api/endpoints/test_organization_release_meta.py

@@ -2,7 +2,6 @@
 
 from sentry.models import (
     Commit,
-    CommitFileChange,
     File,
     ProjectArtifactBundle,
     Release,
@@ -11,6 +10,7 @@
     ReleaseFile,
     Repository,
 )
+from sentry.models.commitfilechange import CommitFileChange
 from sentry.testutils import APITestCase
 from sentry.testutils.silo import region_silo_test
 from sentry.utils import json