fix merge conflicts

Author: roggenkemper

src/sentry/seer/explorer/index_data.py

@@ -146,7 +146,7 @@ def get_trace_for_transaction(transaction_name: str, project_id: int) -> TraceDa
         auto_fields=True,
     )
 
-    # Step 1: Get a trace ID for the transaction
+    # Step 1: Get a random trace ID for the transaction
     escaped_transaction_name = UNESCAPED_QUOTE_RE.sub('\\"', transaction_name)
     traces_result = Spans.run_table_query(
         params=snuba_params,
@@ -196,7 +196,7 @@ def get_trace_for_transaction(transaction_name: str, project_id: int) -> TraceDa
     )
 
     # Step 3: Build span objects
-    spans: list[Span] = []
+    spans = []
     for row in spans_result.get("data", []):
         span_id = row.get("span_id")
         parent_span_id = row.get("parent_span")

src/sentry/tasks/llm_issue_detection.py

@@ -9,7 +9,7 @@
 from django.conf import settings
 from pydantic import BaseModel
 
-from sentry import options
+from sentry import features, options
 from sentry.issues.grouptype import LLMDetectedExperimentalGroupType
 from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
 from sentry.issues.producer import PayloadType, produce_occurrence_to_kafka
@@ -181,7 +181,14 @@ def detect_llm_issues_for_project(project_id: int) -> None:
     Process a single project for LLM issue detection.
     """
     project = Project.objects.get_from_cache(id=project_id)
-    organization_id = project.organization_id
+    organization = project.organization
+    organization_id = organization.id
+
+    has_access = features.has("organizations:gen-ai-features", organization) and not bool(
+        organization.get_option("sentry:hide_ai_features")
+    )
+    if not has_access:
+        return
 
     transactions = get_transactions_for_project(
         project_id, limit=50, start_time_delta={"minutes": 30}

src/sentry/tasks/llm_issue_detection/detection.py

@@ -47,7 +47,7 @@ def test_detect_llm_issues_no_transactions(self, mock_get_transactions):
         )
 
     @with_feature("organizations:gen-ai-features")
-    @patch("sentry.tasks.llm_issue_detection.detection.get_trace_for_transaction")
+    @patch("sentry.tasks.llm_issue_detection.detection.get_evidence_trace_for_llm_detection")
     @patch("sentry.tasks.llm_issue_detection.detection.get_transactions_for_project")
     @patch("sentry.tasks.llm_issue_detection.detection.random.shuffle")
     def test_detect_llm_issues_no_traces(self, mock_shuffle, mock_get_transactions, mock_get_trace):
@@ -157,14 +157,14 @@ def test_create_issue_occurrence_without_missing_telemetry(self, mock_produce_oc
         assert evidence_names == {"Explanation", "Impact", "Evidence"}
 
     @with_feature("organizations:gen-ai-features")
-    @patch("sentry.tasks.llm_issue_detection.produce_occurrence_to_kafka")
-    @patch("sentry.tasks.llm_issue_detection.make_signed_seer_api_request")
-    @patch("sentry.tasks.llm_issue_detection.get_trace_for_transaction")
-    @patch("sentry.tasks.llm_issue_detection.get_transactions_for_project")
-    @patch("sentry.tasks.llm_issue_detection.random.sample")
+    @patch("sentry.tasks.llm_issue_detection.detection.produce_occurrence_to_kafka")
+    @patch("sentry.tasks.llm_issue_detection.detection.make_signed_seer_api_request")
+    @patch("sentry.tasks.llm_issue_detection.detection.get_evidence_trace_for_llm_detection")
+    @patch("sentry.tasks.llm_issue_detection.detection.get_transactions_for_project")
+    @patch("sentry.tasks.llm_issue_detection.detection.random.shuffle")
     def test_detect_llm_issues_full_flow(
         self,
-        mock_sample,
+        mock_shuffle,
         mock_get_transactions,
         mock_get_trace,
         mock_seer_request,
@@ -175,7 +175,7 @@ def test_detect_llm_issues_full_flow(
         mock_transaction.name = "api/users/list"
         mock_transaction.project_id = self.project.id
         mock_get_transactions.return_value = [mock_transaction]
-        mock_sample.side_effect = lambda x, n: x
+        mock_shuffle.return_value = None
 
         mock_span = EvidenceSpan(
             span_id="span123",