remove code mappings fallback in trigger autofix

Author: srest2021

src/sentry/seer/autofix/autofix.py

@@ -35,7 +35,6 @@
 )
 from sentry.seer.autofix.utils import (
     AutofixStoppingPoint,
-    get_autofix_repos_from_project_code_mappings,
     get_org_default_seer_automation_handoff,
     get_project_seer_preferences,
     make_autofix_start_request,
@@ -638,46 +637,36 @@ def get_all_tags_overview(
 
 
 def _resolve_project_preference(
-    organization: Organization, project: Project, fallback_repos: list[dict]
+    organization: Organization, project: Project
 ) -> SeerProjectPreference | None:
     """
     Resolve the Seer project preference for a project before triggering autofix.
 
-    If an existing preference with repositories is found, returns it.
-    Otherwise, creates one using fallback repos and preserves any existing
-    stopping point / handoff settings.
+    Returns the existing preference if one exists. If not, creates a new one
+    with empty repos and org default settings.
     """
-    preference: SeerProjectPreference | None = None
     if features.has("organizations:seer-project-settings-read-from-sentry", organization):
-        preference = read_preference_from_sentry_db(project)
-    else:
-        try:
-            preference = get_project_seer_preferences(project.id).preference
-        except (SeerApiError, SeerApiResponseValidationError):
-            logger.exception(
-                "seer.resolve_project_preference.get_failed",
-                extra={"project_id": project.id, "organization_id": organization.id},
-            )
-            return None
+        return read_preference_from_sentry_db(project)
 
-    if preference and preference.repositories:
-        return preference
-
-    if preference:
-        # Preference exists but has no repos —
-        # keep the user's existing stopping point and handoff settings.
-        stopping_point = preference.automated_run_stopping_point
-        handoff = preference.automation_handoff
-    else:
-        # No preference at all — use org defaults.
-        stopping_point, handoff = get_org_default_seer_automation_handoff(organization)
+    try:
+        preference = get_project_seer_preferences(project.id).preference
+        if preference:
+            return preference
+    except (SeerApiError, SeerApiResponseValidationError):
+        logger.exception(
+            "seer.resolve_project_preference.get_failed",
+            extra={"project_id": project.id, "organization_id": organization.id},
+        )
+        return None
 
+    # No preference exists — create one with org defaults.
+    default_stopping_point, default_handoff = get_org_default_seer_automation_handoff(organization)
     preference = SeerProjectPreference(
         organization_id=organization.id,
         project_id=project.id,
-        repositories=fallback_repos,
-        automated_run_stopping_point=stopping_point,
-        automation_handoff=handoff,
+        repositories=[],
+        automated_run_stopping_point=default_stopping_point,
+        automation_handoff=default_handoff,
     )
 
     try:
@@ -748,19 +737,15 @@ def trigger_autofix(
         return _respond_with_error("Cannot fix issues without an event.", 400)
 
     code_mappings = get_sorted_code_mapping_configs(group.project)
-    code_mappings_repos = get_autofix_repos_from_project_code_mappings(
-        group.project, code_mappings=code_mappings
-    )
 
-    # Resolve the project preference from Seer, or bootstrap one from code mapping repos.
-    # On success, preference.repositories becomes the source of truth for repos
-    # (even if empty — matching Seer's behavior of unconditionally using preference repos).
-    # On failure, we fall back to the original code mapping repos above.
-    preference = _resolve_project_preference(group.organization, group.project, code_mappings_repos)
+    # Resolve the project preference, or create a new one with org defaults.
+    # Preference repos are the source of truth (even if empty).
+    # On failure, fall back to code mapping repos.
+    preference = _resolve_project_preference(group.organization, group.project)
     if preference:
         repos = [repo.dict() for repo in preference.repositories]
     else:
-        repos = code_mappings_repos
+        repos = []
 
     # Pre-resolve stacktrace frame paths using code mappings so Seer can skip
     # expensive git tree fetches for large repos.

tests/sentry/seer/autofix/test_autofix.py

@@ -1118,19 +1118,16 @@ def _mock_repo(self, name: str = "sentry", external_id: str = "123") -> dict:
     @patch("sentry.seer.autofix.autofix.set_project_seer_preference")
     @patch("sentry.seer.autofix.autofix.get_project_seer_preferences")
     def test_returns_existing_preference(self, mock_get_prefs, mock_set_pref, mock_write_sentry):
-        existing_repos = [self._mock_repo("seer", "999")]
         mock_get_prefs.return_value = SeerRawPreferenceResponse(
             preference=SeerProjectPreference(
                 organization_id=self.organization.id,
                 project_id=self.project.id,
-                repositories=existing_repos,
+                repositories=[self._mock_repo("seer", "999")],
                 automated_run_stopping_point="root_cause",
             )
         )
 
-        result = _resolve_project_preference(
-            self.organization, self.project, [self._mock_repo("sentry", "123")]
-        )
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is not None
         assert len(result.repositories) == 1
@@ -1143,7 +1140,7 @@ def test_returns_existing_preference(self, mock_get_prefs, mock_set_pref, mock_w
     @patch("sentry.seer.autofix.autofix.write_preference_to_sentry_db")
     @patch("sentry.seer.autofix.autofix.set_project_seer_preference")
     @patch("sentry.seer.autofix.autofix.get_project_seer_preferences")
-    def test_empty_repos_falls_back_to_code_mappings_and_preserves_settings(
+    def test_returns_existing_preference_with_empty_repos(
         self, mock_get_prefs, mock_set_pref, mock_write_sentry
     ):
         mock_get_prefs.return_value = SeerRawPreferenceResponse(
@@ -1161,56 +1158,36 @@ def test_empty_repos_falls_back_to_code_mappings_and_preserves_settings(
             )
         )
 
-        fallback_repos = [self._mock_repo("sentry", "123")]
-        result = _resolve_project_preference(self.organization, self.project, fallback_repos)
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is not None
-        assert len(result.repositories) == 1
-        assert result.repositories[0].name == "sentry"
+        assert result.repositories == []
         assert result.automated_run_stopping_point == "root_cause"
         assert result.automation_handoff is not None
         assert result.automation_handoff.handoff_point == "root_cause"
         assert result.automation_handoff.target == "cursor_background_agent"
         assert result.automation_handoff.integration_id == 42
         assert result.automation_handoff.auto_create_pr is True
-        mock_set_pref.assert_called_once()
-        mock_write_sentry.assert_called_once()
+        mock_set_pref.assert_not_called()
+        mock_write_sentry.assert_not_called()
 
     @patch("sentry.seer.autofix.autofix.write_preference_to_sentry_db")
     @patch("sentry.seer.autofix.autofix.set_project_seer_preference")
     @patch("sentry.seer.autofix.autofix.get_project_seer_preferences")
-    def test_no_preference_falls_back_to_code_mappings_and_org_defaults(
+    def test_no_preference_creates_one_with_org_defaults(
         self, mock_get_prefs, mock_set_pref, mock_write_sentry
     ):
         mock_get_prefs.return_value = SeerRawPreferenceResponse(preference=None)
         self.organization.update_option("sentry:default_automated_run_stopping_point", "open_pr")
         self.organization.update_option("sentry:auto_open_prs", True)
 
-        code_mapping_repos = [self._mock_repo("sentry", "123")]
-        result = _resolve_project_preference(self.organization, self.project, code_mapping_repos)
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is not None
         assert result.project_id == self.project.id
         assert result.organization_id == self.organization.id
-        assert len(result.repositories) == 1
-        assert result.repositories[0].name == "sentry"
-        assert result.repositories[0].external_id == "123"
-        assert result.automated_run_stopping_point == "open_pr"
-        mock_set_pref.assert_called_once()
-        mock_write_sentry.assert_called_once()
-
-    @patch("sentry.seer.autofix.autofix.write_preference_to_sentry_db")
-    @patch("sentry.seer.autofix.autofix.set_project_seer_preference")
-    @patch("sentry.seer.autofix.autofix.get_project_seer_preferences")
-    def test_creates_preference_with_empty_repos_when_no_fallback(
-        self, mock_get_prefs, mock_set_pref, mock_write_sentry
-    ):
-        mock_get_prefs.return_value = SeerRawPreferenceResponse(preference=None)
-
-        result = _resolve_project_preference(self.organization, self.project, [])
-
-        assert result is not None
         assert result.repositories == []
+        assert result.automated_run_stopping_point == "open_pr"
         mock_set_pref.assert_called_once()
         mock_write_sentry.assert_called_once()
 
@@ -1220,7 +1197,7 @@ def test_creates_preference_with_empty_repos_when_no_fallback(
     def test_returns_none_on_get_api_error(self, mock_get_prefs, mock_set_pref, mock_write_sentry):
         mock_get_prefs.side_effect = SeerApiError("test error", 500)
 
-        result = _resolve_project_preference(self.organization, self.project, [self._mock_repo()])
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is None
         mock_set_pref.assert_not_called()
@@ -1233,7 +1210,7 @@ def test_returns_none_on_set_api_error(self, mock_get_prefs, mock_set_pref, mock
         mock_get_prefs.return_value = SeerRawPreferenceResponse(preference=None)
         mock_set_pref.side_effect = SeerApiError("test error", 500)
 
-        result = _resolve_project_preference(self.organization, self.project, [self._mock_repo()])
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is None
         mock_write_sentry.assert_not_called()
@@ -1247,10 +1224,11 @@ def test_returns_preference_on_sentry_db_write_error(
         mock_get_prefs.return_value = SeerRawPreferenceResponse(preference=None)
         mock_write_sentry.side_effect = Exception()
 
-        result = _resolve_project_preference(self.organization, self.project, [self._mock_repo()])
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is not None
         assert result.project_id == self.project.id
+        assert result.repositories == []
         mock_set_pref.assert_called_once()
         mock_write_sentry.assert_called_once()
 
@@ -1263,17 +1241,14 @@ def test_reads_from_sentry_db(
         self, mock_get_prefs, mock_read_db, mock_set_pref, mock_write_sentry
     ):
         """When feature flag enabled, reads preferences from Sentry DB instead of Seer API."""
-        existing_repos = [self._mock_repo("seer", "999")]
         mock_read_db.return_value = SeerProjectPreference(
             organization_id=self.organization.id,
             project_id=self.project.id,
-            repositories=existing_repos,
+            repositories=[self._mock_repo("seer", "999")],
             automated_run_stopping_point="root_cause",
         )
 
-        result = _resolve_project_preference(
-            self.organization, self.project, [self._mock_repo("sentry", "123")]
-        )
+        result = _resolve_project_preference(self.organization, self.project)
 
         assert result is not None
         assert result.repositories[0].name == "seer"