Move tooling versions out of UpdateData and to respective Android/AppleAppInfoModels.

Author: runningcode

src/launchpad/api/update_api_models.py

@@ -37,7 +37,11 @@ class PutSizePending(BaseModel):
 ]
 
 
-class AppleAppInfo(BaseModel):
+class BaseAppInfo(BaseModel):
+    cli_version: Optional[str] = Field(None, description="sentry-cli version used for uploading")
+
+
+class AppleAppInfo(BaseAppInfo):
     is_simulator: bool
     codesigning_type: Optional[str] = None
     profile_name: Optional[str] = None
@@ -48,10 +52,16 @@ class AppleAppInfo(BaseModel):
     certificate_expiration_date: Optional[str] = None
     missing_dsym_binaries: Optional[List[str]] = None
     build_date: Optional[str] = None
+    fastlane_plugin_version: Optional[str] = Field(
+        None, description="Fastlane plugin version used for uploading"
+    )
 
 
-class AndroidAppInfo(BaseModel):
+class AndroidAppInfo(BaseAppInfo):
     has_proguard_mapping: bool
+    gradle_plugin_version: Optional[str] = Field(
+        None, description="Gradle plugin version used for uploading"
+    )
 
 
 class UpdateData(BaseModel):
@@ -63,13 +73,6 @@ class UpdateData(BaseModel):
     apple_app_info: Optional[AppleAppInfo] = None
     android_app_info: Optional[AndroidAppInfo] = None
     dequeued_at: Optional[datetime] = Field(None, description="Timestamp when message was dequeued from Kafka")
-    cli_version: Optional[str] = Field(None, description="sentry-cli version extracted from .sentry-cli-metadata.txt")
-    fastlane_plugin_version: Optional[str] = Field(
-        None, description="Fastlane plugin version extracted from .sentry-cli-metadata.txt"
-    )
-    gradle_plugin_version: Optional[str] = Field(
-        None, description="Gradle plugin version extracted from .sentry-cli-metadata.txt"
-    )
 
     @field_serializer("dequeued_at")
     def serialize_datetime(self, dt: datetime | None) -> str | None:

src/launchpad/artifact_processor.py

@@ -442,12 +442,16 @@ def _get_artifact_type(artifact: Artifact) -> ArtifactType:
                 certificate_expiration_date=app_info.certificate_expiration_date,
                 missing_dsym_binaries=app_info.missing_dsym_binaries,
                 build_date=app_info.build_date,
+                cli_version=app_info.cli_version,
+                fastlane_plugin_version=app_info.fastlane_plugin_version,
             )
 
         android_app_info = None
         if isinstance(app_info, AndroidAppInfo):
             android_app_info = AndroidAppInfoModel(
                 has_proguard_mapping=app_info.has_proguard_mapping,
+                cli_version=app_info.cli_version,
+                gradle_plugin_version=app_info.gradle_plugin_version,
             )
 
         update_data = UpdateData(
@@ -459,9 +463,6 @@ def _get_artifact_type(artifact: Artifact) -> ArtifactType:
             apple_app_info=apple_app_info,
             android_app_info=android_app_info,
             dequeued_at=dequeued_at,
-            cli_version=app_info.cli_version,
-            fastlane_plugin_version=app_info.fastlane_plugin_version,
-            gradle_plugin_version=app_info.gradle_plugin_version,
         )
 
         return update_data.model_dump(exclude_none=True)

src/launchpad/size/models/android.py

@@ -30,6 +30,9 @@ class AndroidAppInfo(BaseAppInfo):
     model_config = ConfigDict(frozen=True)
 
     has_proguard_mapping: bool = Field(default=False, description="Whether the app has a proguard mapping file")
+    gradle_plugin_version: str | None = Field(
+        None, description="Gradle plugin version used for uploading"
+    )
 
 
 class AndroidAnalysisResults(BaseAnalysisResults):

src/launchpad/size/models/apple.py

@@ -70,6 +70,9 @@ class AppleAppInfo(BaseAppInfo):
     missing_dsym_binaries: List[str] = Field(
         default_factory=list, description="List of binary names that don't have corresponding dSYM files"
     )
+    fastlane_plugin_version: str | None = Field(
+        None, description="Fastlane plugin version used for uploading"
+    )
 
 
 class AppleInsightResults(BaseModel):

src/launchpad/size/models/common.py

@@ -28,13 +28,7 @@ class BaseAppInfo(BaseModel):
     version: str = Field(..., description="App version")
     build: str = Field(..., description="Build number")
     app_id: str = Field(..., description="App ID (bundle id on iOS, package name on Android)")
-    cli_version: str | None = Field(None, description="sentry-cli version extracted from .sentry-cli-metadata.txt")
-    fastlane_plugin_version: str | None = Field(
-        None, description="Fastlane plugin version extracted from .sentry-cli-metadata.txt"
-    )
-    gradle_plugin_version: str | None = Field(
-        None, description="Gradle plugin version extracted from .sentry-cli-metadata.txt"
-    )
+    cli_version: str | None = Field(None, description="sentry-cli version used for uploading")
 
 
 class FileAnalysis(BaseModel):

src/launchpad/utils/metadata_extractor.py

@@ -1,5 +1,3 @@
-"""Utility for extracting metadata from .sentry-cli-metadata.txt files in artifacts."""
-
 import zipfile
 
 from pathlib import Path
@@ -23,10 +21,6 @@ def __init__(
         self.fastlane_plugin_version = fastlane_plugin_version
         self.gradle_plugin_version = gradle_plugin_version
 
-    def __repr__(self) -> str:
-        return f"ToolingMetadata(cli_version={self.cli_version}, fastlane_plugin_version={self.fastlane_plugin_version}, gradle_plugin_version={self.gradle_plugin_version})"
-
-
 def extract_metadata_from_zip(zip_path: Path) -> ToolingMetadata:
     try:
         with zipfile.ZipFile(zip_path, "r") as zf: