ref: use absolute imports for BaseManager

fixing an __init__.py cycle one step at a time

src/sentry/db/models/__init__.py

@@ -1,5 +1,4 @@
 from .base import *  # NOQA
 from .fields import *  # NOQA
-from .manager import *  # NOQA
 from .paranoia import *  # NOQA
 from .query import *  # NOQA

src/sentry/db/models/base.py

@@ -19,11 +19,10 @@
 from sentry.backup.sanitize import SanitizableField, Sanitizer
 from sentry.backup.scopes import ImportScope, RelocationScope
 from sentry.db.models.fields.uuid import UUIDField
+from sentry.db.models.manager.base import BaseManager, create_silo_limited_copy
 from sentry.silo.base import SiloLimit, SiloMode
 
 from .fields.bounded import BoundedBigAutoField
-from .manager import BaseManager
-from .manager.base import create_silo_limited_copy
 from .query import update
 
 __all__ = (

src/sentry/db/models/manager/__init__.py

@@ -1,5 +0,0 @@
-from __future__ import annotations
-
-from .base import BaseManager
-
-__all__ = ("BaseManager",)

src/sentry/db/models/outboxes.py

@@ -9,7 +9,8 @@
 from django.dispatch import receiver
 from sentry_sdk.api import capture_exception
 
-from sentry.db.models import BaseManager, Model
+from sentry.db.models import Model
+from sentry.db.models.manager.base import BaseManager
 from sentry.signals import post_upgrade
 from sentry.silo.base import SiloMode
 from sentry.types.region import find_regions_for_orgs, find_regions_for_user

src/sentry/db/models/paranoia.py

@@ -3,7 +3,8 @@
 from django.db import models
 from django.utils import timezone
 
-from sentry.db.models import BaseManager, BaseModel, sane_repr
+from sentry.db.models import BaseModel, sane_repr
+from sentry.db.models.manager.base import BaseManager
 from sentry.db.models.manager.base_query_set import BaseQuerySet
 from sentry.db.models.manager.types import M
 

src/sentry/discover/models.py

@@ -6,10 +6,11 @@
 
 from sentry import features
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import BaseManager, FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
 from sentry.db.models.fields import JSONField
 from sentry.db.models.fields.bounded import BoundedBigIntegerField, BoundedPositiveIntegerField
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.dashboard_widget import TypesClass
 from sentry.models.projectteam import ProjectTeam
 from sentry.tasks.relay import schedule_invalidate_project_config

src/sentry/incidents/models/alert_rule.py

@@ -25,7 +25,7 @@
     sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 from sentry.incidents.models.alert_rule_activations import AlertRuleActivations
 from sentry.incidents.models.incident import IncidentTrigger
 from sentry.incidents.utils.constants import INCIDENTS_SNUBA_SUBSCRIPTION_TYPE

src/sentry/incidents/models/alert_rule_activations.py

@@ -9,7 +9,7 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import FlexibleForeignKey, Model, region_silo_model
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.releases.constants import DB_VERSION_LENGTH
 
 if TYPE_CHECKING:

src/sentry/incidents/models/incident.py

@@ -24,7 +24,7 @@
     sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.organization import Organization
 from sentry.utils.retries import TimedRetryPolicy
 

src/sentry/models/activity.py

@@ -14,7 +14,6 @@
 from sentry import features, options
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     GzippedDictField,
@@ -23,6 +22,7 @@
     sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.tasks import activity
 from sentry.types.activity import CHOICES, ActivityType
 from sentry.types.group import PriorityLevel

src/sentry/models/apiapplication.py

@@ -11,13 +11,13 @@
 from sentry.backup.sanitize import SanitizableField, Sanitizer
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
     control_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.outbox import ControlOutbox, OutboxCategory, OutboxScope, outbox_context
 from sentry.types.region import find_all_region_names
 

src/sentry/models/apikey.py

@@ -8,8 +8,9 @@
 from sentry.backup.dependencies import NormalizedModelName, get_model_name
 from sentry.backup.sanitize import SanitizableField, Sanitizer
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import BaseManager, BoundedPositiveIntegerField, control_silo_model, sane_repr
+from sentry.db.models import BoundedPositiveIntegerField, control_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.db.models.outboxes import ReplicatedControlModel
 from sentry.models.apiscopes import HasApiScopes
 from sentry.models.outbox import OutboxCategory

src/sentry/models/authenticator.py

@@ -21,13 +21,13 @@
 from sentry.backup.sanitize import SanitizableField, Sanitizer
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedAutoField,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     control_silo_model,
 )
 from sentry.db.models.fields.picklefield import PickledObjectField
+from sentry.db.models.manager.base import BaseManager
 from sentry.db.models.outboxes import ControlOutboxProducingModel
 from sentry.models.outbox import ControlOutboxBase, OutboxCategory
 from sentry.types.region import find_regions_for_user

src/sentry/models/avatars/sentry_app_avatar.py

@@ -8,7 +8,7 @@
 from django.db import models
 
 from sentry.db.models import FlexibleForeignKey, control_silo_model
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 
 from . import ControlAvatarBase
 

src/sentry/models/avatars/user_avatar.py

@@ -6,7 +6,8 @@
 
 from django.db import models, router, transaction
 
-from sentry.db.models import BaseManager, FlexibleForeignKey, control_silo_model
+from sentry.db.models import FlexibleForeignKey, control_silo_model
+from sentry.db.models.manager.base import BaseManager
 
 from ...types.region import find_regions_for_user
 from ..outbox import ControlOutboxBase, OutboxCategory

src/sentry/models/commit.py

@@ -9,14 +9,14 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.utils.groupreference import find_referenced_groups
 
 if TYPE_CHECKING:

src/sentry/models/commitauthor.py

@@ -6,7 +6,7 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import BoundedBigIntegerField, Model, region_silo_model, sane_repr
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 
 if TYPE_CHECKING:
     from sentry.services.hybrid_cloud.user import RpcUser

src/sentry/models/commitfilechange.py

@@ -6,13 +6,13 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 
 COMMIT_FILE_CHANGE_TYPES = frozenset(("A", "D", "M"))
 

src/sentry/models/debugfile.py

@@ -25,14 +25,14 @@
 from sentry.backup.scopes import RelocationScope
 from sentry.constants import KNOWN_DIF_FORMATS
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     FlexibleForeignKey,
     JSONField,
     Model,
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.files.file import File
 from sentry.models.files.utils import clear_cached_files
 from sentry.reprocessing import resolve_processing_issue

src/sentry/models/environment.py

@@ -8,13 +8,13 @@
 from sentry.backup.scopes import RelocationScope
 from sentry.constants import ENVIRONMENT_NAME_MAX_LENGTH, ENVIRONMENT_NAME_PATTERN
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.utils import metrics
 from sentry.utils.cache import cache
 from sentry.utils.hashlib import md5_text

src/sentry/models/featureadoption.py

@@ -10,14 +10,8 @@
 from sentry.adoption import manager
 from sentry.adoption.manager import UnknownFeature
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import (
-    BaseManager,
-    FlexibleForeignKey,
-    JSONField,
-    Model,
-    region_silo_model,
-    sane_repr,
-)
+from sentry.db.models import FlexibleForeignKey, JSONField, Model, region_silo_model, sane_repr
+from sentry.db.models.manager.base import BaseManager
 from sentry.utils.redis import (
     get_dynamic_cluster_from_options,
     is_instance_rb_cluster,

src/sentry/models/group.py

@@ -26,7 +26,6 @@
 from sentry.backup.scopes import RelocationScope
 from sentry.constants import DEFAULT_LOGGER_NAME, LOG_LEVELS, MAX_CULPRIT_LENGTH
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     BoundedIntegerField,
     BoundedPositiveIntegerField,
@@ -36,6 +35,7 @@
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.eventstore.models import GroupEvent
 from sentry.issues.grouptype import ErrorGroupType, GroupCategory, get_group_type_by_type_id
 from sentry.issues.priority import (

src/sentry/models/groupassignee.py

@@ -9,8 +9,9 @@
 
 from sentry import features
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import BaseManager, FlexibleForeignKey, Model, region_silo_model, sane_repr
+from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.grouphistory import GroupHistoryStatus, record_group_history
 from sentry.models.groupowner import GroupOwner
 from sentry.models.groupsubscription import GroupSubscription

src/sentry/models/grouphistory.py

@@ -8,14 +8,14 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.types.activity import ActivityType
 from sentry.types.actor import Actor
 from sentry.types.group import GROUP_SUBSTATUS_TO_GROUP_HISTORY_STATUS

src/sentry/models/grouplink.py

@@ -9,7 +9,6 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedBigIntegerField,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
@@ -18,6 +17,7 @@
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 
 if TYPE_CHECKING:
     from sentry.models.group import Group

src/sentry/models/groupmeta.py

@@ -7,7 +7,7 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import FlexibleForeignKey, Model, region_silo_model, sane_repr
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 
 ERR_CACHE_MISSING = "Cache not populated for instance id=%s"
 

src/sentry/models/groupsnooze.py

@@ -10,14 +10,14 @@
 from sentry import tsdb
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     JSONField,
     Model,
     region_silo_model,
     sane_repr,
 )
+from sentry.db.models.manager.base import BaseManager
 from sentry.issues.constants import get_issue_tsdb_group_model, get_issue_tsdb_user_group_model
 from sentry.snuba.referrer import Referrer
 from sentry.utils import metrics

src/sentry/models/groupsubscription.py

@@ -9,14 +9,14 @@
 
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
 )
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.integrations.types import ExternalProviders
 from sentry.notifications.types import (
     GroupSubscriptionReason,

src/sentry/models/identity.py

@@ -13,13 +13,13 @@
 from sentry.backup.scopes import RelocationScope
 from sentry.db.models import (
     ArrayField,
-    BaseManager,
     BoundedPositiveIntegerField,
     FlexibleForeignKey,
     Model,
     control_silo_model,
 )
 from sentry.db.models.fields.jsonfield import JSONField
+from sentry.db.models.manager.base import BaseManager
 from sentry.integrations.types import ExternalProviders
 from sentry.services.hybrid_cloud.user import RpcUser
 

src/sentry/models/integrations/external_issue.py

@@ -7,15 +7,9 @@
 from django.utils import timezone
 
 from sentry.backup.scopes import RelocationScope
-from sentry.db.models import (
-    BaseManager,
-    FlexibleForeignKey,
-    JSONField,
-    Model,
-    region_silo_model,
-    sane_repr,
-)
+from sentry.db.models import FlexibleForeignKey, JSONField, Model, region_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.eventstore.models import Event
 
 if TYPE_CHECKING:

src/sentry/models/integrations/integration.py

@@ -11,7 +11,7 @@
 from sentry.constants import ObjectStatus
 from sentry.db.models import BoundedPositiveIntegerField, DefaultFieldsModel, control_silo_model
 from sentry.db.models.fields.jsonfield import JSONField
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.integrations.organization_integration import OrganizationIntegration
 from sentry.models.outbox import ControlOutbox, OutboxCategory, OutboxScope, outbox_context
 from sentry.services.hybrid_cloud.organization import RpcOrganization, organization_service

src/sentry/models/integrations/integration_feature.py

@@ -14,7 +14,7 @@
     Model,
     control_silo_model,
 )
-from sentry.db.models.manager import BaseManager
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.integrations.doc_integration import DocIntegration
 from sentry.models.integrations.sentry_app import SentryApp