sentry-sdk 2.32.0__tar.gz → 2.33.0__tar.gz

{sentry_sdk-2.32.0/sentry_sdk.egg-info → sentry_sdk-2.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.32.0
+Version: 2.33.0
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/ai/monitoring.py

@@ -102,15 +102,19 @@ def record_token_usage(
     ai_pipeline_name = get_ai_pipeline_name()
     if ai_pipeline_name:
         span.set_data(SPANDATA.AI_PIPELINE_NAME, ai_pipeline_name)
+
     if prompt_tokens is not None:
-        span.set_measurement("ai_prompt_tokens_used", value=prompt_tokens)
+        span.set_data(SPANDATA.GEN_AI_USAGE_INPUT_TOKENS, prompt_tokens)
+
     if completion_tokens is not None:
-        span.set_measurement("ai_completion_tokens_used", value=completion_tokens)
+        span.set_data(SPANDATA.GEN_AI_USAGE_OUTPUT_TOKENS, completion_tokens)
+
     if (
         total_tokens is None
         and prompt_tokens is not None
         and completion_tokens is not None
     ):
         total_tokens = prompt_tokens + completion_tokens
+
     if total_tokens is not None:
-        span.set_measurement("ai_total_tokens_used", total_tokens)
+        span.set_data(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS, total_tokens)

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/consts.py

@@ -1181,4 +1181,4 @@ DEFAULT_OPTIONS = _get_default_options()
 del _get_default_options
 
 
-VERSION = "2.32.0"
+VERSION = "2.33.0"

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/integrations/langchain.py

@@ -23,6 +23,7 @@ try:
     from langchain_core.callbacks import (
         manager,
         BaseCallbackHandler,
+        BaseCallbackManager,
         Callbacks,
     )
     from langchain_core.agents import AgentAction, AgentFinish
@@ -434,12 +435,20 @@ def _wrap_configure(f):
                 **kwargs,
             )
 
-        callbacks_list = local_callbacks or []
-
-        if isinstance(callbacks_list, BaseCallbackHandler):
-            callbacks_list = [callbacks_list]
-        elif not isinstance(callbacks_list, list):
-            logger.debug("Unknown callback type: %s", callbacks_list)
+        local_callbacks = local_callbacks or []
+
+        # Handle each possible type of local_callbacks. For each type, we
+        # extract the list of callbacks to check for SentryLangchainCallback,
+        # and define a function that would add the SentryLangchainCallback
+        # to the existing callbacks list.
+        if isinstance(local_callbacks, BaseCallbackManager):
+            callbacks_list = local_callbacks.handlers
+        elif isinstance(local_callbacks, BaseCallbackHandler):
+            callbacks_list = [local_callbacks]
+        elif isinstance(local_callbacks, list):
+            callbacks_list = local_callbacks
+        else:
+            logger.debug("Unknown callback type: %s", local_callbacks)
             # Just proceed with original function call
             return f(
                 callback_manager_cls,
@@ -449,28 +458,38 @@ def _wrap_configure(f):
                 **kwargs,
             )
 
-        inheritable_callbacks_list = (
-            inheritable_callbacks if isinstance(inheritable_callbacks, list) else []
-        )
+        # Handle each possible type of inheritable_callbacks.
+        if isinstance(inheritable_callbacks, BaseCallbackManager):
+            inheritable_callbacks_list = inheritable_callbacks.handlers
+        elif isinstance(inheritable_callbacks, list):
+            inheritable_callbacks_list = inheritable_callbacks
+        else:
+            inheritable_callbacks_list = []
 
         if not any(
             isinstance(cb, SentryLangchainCallback)
             for cb in itertools.chain(callbacks_list, inheritable_callbacks_list)
         ):
-            # Avoid mutating the existing callbacks list
-            callbacks_list = [
-                *callbacks_list,
-                SentryLangchainCallback(
-                    integration.max_spans,
-                    integration.include_prompts,
-                    integration.tiktoken_encoding_name,
-                ),
-            ]
+            sentry_handler = SentryLangchainCallback(
+                integration.max_spans,
+                integration.include_prompts,
+                integration.tiktoken_encoding_name,
+            )
+            if isinstance(local_callbacks, BaseCallbackManager):
+                local_callbacks = local_callbacks.copy()
+                local_callbacks.handlers = [
+                    *local_callbacks.handlers,
+                    sentry_handler,
+                ]
+            elif isinstance(local_callbacks, BaseCallbackHandler):
+                local_callbacks = [local_callbacks, sentry_handler]
+            else:  # local_callbacks is a list
+                local_callbacks = [*local_callbacks, sentry_handler]
 
         return f(
             callback_manager_cls,
             inheritable_callbacks,
-            callbacks_list,
+            local_callbacks,
             *args,
             **kwargs,
         )

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/integrations/openai_agents/spans/ai_client.py

@@ -19,9 +19,10 @@ if TYPE_CHECKING:
 def ai_client_span(agent, get_response_kwargs):
     # type: (Agent, dict[str, Any]) -> sentry_sdk.tracing.Span
     # TODO-anton: implement other types of operations. Now "chat" is hardcoded.
+    model_name = agent.model.model if hasattr(agent.model, "model") else agent.model
     span = sentry_sdk.start_span(
         op=OP.GEN_AI_CHAT,
-        description=f"chat {agent.model}",
+        description=f"chat {model_name}",
         origin=SPAN_ORIGIN,
     )
     # TODO-anton: remove hardcoded stuff and replace something that also works for embedding and so on

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/integrations/openai_agents/utils.py

@@ -53,7 +53,8 @@ def _set_agent_data(span, agent):
         )
 
     if agent.model:
-        span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, agent.model)
+        model_name = agent.model.model if hasattr(agent.model, "model") else agent.model
+        span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
 
     if agent.model_settings.presence_penalty:
         span.set_data(

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/sentry_sdk/sessions.py

@@ -1,7 +1,6 @@
 import os
-import time
 import warnings
-from threading import Thread, Lock
+from threading import Thread, Lock, Event
 from contextlib import contextmanager
 
 import sentry_sdk
@@ -162,7 +161,7 @@ class SessionFlusher:
         self._thread_lock = Lock()
         self._aggregate_lock = Lock()
         self._thread_for_pid = None  # type: Optional[int]
-        self._running = True
+        self.__shutdown_requested = Event()
 
     def flush(self):
         # type: (...) -> None
@@ -208,10 +207,10 @@ class SessionFlusher:
 
             def _thread():
                 # type: (...) -> None
-                while self._running:
-                    time.sleep(self.flush_interval)
-                    if self._running:
-                        self.flush()
+                running = True
+                while running:
+                    running = not self.__shutdown_requested.wait(self.flush_interval)
+                    self.flush()
 
             thread = Thread(target=_thread)
             thread.daemon = True
@@ -220,7 +219,7 @@ class SessionFlusher:
             except RuntimeError:
                 # Unfortunately at this point the interpreter is in a state that no
                 # longer allows us to spawn a thread and we have to bail.
-                self._running = False
+                self.__shutdown_requested.set()
                 return None
 
             self._thread = thread
@@ -271,7 +270,7 @@ class SessionFlusher:
 
     def kill(self):
         # type: (...) -> None
-        self._running = False
+        self.__shutdown_requested.set()
 
     def __del__(self):
         # type: (...) -> None

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0/sentry_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sentry-sdk
-Version: 2.32.0
+Version: 2.33.0
 Summary: Python client for Sentry (https://sentry.io)
 Home-page: https://github.com/getsentry/sentry-python
 Author: Sentry Team and Contributors

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.32.0",
+    version="2.33.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/tests/test_api.py

@@ -24,7 +24,6 @@ from sentry_sdk import (
 from sentry_sdk.client import Client, NonRecordingClient
 
 
-@pytest.mark.forked
 def test_get_current_span():
     fake_scope = mock.MagicMock()
     fake_scope.span = mock.MagicMock()
@@ -34,7 +33,6 @@ def test_get_current_span():
     assert get_current_span(fake_scope) is None
 
 
-@pytest.mark.forked
 def test_get_current_span_default_hub(sentry_init):
     sentry_init()
 
@@ -47,7 +45,6 @@ def test_get_current_span_default_hub(sentry_init):
     assert get_current_span() == fake_span
 
 
-@pytest.mark.forked
 def test_get_current_span_default_hub_with_transaction(sentry_init):
     sentry_init()
 
@@ -57,7 +54,6 @@ def test_get_current_span_default_hub_with_transaction(sentry_init):
         assert get_current_span() == new_transaction
 
 
-@pytest.mark.forked
 def test_traceparent_with_tracing_enabled(sentry_init):
     sentry_init(traces_sample_rate=1.0)
 
@@ -69,7 +65,6 @@ def test_traceparent_with_tracing_enabled(sentry_init):
         assert get_traceparent() == expected_traceparent
 
 
-@pytest.mark.forked
 def test_traceparent_with_tracing_disabled(sentry_init):
     sentry_init()
 
@@ -81,7 +76,6 @@ def test_traceparent_with_tracing_disabled(sentry_init):
     assert get_traceparent() == expected_traceparent
 
 
-@pytest.mark.forked
 def test_baggage_with_tracing_disabled(sentry_init):
     sentry_init(release="1.0.0", environment="dev")
     propagation_context = get_isolation_scope()._propagation_context
@@ -93,7 +87,6 @@ def test_baggage_with_tracing_disabled(sentry_init):
     assert get_baggage() == expected_baggage
 
 
-@pytest.mark.forked
 def test_baggage_with_tracing_enabled(sentry_init):
     sentry_init(traces_sample_rate=1.0, release="1.0.0", environment="dev")
     with start_transaction() as transaction:
@@ -103,7 +96,6 @@ def test_baggage_with_tracing_enabled(sentry_init):
         assert re.match(expected_baggage_re, get_baggage())
 
 
-@pytest.mark.forked
 def test_continue_trace(sentry_init):
     sentry_init()
 
@@ -130,7 +122,6 @@ def test_continue_trace(sentry_init):
         }
 
 
-@pytest.mark.forked
 def test_is_initialized():
     assert not is_initialized()
 
@@ -139,7 +130,6 @@ def test_is_initialized():
     assert is_initialized()
 
 
-@pytest.mark.forked
 def test_get_client():
     client = get_client()
     assert client is not None

{sentry_sdk-2.32.0 → sentry_sdk-2.33.0}/tests/test_client.py

@@ -1297,7 +1297,6 @@ def test_error_sampler(_, sentry_init, capture_events, test_config):
         assert len(test_config.sampler_function_mock.call_args[0]) == 2
 
 
-@pytest.mark.forked
 @pytest.mark.parametrize(
     "opt,missing_flags",
     [
@@ -1342,6 +1341,8 @@ class TestSpanClientReports:
     Tests for client reports related to spans.
     """
 
+    __test__ = False
+
     @staticmethod
     def span_dropper(spans_to_drop):
         """