chore(launchpad): Simplify launchpad upload logic (#97435)

Create the preprod artifact row without file id set. Then pass it to the
background task that can set the value post file assembly

Also:
- No longer poll while the file is being assembled
- No longer worry about saving assemble status values (not used anymore)
- Return artifact id still

Author: NicoHinderling

src/sentry/preprod/api/endpoints/organization_preprod_artifact_assemble.py

@@ -13,13 +13,8 @@
 from sentry.debug_files.upload import find_missing_chunks
 from sentry.models.orgauthtoken import is_org_auth_token_auth, update_org_auth_token_last_used
 from sentry.preprod.analytics import PreprodArtifactApiAssembleEvent
-from sentry.preprod.tasks import assemble_preprod_artifact
-from sentry.tasks.assemble import (
-    AssembleTask,
-    ChunkFileState,
-    get_assemble_status,
-    set_assemble_status,
-)
+from sentry.preprod.tasks import assemble_preprod_artifact, create_preprod_artifact
+from sentry.tasks.assemble import ChunkFileState
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
 
 
@@ -121,29 +116,39 @@ def post(self, request: Request, project) -> Response:
                     }
                 )
 
-            # Check current assembly status
-            state, detail = get_assemble_status(AssembleTask.PREPROD_ARTIFACT, project.id, checksum)
-            if state is not None:
-                return Response({"state": state, "detail": detail, "missingChunks": []})
-
             # There is neither a known file nor a cached state, so we will
             # have to create a new file.  Assure that there are checksums.
             # If not, we assume this is a poll and report NOT_FOUND
             if not chunks:
                 return Response({"state": ChunkFileState.NOT_FOUND, "missingChunks": []})
 
-            set_assemble_status(
-                AssembleTask.PREPROD_ARTIFACT, project.id, checksum, ChunkFileState.CREATED
+            artifact_id = create_preprod_artifact(
+                org_id=project.organization_id,
+                project_id=project.id,
+                checksum=checksum,
+                build_configuration=data.get("build_configuration"),
             )
+
+            if artifact_id is None:
+                return Response(
+                    {
+                        "state": ChunkFileState.ERROR,
+                        "detail": "Failed to create preprod artifact row.",
+                    }
+                )
+
             assemble_preprod_artifact.apply_async(
                 kwargs={
                     "org_id": project.organization_id,
                     "project_id": project.id,
                     "checksum": checksum,
                     "chunks": chunks,
+                    "artifact_id": artifact_id,
                 }
             )
             if is_org_auth_token_auth(request.auth):
                 update_org_auth_token_last_used(request.auth, [project.id])
 
-        return Response({"state": ChunkFileState.CREATED, "missingChunks": []})
+        return Response(
+            {"state": ChunkFileState.OK, "missingChunks": [], "artifactId": artifact_id}
+        )

src/sentry/preprod/tasks.py

@@ -50,6 +50,7 @@ def assemble_preprod_artifact(
     project_id,
     checksum,
     chunks,
+    artifact_id,
     **kwargs,
 ) -> None:
     """
@@ -70,10 +71,6 @@ def assemble_preprod_artifact(
         project = Project.objects.get(id=project_id, organization=organization)
         bind_organization_context(organization)
 
-        set_assemble_status(
-            AssembleTask.PREPROD_ARTIFACT, project_id, checksum, ChunkFileState.ASSEMBLING
-        )
-
         assemble_result = assemble_file(
             task=AssembleTask.PREPROD_ARTIFACT,
             org_or_project=project,
@@ -84,23 +81,29 @@ def assemble_preprod_artifact(
         )
 
         if assemble_result is None:
-            # Shouldn't we treat this as an error?
-            logger.warning(
-                "Assemble result is None, returning early",
-                extra={
-                    "project_id": project_id,
-                    "organization_id": org_id,
-                    "checksum": checksum,
-                },
+            raise RuntimeError(
+                f"Assemble result is None for preprod artifact assembly (project_id={project_id}, organization_id={org_id}, checksum={checksum}, preprod_artifact_id={artifact_id})"
             )
-            return
 
-        create_preprod_artifact(
-            org_id=org_id,
-            project_id=project_id,
-            checksum=checksum,
+        logger.info(
+            "Finished preprod artifact assembly",
+            extra={
+                "project_id": project_id,
+                "organization_id": org_id,
+                "checksum": checksum,
+                "preprod_artifact_id": artifact_id,
+            },
+        )
+
+        PreprodArtifact.objects.filter(id=artifact_id).update(
             file_id=assemble_result.bundle.id,
-            build_configuration=kwargs.get("build_configuration"),
+            state=PreprodArtifact.ArtifactState.UPLOADED,
+        )
+
+        produce_preprod_artifact_to_kafka(
+            project_id=project_id,
+            organization_id=org_id,
+            artifact_id=artifact_id,
         )
 
     except Exception as e:
@@ -111,22 +114,18 @@ def assemble_preprod_artifact(
                 "project_id": project_id,
                 "organization_id": org_id,
                 "checksum": checksum,
+                "preprod_artifact_id": artifact_id,
             },
         )
-        set_assemble_status(
-            AssembleTask.PREPROD_ARTIFACT,
-            project_id,
-            checksum,
-            ChunkFileState.ERROR,
-            detail=str(e),
+        PreprodArtifact.objects.filter(id=artifact_id).update(
+            state=PreprodArtifact.ArtifactState.FAILED
         )
         return
 
-    # Mark assembly as successful since the artifact was created successfully
-    set_assemble_status(AssembleTask.PREPROD_ARTIFACT, project_id, checksum, ChunkFileState.OK)
     logger.info(
-        "Finished preprod artifact assembly",
+        "Finished preprod artifact row creation and kafka dispatch",
         extra={
+            "preprod_artifact_id": artifact_id,
             "project_id": project_id,
             "organization_id": org_id,
             "checksum": checksum,
@@ -138,53 +137,50 @@ def create_preprod_artifact(
     org_id,
     project_id,
     checksum,
-    file_id,
     build_configuration=None,
-):
-    organization = Organization.objects.get_from_cache(pk=org_id)
-    project = Project.objects.get(id=project_id, organization=organization)
-    bind_organization_context(organization)
+) -> str | None:
+    try:
+        organization = Organization.objects.get_from_cache(pk=org_id)
+        project = Project.objects.get(id=project_id, organization=organization)
+        bind_organization_context(organization)
 
-    with transaction.atomic(router.db_for_write(PreprodArtifact)):
-        build_config = None
-        if build_configuration:
-            build_config, _ = PreprodBuildConfiguration.objects.get_or_create(
+        with transaction.atomic(router.db_for_write(PreprodArtifact)):
+            build_config = None
+            if build_configuration:
+                build_config, _ = PreprodBuildConfiguration.objects.get_or_create(
+                    project=project,
+                    name=build_configuration,
+                )
+
+            preprod_artifact, _ = PreprodArtifact.objects.get_or_create(
                 project=project,
-                name=build_configuration,
+                build_configuration=build_config,
+                state=PreprodArtifact.ArtifactState.UPLOADING,
             )
 
-        preprod_artifact, _ = PreprodArtifact.objects.get_or_create(
-            project=project,
-            file_id=file_id,
-            build_configuration=build_config,
-            state=PreprodArtifact.ArtifactState.UPLOADED,
-        )
+            logger.info(
+                "Created preprod artifact row",
+                extra={
+                    "preprod_artifact_id": preprod_artifact.id,
+                    "project_id": project_id,
+                    "organization_id": org_id,
+                    "checksum": checksum,
+                },
+            )
 
-        logger.info(
-            "Created preprod artifact",
+            return str(preprod_artifact.id)
+
+    except Exception as e:
+        sentry_sdk.capture_exception(e)
+        logger.exception(
+            "Failed to create preprod artifact row",
             extra={
-                "preprod_artifact_id": preprod_artifact.id,
                 "project_id": project_id,
                 "organization_id": org_id,
                 "checksum": checksum,
             },
         )
-
-    produce_preprod_artifact_to_kafka(
-        project_id=project_id,
-        organization_id=org_id,
-        artifact_id=preprod_artifact.id,
-    )
-
-    logger.info(
-        "Finished preprod artifact row creation and kafka dispatch",
-        extra={
-            "preprod_artifact_id": preprod_artifact.id,
-            "project_id": project_id,
-            "organization_id": org_id,
-            "checksum": checksum,
-        },
-    )
+        return None
 
 
 def _assemble_preprod_artifact_file(
@@ -262,7 +258,7 @@ def _assemble_preprod_artifact_size_analysis(
         logger.exception(
             "PreprodArtifact not found during size analysis assembly",
             extra={
-                "artifact_id": artifact_id,
+                "preprod_artifact_id": artifact_id,
                 "project_id": project.id,
                 "organization_id": org_id,
             },