Merge branch 'webb/typesafe-response-model' into webb/typesafe-gen-ai-input-messages

Author: alexander-alderman-webb

.github/workflows/test-integrations-ai.yml

@@ -69,6 +69,10 @@ jobs:
         run: |
           set -x # print commands that are executed
           ./scripts/runtox.sh "py${{ matrix.python-version }}-openai-notiktoken"
+      - name: Test typesafe
+        run: |
+          set -x # print commands that are executed
+          ./scripts/runtox.sh "py${{ matrix.python-version }}-typesafe"
       - name: Upload coverage data
         if: ${{ !cancelled() }}
         continue-on-error: true

pyproject.toml

@@ -81,6 +81,7 @@ typing = [
     "aiohttp>=3.14.3",
     "openai-agents>=0.22.0",
     "mistralai>=2.10.1",
+    "typesafe-sdk>=0.7.2",
 ]
 test = [
     "dataclasses ; python_full_version < '3.7'",

sentry_sdk/integrations/typesafe.py

@@ -184,7 +184,6 @@ def wrap_system_one(self: "TypeSafeClient", *args: "Any", **kwargs: "Any") -> "A
                 name=f"evaluate {model}".strip(),
                 origin=TypeSafeIntegration.origin,
             )
-            span.__enter__()
             span.set_data(SPANDATA.GEN_AI_PROVIDER_NAME, "typesafe")
             span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "evaluate")
             set_on_span = span.set_data
@@ -212,6 +211,8 @@ def wrap_system_one(self: "TypeSafeClient", *args: "Any", **kwargs: "Any") -> "A
             if not isinstance(response, SystemOneResponse):
                 return response
 
+            set_on_span(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model)
+
             return response
 
     return wrap_system_one
@@ -252,7 +253,6 @@ async def wrap_system_one_async(
                 name=f"evaluate {model}".strip(),
                 origin=TypeSafeIntegration.origin,
             )
-            span.__enter__()
             span.set_data(SPANDATA.GEN_AI_PROVIDER_NAME, "typesafe")
             span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "evaluate")
             set_on_span = span.set_data
@@ -280,6 +280,8 @@ async def wrap_system_one_async(
             if not isinstance(response, SystemOneResponse):
                 return response
 
+            set_on_span(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model)
+
             return response
 
     return wrap_system_one_async