Update to latest practices

Author: rbro112

src/sentry/objectstore/__init__.py

@@ -36,6 +36,9 @@ def distribution(
 _ATTACHMENTS_CLIENT: Client | None = None
 _ATTACHMENTS_USECASE = Usecase("attachments", expiration_policy=TimeToLive(timedelta(days=30)))
 
+_PREPROD_CLIENT: Client | None = None
+_PREPROD_USECASE = Usecase("preprod", expiration_policy=TimeToLive(timedelta(days=30)))
+
 
 def get_attachments_session(org: int, project: int) -> Session:
     global _ATTACHMENTS_CLIENT
@@ -49,3 +52,17 @@ def get_attachments_session(org: int, project: int) -> Session:
         )
 
     return _ATTACHMENTS_CLIENT.session(_ATTACHMENTS_USECASE, org=org, project=project)
+
+
+def get_preprod_session(org: int, project: int) -> Session:
+    global _PREPROD_CLIENT
+    if not _PREPROD_CLIENT:
+        from sentry import options as options_store
+
+        options = options_store.get("objectstore.config")
+        _PREPROD_CLIENT = Client(
+            options["base_url"],
+            metrics_backend=SentryMetricsBackend(),
+        )
+
+    return _PREPROD_CLIENT.session(_PREPROD_USECASE, org=org, project=project)

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

@@ -3,54 +3,19 @@
 import logging
 
 from django.http import HttpResponse
+from objectstore_client import ClientError
 from rest_framework.request import Request
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint
 from sentry.models.project import Project
-from sentry.objectstore import preprod
-from sentry.objectstore.service import ClientError
+from sentry.objectstore import get_preprod_session
 
 logger = logging.getLogger(__name__)
 
 
-def detect_image_content_type(image_data: bytes) -> str:
-    if not image_data:
-        return "application/octet-stream"
-
-    # Check magic bytes for common image formats
-    if image_data[:8] == b"\x89PNG\r\n\x1a\n":
-        return "image/png"
-    elif image_data[:3] == b"\xff\xd8\xff":
-        return "image/jpeg"
-    elif image_data[:4] == b"RIFF" and image_data[8:12] == b"WEBP":
-        return "image/webp"
-    elif image_data[:2] in (b"BM", b"BA", b"CI", b"CP", b"IC", b"PT"):
-        return "image/bmp"
-    elif image_data[:6] in (b"GIF87a", b"GIF89a"):
-        return "image/gif"
-    elif image_data[:4] == b"\x00\x00\x01\x00":
-        return "image/x-icon"
-    elif len(image_data) >= 12 and image_data[4:12] in (b"ftypavif", b"ftypavis"):
-        return "image/avif"
-    elif len(image_data) >= 12 and image_data[4:12] in (
-        b"ftypheic",
-        b"ftypheix",
-        b"ftyphevc",
-        b"ftyphevx",
-    ):
-        return "image/heic"
-
-    # Default to generic binary if we can't detect the type
-    logger.warning(
-        "Could not detect image content type from magic bytes",
-        extra={"first_bytes": image_data[:16].hex() if len(image_data) >= 16 else image_data.hex()},
-    )
-    return "application/octet-stream"
-
-
 @region_silo_endpoint
 class ProjectPreprodArtifactImageEndpoint(ProjectEndpoint):
     owner = ApiOwner.EMERGE_TOOLS
@@ -69,16 +34,15 @@ def get(
         project_id = project.id
 
         object_key = f"{organization_id}/{project_id}/{image_id}"
-        client = preprod.for_project(organization_id, project_id)
+        session = get_preprod_session(organization_id, project_id)
 
         try:
-            result = client.get(object_key)
+            result = session.get(object_key)
             # Read the entire stream at once (necessary for content_type)
             image_data = result.payload.read()
 
             # Detect content type from the image data
-            content_type = detect_image_content_type(image_data)
-            return HttpResponse(image_data, content_type=content_type)
+            return HttpResponse(image_data, content_type=result.metadata.content_type)
 
         except ClientError as e:
             if e.status == 404: