lmnr 0.7.14__py3-none-any.whl → 0.7.16__py3-none-any.whl

lmnr/opentelemetry_lib/decorators/__init__.py

@@ -225,7 +225,7 @@ def observe_base(
                 detach_context(isolated_ctx_token)
             # span will be ended in the generator
             if isinstance(res, types.GeneratorType):
-                return _handle_generator(span, ctx_token, res)
+                return _handle_generator(span, wrapper, res)
             if isinstance(res, types.AsyncGeneratorType):
                 # async def foo() -> AsyncGenerator[int, None]:
                 # is not considered async in a classical sense in Python,
@@ -234,7 +234,7 @@ def observe_base(
                 # Flags are listed from LSB here:
                 # https://docs.python.org/3/library/inspect.html#inspect-module-co-flags
                 # See also: https://groups.google.com/g/python-tulip/c/6rWweGXLutU?pli=1
-                return _ahandle_generator(span, ctx_token, res)
+                return _ahandle_generator(span, wrapper, res)
 
             _process_output(span, res, ignore_output, output_formatter)
             _cleanup_span(span, wrapper)
@@ -306,7 +306,7 @@ def async_observe_base(
             if isinstance(res, types.AsyncGeneratorType):
                 # probably unreachable, read the comment in the similar
                 # part of the sync wrapper.
-                return await _ahandle_generator(span, ctx_token, res)
+                return await _ahandle_generator(span, wrapper, res)
 
             _process_output(span, res, ignore_output, output_formatter)
             _cleanup_span(span, wrapper)
@@ -317,18 +317,37 @@ def async_observe_base(
     return decorate
 
 
-def _handle_generator(span: Span, wrapper: TracerWrapper, res: Generator):
+def _handle_generator(
+    span: Span,
+    wrapper: TracerWrapper,
+    res: Generator,
+    ignore_output: bool = False,
+    output_formatter: Callable[..., str] | None = None,
+):
+    results = []
     try:
-        yield from res
+        for part in res:
+            results.append(part)
+            yield part
     finally:
+        _process_output(span, results, ignore_output, output_formatter)
         _cleanup_span(span, wrapper)
 
 
-async def _ahandle_generator(span: Span, wrapper: TracerWrapper, res: AsyncGenerator):
+async def _ahandle_generator(
+    span: Span,
+    wrapper: TracerWrapper,
+    res: AsyncGenerator,
+    ignore_output: bool = False,
+    output_formatter: Callable[..., str] | None = None,
+):
+    results = []
     try:
         async for part in res:
+            results.append(part)
             yield part
     finally:
+        _process_output(span, results, ignore_output, output_formatter)
         _cleanup_span(span, wrapper)
 
 

lmnr/opentelemetry_lib/litellm/__init__.py

@@ -406,7 +406,15 @@ try:
                         details.get("cached_tokens"),
                     )
                 # TODO: add audio/image/text token details
-            # TODO: add completion tokens details (reasoning tokens)
+            if usage_dict.get("completion_tokens_details"):
+                details = usage_dict.get("completion_tokens_details", {})
+                details = model_as_dict(details)
+                if details.get("reasoning_tokens"):
+                    set_span_attribute(
+                        span,
+                        "gen_ai.usage.reasoning_tokens",
+                        details.get("reasoning_tokens"),
+                    )
 
         def _process_tool_calls(self, span, tool_calls, choice_index, is_response=True):
             """Process and set tool call attributes on the span"""
@@ -467,17 +475,56 @@ try:
                 content = message.get("content", "")
                 if content is None:
                     continue
+                reasoning_content = message.get("reasoning_content")
+                if reasoning_content:
+                    if isinstance(reasoning_content, str):
+                        reasoning_content = [
+                            {
+                                "type": "text",
+                                "text": reasoning_content,
+                            }
+                        ]
+                    elif not isinstance(reasoning_content, list):
+                        reasoning_content = [
+                            {
+                                "type": "text",
+                                "text": str(reasoning_content),
+                            }
+                        ]
+                else:
+                    reasoning_content = []
                 if isinstance(content, str):
-                    set_span_attribute(span, f"gen_ai.completion.{i}.content", content)
+                    if reasoning_content:
+                        set_span_attribute(
+                            span,
+                            f"gen_ai.completion.{i}.content",
+                            json.dumps(
+                                reasoning_content
+                                + [
+                                    {
+                                        "type": "text",
+                                        "text": content,
+                                    }
+                                ]
+                            ),
+                        )
+                    else:
+                        set_span_attribute(
+                            span,
+                            f"gen_ai.completion.{i}.content",
+                            content,
+                        )
                 elif isinstance(content, list):
                     set_span_attribute(
-                        span, f"gen_ai.completion.{i}.content", json.dumps(content)
+                        span,
+                        f"gen_ai.completion.{i}.content",
+                        json.dumps(reasoning_content + content),
                     )
                 else:
                     set_span_attribute(
                         span,
                         f"gen_ai.completion.{i}.content",
-                        json.dumps(model_as_dict(content)),
+                        json.dumps(reasoning_content + [model_as_dict(content)]),
                     )
 
         def _process_content_part(self, content_part: dict) -> dict:

lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py

@@ -272,6 +272,16 @@ def _set_response_attributes(span, response: types.GenerateContentResponse):
 
     if response.usage_metadata:
         usage_dict = to_dict(response.usage_metadata)
+        candidates_token_count = usage_dict.get("candidates_token_count")
+        # unlike OpenAI, and unlike input cached tokens, thinking tokens are
+        # not counted as part of candidates token count, so we need to add them
+        # separately for consistency with other instrumentations
+        thoughts_token_count = usage_dict.get("thoughts_token_count")
+        output_token_count = (
+            (candidates_token_count or 0) + (thoughts_token_count or 0)
+            if candidates_token_count is not None or thoughts_token_count is not None
+            else None
+        )
         set_span_attribute(
             span,
             gen_ai_attributes.GEN_AI_USAGE_INPUT_TOKENS,
@@ -280,7 +290,7 @@ def _set_response_attributes(span, response: types.GenerateContentResponse):
         set_span_attribute(
             span,
             gen_ai_attributes.GEN_AI_USAGE_OUTPUT_TOKENS,
-            usage_dict.get("candidates_token_count"),
+            output_token_count,
         )
         set_span_attribute(
             span,
@@ -292,6 +302,11 @@ def _set_response_attributes(span, response: types.GenerateContentResponse):
             SpanAttributes.LLM_USAGE_CACHE_READ_INPUT_TOKENS,
             usage_dict.get("cached_content_token_count"),
         )
+        set_span_attribute(
+            span,
+            SpanAttributes.LLM_USAGE_REASONING_TOKENS,
+            thoughts_token_count,
+        )
 
     if should_send_prompts():
         set_span_attribute(

lmnr/version.py

@@ -3,7 +3,7 @@ import httpx
 from packaging import version
 
 
-__version__ = "0.7.14"
+__version__ = "0.7.16"
 PYTHON_VERSION = f"{sys.version_info.major}.{sys.version_info.minor}"
 
 

{lmnr-0.7.14.dist-info → lmnr-0.7.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.7.14
+Version: 0.7.16
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>

{lmnr-0.7.14.dist-info → lmnr-0.7.16.dist-info}/RECORD

@@ -2,8 +2,8 @@ lmnr/__init__.py,sha256=8be7b56ab62735fd54ca90a0642784c6153ed1d6e0f12734619ca061
 lmnr/cli.py,sha256=b8780b51f37fe9e20db5495c41d3ad3837f6b48f408b09a58688d017850c0796,6047
 lmnr/opentelemetry_lib/.flake8,sha256=6c2c6e0e51b1dd8439e501ca3e21899277076a787da868d0254ba37056b79405,150
 lmnr/opentelemetry_lib/__init__.py,sha256=abdd649b6c906a7dd2985b5a0903067904a457341d0da28a559c89a9faf939c7,2572
-lmnr/opentelemetry_lib/decorators/__init__.py,sha256=d18206ae4e65147b3101b82b3bb7413f765149c5523616a6a06be1939b0878b8,11793
-lmnr/opentelemetry_lib/litellm/__init__.py,sha256=af1d6c1067c1d30b35f5bdfdbc7ad3565f1178a571fd770974c411fef7b5ff0f,27478
+lmnr/opentelemetry_lib/decorators/__init__.py,sha256=f7a19b40bf8f8145b6ff0a04e49e412ac52c3f850c330dec4a5087ead3aaf9e0,12264
+lmnr/opentelemetry_lib/litellm/__init__.py,sha256=b2e4ff664b15dcbad61db2248700aeca7926fe6f1c8d5f56f3ead150ee07f561,29450
 lmnr/opentelemetry_lib/litellm/utils.py,sha256=642c3857e09d8c8dfc327c23e711687c15cbed6c0ba3f0a7be7751356beb8b43,3427
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/__init__.py,sha256=897b1a255ce2370d196018abcaf5942295a374cf367b668a3b418c3bddd29251,26461
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/config.py,sha256=972919b821b9b7e5dc7cd191ba7e78b30b6efa5d63514e8cb301996d6386392c,369
@@ -16,7 +16,7 @@ lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/version.py,sha256
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/cua_agent/__init__.py,sha256=48391d935883506fe1dc4f6ace6011ecaed76a8f82f8026ccb553b2180afdb8c,3455
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/cua_computer/__init__.py,sha256=61d2681e99c3084d1bcc27f7ca551f44a70126df6c5f23320c1e9c1654e05c42,15037
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/cua_computer/utils.py,sha256=19090d4d9a0511645f66112ebe6f05a9993905b11d8ae3060dab2dcc4c1a5fb2,329
-lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py,sha256=e0f5283e5d960e91766c2658af12837e43772d7c23f13ee44365a145e891e6c4,19453
+lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py,sha256=a0037e5ed736e3124c7cd0af7eff6d2656a622d4b0a16785e2d2fb7d760f85a0,20163
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/config.py,sha256=db9cdebc9ee0dccb493ffe608eede3047efec20ed26c3924b72b2e50edbd92c2,245
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/schema_utils.py,sha256=b10619e76e5893f8b891f92531d29dcf6651e8f9a7dcbf81c3f35341ce311f6e,753
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/utils.py,sha256=2e1dc91b04757f7f6c960e3f1c58bb9f7e735f0e1dcb811a08833faf18766d3b,9242
@@ -97,8 +97,8 @@ lmnr/sdk/laminar.py,sha256=24adfd64da01d7fd69ba9437cf9860a5c64aa6baab1bb92d8ba14
 lmnr/sdk/log.py,sha256=9edfd83263f0d4845b1b2d1beeae2b4ed3f8628de941f371a893d72b79c348d4,2213
 lmnr/sdk/types.py,sha256=d8061ca90dd582b408a893ebbbeb1586e8750ed30433ef4f6d63423a078511b0,14574
 lmnr/sdk/utils.py,sha256=4114559ba6ae57fcba2de2bfaa09339688ce5752c36f028a7b55e51eae624947,6307
-lmnr/version.py,sha256=fdf6db3bfdec750eb7f9e086f1383d81089cece53220f95a2462f750866164cc,1322
-lmnr-0.7.14.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
-lmnr-0.7.14.dist-info/entry_points.txt,sha256=abdf3411b7dd2d7329a241f2da6669bab4e314a747a586ecdb9f888f3035003c,39
-lmnr-0.7.14.dist-info/METADATA,sha256=6d8d77fa8ee86053d6d0796676ebcbd09160e3c639a5ff040983169a030d8ad2,14195
-lmnr-0.7.14.dist-info/RECORD,,
+lmnr/version.py,sha256=cc6cc51d32104d432712f37c6215b60901c85269bf239b623a9d3d72dcd220f8,1322
+lmnr-0.7.16.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
+lmnr-0.7.16.dist-info/entry_points.txt,sha256=abdf3411b7dd2d7329a241f2da6669bab4e314a747a586ecdb9f888f3035003c,39
+lmnr-0.7.16.dist-info/METADATA,sha256=0405208ecd989926a7b75dd4fedbab4fbd010c126fca736e09673ea955efeed6,14195
+lmnr-0.7.16.dist-info/RECORD,,