Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions sentry_sdk/integrations/typesafe.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
try:
from typesafe_sdk._core.client.aio.client import AsyncTypeSafeClient
from typesafe_sdk._core.client.sync.client import TypeSafeClient
from typesafe_sdk._core.response_types import SystemOneResponse
except ImportError:
raise DidNotEnable("typesafe-sdk not installed")

Expand Down Expand Up @@ -70,7 +71,14 @@ def wrap_system_one(self: "TypeSafeClient", *args: "Any", **kwargs: "Any") -> "A
if model is not None:
set_on_span(SPANDATA.GEN_AI_REQUEST_MODEL, model)

return f(self, *args, **kwargs)
response = f(self, *args, **kwargs)

if not isinstance(response, SystemOneResponse):
return response

set_on_span(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model)

return response

return wrap_system_one

Expand Down Expand Up @@ -118,6 +126,13 @@ async def wrap_system_one_async(
if model is not None:
set_on_span(SPANDATA.GEN_AI_REQUEST_MODEL, model)

return await f(self, *args, **kwargs)
response = await f(self, *args, **kwargs)

if not isinstance(response, SystemOneResponse):
return response

set_on_span(SPANDATA.GEN_AI_RESPONSE_MODEL, response.model)

return response

return wrap_system_one_async
8 changes: 8 additions & 0 deletions tests/integrations/typesafe/test_typesafe.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ def test_system_one(
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "typesafe"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "evaluate"
assert span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL] == "jev-latest"

assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "jev-latest"
else:
items = capture_items("transaction")

Expand Down Expand Up @@ -159,6 +161,8 @@ def test_system_one(
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "evaluate"
assert span["data"][SPANDATA.GEN_AI_REQUEST_MODEL] == "jev-latest"

assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "jev-latest"


@pytest.mark.asyncio
@pytest.mark.parametrize("span_streaming", [True, False])
Expand Down Expand Up @@ -228,6 +232,8 @@ async def test_system_one_async(
assert span["attributes"][SPANDATA.GEN_AI_PROVIDER_NAME] == "typesafe"
assert span["attributes"][SPANDATA.GEN_AI_OPERATION_NAME] == "evaluate"
assert span["attributes"][SPANDATA.GEN_AI_REQUEST_MODEL] == "jev-latest"

assert span["attributes"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "jev-latest"
else:
items = capture_items("transaction")

Expand Down Expand Up @@ -272,3 +278,5 @@ async def test_system_one_async(
assert span["data"][SPANDATA.GEN_AI_PROVIDER_NAME] == "typesafe"
assert span["data"][SPANDATA.GEN_AI_OPERATION_NAME] == "evaluate"
assert span["data"][SPANDATA.GEN_AI_REQUEST_MODEL] == "jev-latest"

assert span["data"][SPANDATA.GEN_AI_RESPONSE_MODEL] == "jev-latest"
Loading