ref(preprod): Remove solo format, use single function for all cases

Remove format_snapshot_pr_comment_solo in favor of handling the no-base
case within format_snapshot_pr_comment. When there's no base artifact,
the same comparison table is shown with "N uploaded" in the status
column, matching how size analysis handles missing bases.

Author: runningcode

src/sentry/preprod/vcs/pr_comments/snapshot_templates.py

@@ -33,6 +33,15 @@ def format_snapshot_pr_comment(
             continue
 
         comparison = comparisons_map.get(metrics.id)
+        has_base = artifact.id in base_artifact_map
+
+        if not comparison and not has_base:
+            # No base to compare against — show snapshot count only
+            table_rows.append(
+                f"| {name_cell} | - | - | - | - | - | \u2705 {metrics.image_count} uploaded |"
+            )
+            continue
+
         if not comparison:
             table_rows.append(f"| {name_cell} | - | - | - | - | - | {_PROCESSING_STATUS} |")
             continue
@@ -81,33 +90,6 @@ def format_snapshot_pr_comment(
     return f"{_HEADER}\n\n{table_header}" + "\n".join(table_rows)
 
 
-def format_snapshot_pr_comment_solo(
-    artifacts: list[PreprodArtifact],
-    snapshot_metrics_map: dict[int, PreprodSnapshotMetrics],
-) -> str:
-    """Format a PR comment for snapshots without a base comparison."""
-    if not artifacts:
-        raise ValueError("Cannot format PR comment for empty artifact list")
-
-    table_rows = []
-
-    for artifact in artifacts:
-        app_display, app_id = _app_display_info(artifact)
-        artifact_url = get_preprod_artifact_url(artifact, view_type="snapshots")
-        name_cell = _format_name_cell(app_display, app_id, artifact_url)
-
-        metrics = snapshot_metrics_map.get(artifact.id)
-        if not metrics:
-            table_rows.append(f"| {name_cell} | - | {_PROCESSING_STATUS} |")
-            continue
-
-        table_rows.append(f"| {name_cell} | {metrics.image_count} | \u2705 Uploaded |")
-
-    table_header = "| Name | Snapshots | Status |\n| :--- | :---: | :---: |\n"
-
-    return f"{_HEADER}\n\n{table_header}" + "\n".join(table_rows)
-
-
 def _name_cell(
     artifact: PreprodArtifact,
     snapshot_metrics_map: dict[int, PreprodSnapshotMetrics],

tests/sentry/preprod/vcs/pr_comments/test_snapshot_templates.py

@@ -6,7 +6,6 @@
 from sentry.preprod.snapshots.models import PreprodSnapshotComparison, PreprodSnapshotMetrics
 from sentry.preprod.vcs.pr_comments.snapshot_templates import (
     format_snapshot_pr_comment,
-    format_snapshot_pr_comment_solo,
 )
 from sentry.testutils.cases import TestCase
 from sentry.testutils.silo import cell_silo_test
@@ -79,10 +78,6 @@ def test_empty_artifacts_raises(self) -> None:
         with pytest.raises(ValueError, match="Cannot format PR comment for empty artifact list"):
             format_snapshot_pr_comment([], {}, {}, {}, {})
 
-    def test_empty_solo_artifacts_raises(self) -> None:
-        with pytest.raises(ValueError, match="Cannot format PR comment for empty artifact list"):
-            format_snapshot_pr_comment_solo([], {})
-
 
 @cell_silo_test
 class FormatSnapshotPrCommentProcessingTest(SnapshotPrCommentTestBase):
@@ -98,10 +93,17 @@ def test_no_metrics_shows_processing(self) -> None:
         assert "Processing" in result
         assert "com.example.app" in result
 
-    def test_no_comparison_shows_processing(self) -> None:
-        artifact, metrics = self._create_artifact_with_metrics()
+    def test_no_comparison_with_base_shows_processing(self) -> None:
+        head_artifact, head_metrics = self._create_artifact_with_metrics()
+        base_artifact, _ = self._create_artifact_with_metrics(app_id="com.example.base")
 
-        result = format_snapshot_pr_comment([artifact], {artifact.id: metrics}, {}, {}, {})
+        result = format_snapshot_pr_comment(
+            [head_artifact],
+            {head_artifact.id: head_metrics},
+            {},
+            {head_artifact.id: base_artifact},
+            {},
+        )
 
         assert "Processing" in result
 
@@ -117,7 +119,7 @@ def test_pending_comparison_shows_processing(self) -> None:
             [head_artifact],
             {head_artifact.id: head_metrics},
             {head_metrics.id: comparison},
-            {},
+            {head_artifact.id: base_artifact},
             {},
         )
 
@@ -135,7 +137,7 @@ def test_processing_comparison_shows_processing(self) -> None:
             [head_artifact],
             {head_artifact.id: head_metrics},
             {head_metrics.id: comparison},
-            {},
+            {head_artifact.id: base_artifact},
             {},
         )
 
@@ -156,7 +158,7 @@ def test_failed_comparison_shows_failure(self) -> None:
             [head_artifact],
             {head_artifact.id: head_metrics},
             {head_metrics.id: comparison},
-            {},
+            {head_artifact.id: base_artifact},
             {},
         )
 
@@ -220,7 +222,6 @@ def test_changes_show_needs_approval(self) -> None:
         )
 
         assert "Needs approval" in result
-        # Counts with changes should be linked
         assert "?section=added" in result
         assert "?section=removed" in result
         assert "?section=changed" in result
@@ -344,29 +345,25 @@ def test_table_header_present(self) -> None:
 
 
 @cell_silo_test
-class FormatSnapshotPrCommentSoloTest(SnapshotPrCommentTestBase):
-    def test_solo_upload(self) -> None:
+class FormatSnapshotPrCommentNoBaseTest(SnapshotPrCommentTestBase):
+    def test_no_base_shows_uploaded_with_count(self) -> None:
         artifact, metrics = self._create_artifact_with_metrics(app_name="My App", image_count=15)
 
-        result = format_snapshot_pr_comment_solo([artifact], {artifact.id: metrics})
+        result = format_snapshot_pr_comment([artifact], {artifact.id: metrics}, {}, {}, {})
 
         assert "## Sentry Snapshot Testing" in result
-        assert "| Name | Snapshots | Status |" in result
+        assert "15 uploaded" in result
         assert "My App" in result
-        assert "| 15 |" in result
-        assert "Uploaded" in result
+        assert "`com.example.app`" in result
 
-    def test_solo_no_metrics_shows_processing(self) -> None:
-        artifact = self.create_preprod_artifact(
-            project=self.project,
-            app_id="com.example.app",
-        )
+    def test_no_base_uses_same_table_header(self) -> None:
+        artifact, metrics = self._create_artifact_with_metrics()
 
-        result = format_snapshot_pr_comment_solo([artifact], {})
+        result = format_snapshot_pr_comment([artifact], {artifact.id: metrics}, {}, {}, {})
 
-        assert "Processing" in result
+        assert "| Name | Added | Removed | Modified | Renamed | Unchanged | Status |" in result
 
-    def test_solo_multiple_artifacts(self) -> None:
+    def test_no_base_multiple_artifacts(self) -> None:
         artifacts = []
         metrics_map: dict[int, PreprodSnapshotMetrics] = {}
 
@@ -377,14 +374,16 @@ def test_solo_multiple_artifacts(self) -> None:
             artifacts.append(artifact)
             metrics_map[artifact.id] = metrics
 
-        result = format_snapshot_pr_comment_solo(artifacts, metrics_map)
+        result = format_snapshot_pr_comment(artifacts, metrics_map, {}, {}, {})
 
         assert "com.example.app0" in result
         assert "com.example.app1" in result
+        assert "5 uploaded" in result
+        assert "6 uploaded" in result
 
-    def test_app_id_shown_in_name_cell(self) -> None:
+    def test_no_base_app_id_shown(self) -> None:
         artifact, metrics = self._create_artifact_with_metrics(app_id="com.example.myapp")
 
-        result = format_snapshot_pr_comment_solo([artifact], {artifact.id: metrics})
+        result = format_snapshot_pr_comment([artifact], {artifact.id: metrics}, {}, {}, {})
 
         assert "`com.example.myapp`" in result