fix deploy

Author: maplethorpej

app/celery_app.py

@@ -4,13 +4,17 @@
 import sentry_sdk
 from celery import Celery
 
+from utils.sentry import integration_options as sentry_integration_options
+
 SENTRY_DSN = "https://[email protected]/4510944527515648"
 DEVELOPMENT = os.getenv("DEVELOPMENT", 0)
 
+
 if not DEVELOPMENT:
     sentry_sdk.init(
         dsn=SENTRY_DSN,
         send_default_pii=True,
+        **sentry_integration_options(),
     )
 
 REDIS_URL = os.getenv("REDIS_URL", "redis://redis:6379/0")

app/main.py

@@ -5,6 +5,7 @@
 from sqlalchemy import create_engine
 
 from utils.consts import DATABASE_URL, DEVELOPMENT, APP_HOST
+from utils.sentry import integration_options as sentry_integration_options
 from api import user, resources, item, item_lifecycle, benchmark, trip, category, pack, kit, hiker_profile, webhook
 
 ENGINE_KWARGS = dict(
@@ -26,6 +27,7 @@
         # Add data like request headers and IP for users,
         # see https://docs.sentry.io/platforms/python/data-management/data-collected/ for more info
         send_default_pii=True,
+        **sentry_integration_options(),
     )
 
 app = FastAPI()

app/utils/sentry.py

@@ -0,0 +1,18 @@
+"""Sentry init options shared by the API process and the Celery worker."""
+
+
+def integration_options() -> dict:
+    """Keep Sentry's auto-enabled OpenAI integration from importing openai.
+
+    Auto-enabled integrations import their target library at startup. The API
+    never uses openai, but an incompatible release on disk (3.x, which needs
+    httpx2 and breaks under pydantic<2) took the whole process down through
+    this hook. The integration module itself imports openai at import time,
+    so if even that fails, fall back to disabling auto-enabling entirely
+    rather than crash.
+    """
+    try:
+        from sentry_sdk.integrations.openai import OpenAIIntegration
+    except Exception:
+        return {"auto_enabling_integrations": False}
+    return {"disabled_integrations": [OpenAIIntegration()]}

requirements.txt

@@ -3,7 +3,9 @@ requests==2.31.0
 passlib==1.7.2
 google-auth
 cryptography
-openai
+# 3.x switched to httpx2, which breaks under pydantic<2 at import time. Only
+# ai/sanitize.py uses this; the API itself never imports it.
+openai<3
 python-dotenv==1.0.0
 
 psycopg2-binary==2.9.9