chore(deletions): Move tasks under sentry.deletions

pyproject.toml

@@ -624,7 +624,6 @@ module = [
     "sentry.tasks.beacon",
     "sentry.tasks.codeowners.*",
     "sentry.tasks.commit_context",
-    "sentry.tasks.delete_seer_grouping_records",
     "sentry.tasks.on_demand_metrics",
     "sentry.tasks.reprocessing2",
     "sentry.tasks.store",
@@ -844,7 +843,6 @@ module = [
     "tests.sentry.spans.grouping.*",
     "tests.sentry.tasks.integrations.*",
     "tests.sentry.tasks.test_code_owners",
-    "tests.sentry.tasks.test_delete_seer_grouping_records",
     "tests.sentry.tasks.test_on_demand_metrics",
     "tests.sentry.tempest.endpoints.*",
     "tests.sentry.templatetags.*",

src/sentry/conf/server.py

@@ -831,6 +831,8 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.debug_files.tasks",
     "sentry.deletions.tasks.hybrid_cloud",
     "sentry.deletions.tasks.scheduled",
+    "sentry.deletions.tasks.delete_pending_groups",
+    "sentry.deletions.tasks.delete_seer_grouping_records",
     "sentry.demo_mode.tasks",
     "sentry.dynamic_sampling.tasks.boost_low_volume_projects",
     "sentry.dynamic_sampling.tasks.boost_low_volume_transactions",
@@ -894,8 +896,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "sentry.tasks.collect_project_platforms",
     "sentry.tasks.commit_context",
     "sentry.tasks.commits",
-    "sentry.tasks.delete_pending_groups",
-    "sentry.tasks.delete_seer_grouping_records",
     "sentry.tasks.digests",
     "sentry.tasks.email",
     "sentry.tasks.groupowner",
@@ -1009,7 +1009,7 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
         "schedule": task_crontab("0", "*/2", "*", "*", "*"),
     },
     "delete-pending-groups": {
-        "task": "deletions:sentry.tasks.delete_pending_groups",
+        "task": "deletions:sentry.deletions.tasks.delete_pending_groups",
         # Runs every 6 hours (at 00:00, 06:00, 12:00, 18:00 UTC)
         "schedule": task_crontab("0", "*/6", "*", "*", "*"),
     },

src/sentry/core/endpoints/project_details.py

@@ -34,6 +34,9 @@
     ObjectStatus,
 )
 from sentry.deletions.models.scheduleddeletion import RegionScheduledDeletion
+from sentry.deletions.tasks.delete_seer_grouping_records import (
+    call_seer_delete_project_grouping_records,
+)
 from sentry.dynamic_sampling import get_supported_biases_ids, get_user_biases
 from sentry.dynamic_sampling.types import DynamicSamplingMode
 from sentry.dynamic_sampling.utils import has_custom_dynamic_sampling, has_dynamic_sampling
@@ -57,7 +60,6 @@
 from sentry.notifications.utils import has_alert_integration
 from sentry.relay.datascrubbing import validate_pii_config_update, validate_pii_selectors
 from sentry.seer.autofix.constants import AutofixAutomationTuningSettings
-from sentry.tasks.delete_seer_grouping_records import call_seer_delete_project_grouping_records
 from sentry.tempest.utils import has_tempest_access
 
 logger = logging.getLogger(__name__)

src/sentry/deletions/defaults/group.py

@@ -21,6 +21,9 @@
 from typing import Any
 
 from sentry import models, options
+from sentry.deletions.tasks.delete_seer_grouping_records import (
+    may_schedule_task_to_delete_hashes_from_seer,
+)
 from sentry.deletions.tasks.nodestore import delete_events_for_groups_from_nodestore_and_eventstore
 from sentry.issues.grouptype import GroupCategory, InvalidGroupTypeError
 from sentry.models.group import Group, GroupStatus
@@ -30,7 +33,6 @@
 from sentry.notifications.models.notificationmessage import NotificationMessage
 from sentry.services.eventstore.models import Event
 from sentry.snuba.dataset import Dataset
-from sentry.tasks.delete_seer_grouping_records import may_schedule_task_to_delete_hashes_from_seer
 from sentry.utils import metrics
 
 from ..base import BaseDeletionTask, BaseRelation, ModelDeletionTask, ModelRelation

src/sentry/tasks/delete_pending_groups.py → src/sentry/deletions/tasks/delete_pending_groups.py

@@ -20,7 +20,7 @@
 
 
 @instrumented_task(
-    name="sentry.tasks.delete_pending_groups",
+    name="sentry.deletions.tasks.delete_pending_groups",
     namespace=deletion_tasks,
     processing_deadline_duration=10 * 60,
     retry=Retry(times=3, delay=60),

src/sentry/tasks/delete_seer_grouping_records.py → src/sentry/deletions/tasks/delete_seer_grouping_records.py

@@ -18,7 +18,7 @@
 
 
 @instrumented_task(
-    name="sentry.tasks.delete_seer_grouping_records_by_hash",
+    name="sentry.deletions.tasks.delete_seer_grouping_records_by_hash",
     namespace=seer_tasks,
     processing_deadline_duration=60 * (15 + 5),
     silo_mode=SiloMode.REGION,

src/sentry/seer/similarity/similar_issues.py

@@ -12,6 +12,7 @@
     SEER_SIMILAR_ISSUES_URL,
     SEER_SIMILARITY_CIRCUIT_BREAKER_KEY,
 )
+from sentry.deletions.tasks.delete_seer_grouping_records import delete_seer_grouping_records_by_hash
 from sentry.models.grouphashmetadata import GroupHashMetadata
 from sentry.net.http import connection_from_url
 from sentry.seer.signed_seer_api import make_signed_seer_api_request
@@ -22,7 +23,6 @@
     SimilarHashNotFoundError,
     SimilarIssuesEmbeddingsRequest,
 )
-from sentry.tasks.delete_seer_grouping_records import delete_seer_grouping_records_by_hash
 from sentry.utils import json, metrics
 from sentry.utils.circuit_breaker2 import CircuitBreaker
 from sentry.utils.json import JSONDecodeError

tests/sentry/tasks/test_delete_pending_groups.py → tests/sentry/deletions/tasks/test_delete_pending_groups.py

@@ -5,12 +5,12 @@
 
 from django.utils import timezone
 
-from sentry.models.group import Group, GroupStatus
-from sentry.tasks.delete_pending_groups import (
+from sentry.deletions.tasks.delete_pending_groups import (
     MAX_LAST_SEEN_DAYS,
     MIN_LAST_SEEN_HOURS,
     delete_pending_groups,
 )
+from sentry.models.group import Group, GroupStatus
 from sentry.testutils.cases import TestCase
 from sentry.types.group import GroupSubStatus
 

tests/sentry/tasks/test_delete_seer_grouping_records.py → tests/sentry/deletions/tasks/test_delete_seer_grouping_records.py

@@ -1,11 +1,11 @@
 from time import time
 from unittest.mock import MagicMock, patch
 
-from sentry.models.grouphash import GroupHash
-from sentry.tasks.delete_seer_grouping_records import (
+from sentry.deletions.tasks.delete_seer_grouping_records import (
     delete_seer_grouping_records_by_hash,
     may_schedule_task_to_delete_hashes_from_seer,
 )
+from sentry.models.grouphash import GroupHash
 from sentry.testutils.cases import TestCase
 from sentry.testutils.pytest.fixtures import django_db_all