lmnr 0.6.12__py3-none-any.whl → 0.6.13__py3-none-any.whl

lmnr/opentelemetry_lib/litellm/__init__.py

@@ -347,7 +347,7 @@ try:
                 self._process_response_choices(span, response_dict.get("choices"))
 
 except ImportError as e:
-    logger.warning(f"LiteLLM callback unavailable: {e}")
+    logger.debug(f"LiteLLM callback unavailable: {e}")
 
     # Create a no-op logger when LiteLLM is not available
     class LaminarLiteLLMCallback:

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

@@ -12,7 +12,6 @@ from .config import (
     Config,
 )
 from .utils import (
-    ProcessedContentPart,
     dont_throw,
     get_content,
     role_from_content_union,
@@ -130,27 +129,30 @@ def _set_request_attributes(span, args, kwargs):
     )
 
     tools: list[types.FunctionDeclaration] = []
-    if kwargs.get("tools"):
-        for tool in kwargs.get("tools"):
+    arg_tools = config_dict.get("tools", kwargs.get("tools"))
+    if arg_tools:
+        for tool in arg_tools:
             if isinstance(tool, types.Tool):
                 tools += tool.function_declarations or []
             elif isinstance(tool, Callable):
                 tools.append(types.FunctionDeclaration.from_callable(tool))
+
     for tool_num, tool in enumerate(tools):
+        tool_dict = to_dict(tool)
         set_span_attribute(
             span,
             f"{SpanAttributes.LLM_REQUEST_FUNCTIONS}.{tool_num}.name",
-            to_dict(tool).get("name"),
+            tool_dict.get("name"),
         )
         set_span_attribute(
             span,
             f"{SpanAttributes.LLM_REQUEST_FUNCTIONS}.{tool_num}.description",
-            to_dict(tool).get("description"),
+            tool_dict.get("description"),
         )
         set_span_attribute(
             span,
             f"{SpanAttributes.LLM_REQUEST_FUNCTIONS}.{tool_num}.parameters",
-            to_dict(tool).get("parameters"),
+            json.dumps(tool_dict.get("parameters")),
         )
 
     if should_send_prompts():
@@ -162,7 +164,9 @@ def _set_request_attributes(span, args, kwargs):
             set_span_attribute(
                 span,
                 f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.content",
-                (get_content(process_content_union(system_instruction)) or {}).get("text", ""),
+                (get_content(process_content_union(system_instruction)) or {}).get(
+                    "text", ""
+                ),
             )
             set_span_attribute(
                 span, f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.role", "system"
@@ -174,6 +178,7 @@ def _set_request_attributes(span, args, kwargs):
         for content in contents:
             processed_content = process_content_union(content)
             content_str = get_content(processed_content)
+
             set_span_attribute(
                 span,
                 f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.content",
@@ -188,26 +193,35 @@ def _set_request_attributes(span, args, kwargs):
                 if isinstance(processed_content, list)
                 else [processed_content]
             )
-            for j, block in enumerate(blocks):
+            tool_call_index = 0
+            for block in blocks:
                 block_dict = to_dict(block)
+
                 if not block_dict.get("function_call"):
                     continue
                 function_call = to_dict(block_dict.get("function_call", {}))
+
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{j}.name",
+                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{tool_call_index}.name",
                     function_call.get("name"),
                 )
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{j}.id",
-                    function_call.get("id"),
+                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{tool_call_index}.id",
+                    (
+                        function_call.get("id")
+                        if function_call.get("id") is not None
+                        else function_call.get("name")
+                    ),  # google genai doesn't support tool call ids
                 )
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{j}.arguments",
+                    f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.tool_calls.{tool_call_index}.arguments",
                     json.dumps(function_call.get("arguments")),
                 )
+                tool_call_index += 1
+
             set_span_attribute(
                 span,
                 f"{gen_ai_attributes.GEN_AI_PROMPT}.{i}.role",
@@ -258,21 +272,8 @@ def _set_response_attributes(span, response: types.GenerateContentResponse):
         candidates_list = candidates if isinstance(candidates, list) else [candidates]
         for i, candidate in enumerate(candidates_list):
             processed_content = process_content_union(candidate.content)
-            if isinstance(processed_content, list):
-                if all(
-                    isinstance(item, dict) and item.get("type") == "text"
-                    for item in processed_content
-                ):
-                    content_str = processed_content[0]["text"]
-                elif all(
-                    isinstance(item, ProcessedContentPart) and item.content
-                    for item in processed_content
-                ):
-                    content_str = processed_content[0].content
-                else:
-                    content_str = get_content(processed_content)
-            else:
-                content_str = get_content(processed_content)
+            content_str = get_content(processed_content)
+
             set_span_attribute(
                 span, f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.role", "model"
             )
@@ -290,26 +291,33 @@ def _set_response_attributes(span, response: types.GenerateContentResponse):
                 if isinstance(processed_content, list)
                 else [processed_content]
             )
-            for j, block in enumerate(blocks):
+
+            tool_call_index = 0
+            for block in blocks:
                 block_dict = to_dict(block)
                 if not block_dict.get("function_call"):
                     continue
                 function_call = to_dict(block_dict.get("function_call", {}))
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{j}.name",
+                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{tool_call_index}.name",
                     function_call.get("name"),
                 )
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{j}.id",
-                    function_call.get("id"),
+                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{tool_call_index}.id",
+                    (
+                        function_call.get("id")
+                        if function_call.get("id") is not None
+                        else function_call.get("name")
+                    ),  # google genai doesn't support tool call ids
                 )
                 set_span_attribute(
                     span,
-                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{j}.arguments",
+                    f"{gen_ai_attributes.GEN_AI_COMPLETION}.{i}.tool_calls.{tool_call_index}.arguments",
                     json.dumps(function_call.get("arguments")),
                 )
+                tool_call_index += 1
 
 
 @dont_throw

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

@@ -1,3 +1,4 @@
+import base64
 import logging
 import traceback
 
@@ -74,7 +75,8 @@ def to_dict(obj: BaseModel | pydantic.BaseModel | dict) -> dict[str, Any]:
             return obj
         else:
             return dict(obj)
-    except Exception:
+    except Exception as e:
+        logging.error(f"Error converting to dict: {obj}, error: {e}")
         return dict(obj)
 
 
@@ -96,7 +98,7 @@ def get_content(
         else:
             return None
     elif isinstance(content, list):
-        return [get_content(item) or "" for item in content if item is not None]
+        return [get_content(item) for item in content]
     elif isinstance(content, str):
         return {
             "type": "text",
@@ -226,11 +228,15 @@ def _process_image_item(
     content_index: int,
 ) -> ProcessedContentPart | dict | None:
     # Convert to openai format, so backends can handle it
+    data = blob.get("data")
+    encoded_data = (
+        base64.b64encode(data).decode("utf-8") if isinstance(data, bytes) else data
+    )
     return (
         ProcessedContentPart(
             image_url=ImageUrl(
                 image_url=ImageUrlInner(
-                    url=f"data:image/{blob.get('mime_type').split('/')[1]};base64,{blob.get('data')}",
+                    url=f"data:image/{blob.get('mime_type').split('/')[1]};base64,{encoded_data}",
                 )
             )
         )

lmnr/version.py

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

{lmnr-0.6.12.dist-info → lmnr-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lmnr
-Version: 0.6.12
+Version: 0.6.13
 Summary: Python SDK for Laminar
 License: Apache-2.0
 Author: lmnr.ai

{lmnr-0.6.12.dist-info → lmnr-0.6.13.dist-info}/RECORD

@@ -3,11 +3,11 @@ lmnr/cli.py,sha256=uHgLUfN_6eINtUlcQdOtODf2tI9AiwmlhojQF4UMB5Y,6047
 lmnr/opentelemetry_lib/.flake8,sha256=bCxuDlGx3YQ55QHKPiGJkncHanh9qGjQJUujcFa3lAU,150
 lmnr/opentelemetry_lib/__init__.py,sha256=aWKsqRXUhVhu2BS555nO2JhZSsK8bTUylAVwWybquGE,2160
 lmnr/opentelemetry_lib/decorators/__init__.py,sha256=45HVoYnHC1Y9D_VSkioDbqD3gm4RPC5sKoztomBI5j8,8496
-lmnr/opentelemetry_lib/litellm/__init__.py,sha256=PcZtTdoHZ0NyylKB-07FZwcQ02Jou3R0esk9_soNxJ0,14860
+lmnr/opentelemetry_lib/litellm/__init__.py,sha256=wjo46It5GdhmxPCaiA8kaKyaz3VsuRDRYUCCstvK0-Y,14858
 lmnr/opentelemetry_lib/litellm/utils.py,sha256=2ozwVT-C3HIDEJ8Rekx7QYXouvNMqtEteCOHVRUgGic,539
-lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py,sha256=6Fvkc_zZEX1lk8g6ZGFrADLNOL055pkMdO-hEef8qBY,18525
+lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py,sha256=mltiTDVCCyMuhQNuoLHvblg9O5X0ncG6xN3f1opSeQU,18613
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/config.py,sha256=25zevJ7g3MtJP_5gju3jBH7-wg7SbDkktysuUO29ksI,245
-lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/utils.py,sha256=ICQENOiICTKodjZVHhq3H5RIRY5bbuWp_KmzkDNgDRM,7471
+lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/utils.py,sha256=8SSBliRoJtiZME5RDEwt90CI2BadKPHQrtV4p6bDy_0,7669
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/__init__.py,sha256=Jyv9koZdGA4-oTaB7ATB7DaX7aNOY-3YOGL4wX0c7PM,3107
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/utils.py,sha256=nf9sJZXnnts4gYZortEiDvwYjYqYJZTAT0zutuP_R6Y,1512
 lmnr/opentelemetry_lib/tracing/__init__.py,sha256=27QogAe-aHyrVr6b56-DduUm0KEE24K1aV2e1nouTNg,6007
@@ -52,9 +52,9 @@ lmnr/sdk/laminar.py,sha256=oOVco_c9ZstT71HsquGsgbtFumXd2Ejz0rl_qpmMlTU,33996
 lmnr/sdk/log.py,sha256=nt_YMmPw1IRbGy0b7q4rTtP4Yo3pQfNxqJPXK3nDSNQ,2213
 lmnr/sdk/types.py,sha256=ZQp5SeYJNZsK3KrbSeXPY_xn6mGjW5mSw_i0Rd_Oa4k,12328
 lmnr/sdk/utils.py,sha256=yrcHIhoADf9lWH9qJWZMmkRWYvd0DuxPSLP3mY6YFw0,4327
-lmnr/version.py,sha256=3yq9kXsV09LEVOD6hyJwTYbh8vgoF0ejCPZdrS2JiGs,1322
-lmnr-0.6.12.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
-lmnr-0.6.12.dist-info/METADATA,sha256=UFjXPicsNBWXgXPxgeBuvtw4d-8dq1qJ8H-H9LeTprY,15186
-lmnr-0.6.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lmnr-0.6.12.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
-lmnr-0.6.12.dist-info/RECORD,,
+lmnr/version.py,sha256=9gMGnzWiCqbv_PzYX6c-jQFz17zO1xyIONO32wE9xfY,1322
+lmnr-0.6.13.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.6.13.dist-info/METADATA,sha256=95yHwJlTi4CNL1ucZDk9ge2flO712qjpxikJ0jCkmiI,15186
+lmnr-0.6.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lmnr-0.6.13.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
+lmnr-0.6.13.dist-info/RECORD,,