From fc419eb2e3bf1be5d47ea2a3973d080166136c91 Mon Sep 17 00:00:00 2001 From: Evan Purkhiser Date: Fri, 11 Apr 2025 18:26:50 -0400 Subject: [PATCH] ref(py): Consistently use `import *` in models I know we're trying to just straight remove these, but let's at least be consistent for now so that mypy understands that these models are available from this module. --- src/sentry/models/__init__.py | 14 +++++++------- src/sentry/models/commitfilechange.py | 3 +++ src/sentry/models/organizationmemberinvite.py | 2 ++ src/sentry/models/projectownership.py | 2 ++ src/sentry/models/projectteam.py | 2 ++ src/sentry/models/projecttemplate.py | 2 ++ src/sentry/models/rulesnooze.py | 2 ++ 7 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/sentry/models/__init__.py b/src/sentry/models/__init__.py index ba3f8899080857..e3bfe48429b46d 100644 --- a/src/sentry/models/__init__.py +++ b/src/sentry/models/__init__.py @@ -16,7 +16,7 @@ from .broadcast import * # NOQA from .commit import * # NOQA from .commitauthor import * # NOQA -from .commitfilechange import CommitFileChange # noqa +from .commitfilechange import * # noqa from .counter import * # NOQA from .dashboard import * # NOQA from .dashboard_permissions import * # NOQA @@ -69,7 +69,7 @@ from .organizationaccessrequest import * # NOQA from .organizationmapping import * # NOQA from .organizationmember import * # NOQA -from .organizationmemberinvite import OrganizationMemberInvite # NOQA +from .organizationmemberinvite import * # NOQA from .organizationmembermapping import * # NOQA from .organizationmemberteam import * # NOQA from .organizationmemberteamreplica import * # NOQA @@ -81,12 +81,12 @@ from .projectbookmark import * # NOQA from .projectcodeowners import * # NOQA from .projectkey import * # NOQA -from .projectownership import ProjectOwnership # NOQA +from .projectownership import * # NOQA from .projectplatform import * # NOQA from .projectredirect import * # NOQA from .projectsdk import * # NOQA -from .projectteam import ProjectTeam # noqa -from .projecttemplate import ProjectTemplate # noqa +from .projectteam import * # NOQA +from .projecttemplate import * # NOQA from .promptsactivity import * # NOQA from .pullrequest import * # NOQA from .recentsearch import * # NOQA @@ -104,8 +104,8 @@ from .rollbackorganization import * # NOQA from .rollbackuser import * # NOQA from .rule import * # NOQA -from .rulefirehistory import RuleFireHistory # NOQA -from .rulesnooze import RuleSnooze # NOQA +from .rulefirehistory import * # NOQA +from .rulesnooze import * # NOQA from .savedsearch import * # NOQA from .search_common import * # NOQA from .sentryshot import * # NOQA diff --git a/src/sentry/models/commitfilechange.py b/src/sentry/models/commitfilechange.py index d8779651a5edde..7b00efe044d6fc 100644 --- a/src/sentry/models/commitfilechange.py +++ b/src/sentry/models/commitfilechange.py @@ -17,6 +17,9 @@ COMMIT_FILE_CHANGE_TYPES = frozenset(("A", "D", "M")) +__all__ = ("CommitFileChange",) + + class CommitFileChangeManager(BaseManager["CommitFileChange"]): def get_count_for_commits(self, commits: Iterable[Any]) -> int: return int(self.filter(commit__in=commits).values("filename").distinct().count()) diff --git a/src/sentry/models/organizationmemberinvite.py b/src/sentry/models/organizationmemberinvite.py index 8010af8a97940c..1814bb48c5a428 100644 --- a/src/sentry/models/organizationmemberinvite.py +++ b/src/sentry/models/organizationmemberinvite.py @@ -18,6 +18,8 @@ INVITE_DAYS_VALID = 30 +__all__ = ("OrganizationMemberInvite",) + class InviteStatus(Enum): APPROVED = 0 diff --git a/src/sentry/models/projectownership.py b/src/sentry/models/projectownership.py index 7a410cbc4f8fdd..1dd548611c6c94 100644 --- a/src/sentry/models/projectownership.py +++ b/src/sentry/models/projectownership.py @@ -29,6 +29,8 @@ from sentry.models.team import Team from sentry.users.services.user import RpcUser +__all__ = ("ProjectOwnership",) + logger = logging.getLogger(__name__) READ_CACHE_DURATION = 3600 diff --git a/src/sentry/models/projectteam.py b/src/sentry/models/projectteam.py index aecc08db79518a..2967401c53774b 100644 --- a/src/sentry/models/projectteam.py +++ b/src/sentry/models/projectteam.py @@ -13,6 +13,8 @@ if TYPE_CHECKING: from sentry.models.team import Team +__all__ = ("ProjectTeam",) + class ProjectTeamManager(BaseManager["ProjectTeam"]): def get_for_teams_with_org_cache(self, teams: Sequence["Team"]) -> QuerySet["ProjectTeam"]: diff --git a/src/sentry/models/projecttemplate.py b/src/sentry/models/projecttemplate.py index a7dbcf8e157d4a..e4911f357a0c5c 100644 --- a/src/sentry/models/projecttemplate.py +++ b/src/sentry/models/projecttemplate.py @@ -8,6 +8,8 @@ sane_repr, ) +__all__ = ("ProjectTemplate",) + @region_silo_model class ProjectTemplate(DefaultFieldsModelExisting): diff --git a/src/sentry/models/rulesnooze.py b/src/sentry/models/rulesnooze.py index 68ce108b665421..f50aa10b7d705a 100644 --- a/src/sentry/models/rulesnooze.py +++ b/src/sentry/models/rulesnooze.py @@ -9,6 +9,8 @@ from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey from sentry.db.models.manager.base import BaseManager +__all__ = ("RuleSnooze",) + class RuleSnoozeManager(BaseManager["RuleSnooze"]): def is_snoozed_for_all(self, rule=None, alert_rule=None):