lmnr 0.7.0__tar.gz → 0.7.2__tar.gz

{lmnr-0.7.0 → lmnr-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.7.0
+Version: 0.7.2
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>
@@ -19,61 +19,59 @@ Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.33.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc>=1.33.0
 Requires-Dist: opentelemetry-instrumentation>=0.54b0
 Requires-Dist: opentelemetry-semantic-conventions>=0.54b0
-Requires-Dist: opentelemetry-semantic-conventions-ai>=0.4.9
+Requires-Dist: opentelemetry-semantic-conventions-ai>=0.4.11
 Requires-Dist: tqdm>=4.0
 Requires-Dist: tenacity>=8.0
 Requires-Dist: grpcio>=1
 Requires-Dist: httpx>=0.25.0
 Requires-Dist: orjson>=3.10.18
 Requires-Dist: packaging>=22.0
-Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.40.12 ; extra == 'alephalpha'
-Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-bedrock>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-chromadb>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-cohere>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-crewai>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-google-generativeai<0.40.10 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-haystack>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-lancedb>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-langchain>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-marqo>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-milvus>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-mistralai>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-ollama>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-pinecone>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-qdrant>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-replicate>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-together>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-transformers>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-vertexai>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-watsonx>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-weaviate>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-bedrock>=0.40.12 ; extra == 'bedrock'
-Requires-Dist: opentelemetry-instrumentation-chromadb>=0.40.12 ; extra == 'chromadb'
-Requires-Dist: opentelemetry-instrumentation-cohere>=0.40.12 ; extra == 'cohere'
-Requires-Dist: opentelemetry-instrumentation-crewai>=0.40.12 ; extra == 'crewai'
-Requires-Dist: opentelemetry-instrumentation-google-generativeai<0.40.10 ; extra == 'google-generativeai'
-Requires-Dist: opentelemetry-instrumentation-haystack>=0.40.12 ; extra == 'haystack'
-Requires-Dist: opentelemetry-instrumentation-lancedb>=0.40.12 ; extra == 'lancedb'
-Requires-Dist: opentelemetry-instrumentation-langchain>=0.40.12 ; extra == 'langchain'
-Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.40.12 ; extra == 'llamaindex'
-Requires-Dist: opentelemetry-instrumentation-marqo>=0.40.12 ; extra == 'marqo'
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.12 ; extra == 'mcp'
-Requires-Dist: opentelemetry-instrumentation-milvus>=0.40.12 ; extra == 'milvus'
-Requires-Dist: opentelemetry-instrumentation-mistralai>=0.40.12 ; extra == 'mistralai'
-Requires-Dist: opentelemetry-instrumentation-ollama>=0.40.12 ; extra == 'ollama'
-Requires-Dist: opentelemetry-instrumentation-pinecone>=0.40.12 ; extra == 'pinecone'
-Requires-Dist: opentelemetry-instrumentation-qdrant>=0.40.12 ; extra == 'qdrant'
-Requires-Dist: opentelemetry-instrumentation-replicate>=0.40.12 ; extra == 'replicate'
-Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.40.12 ; extra == 'sagemaker'
-Requires-Dist: opentelemetry-instrumentation-together>=0.40.12 ; extra == 'together'
-Requires-Dist: opentelemetry-instrumentation-transformers>=0.40.12 ; extra == 'transformers'
-Requires-Dist: opentelemetry-instrumentation-vertexai>=0.40.12 ; extra == 'vertexai'
-Requires-Dist: opentelemetry-instrumentation-watsonx>=0.40.12 ; extra == 'watsonx'
-Requires-Dist: opentelemetry-instrumentation-weaviate>=0.40.12 ; extra == 'weaviate'
+Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.44.0 ; extra == 'alephalpha'
+Requires-Dist: opentelemetry-instrumentation-alephalpha>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-bedrock>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-crewai>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-haystack>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-together>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-transformers>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-vertexai>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.44.0 ; extra == 'all'
+Requires-Dist: opentelemetry-instrumentation-bedrock>=0.44.0 ; extra == 'bedrock'
+Requires-Dist: opentelemetry-instrumentation-chromadb>=0.44.0 ; extra == 'chromadb'
+Requires-Dist: opentelemetry-instrumentation-cohere>=0.44.0 ; extra == 'cohere'
+Requires-Dist: opentelemetry-instrumentation-crewai>=0.44.0 ; extra == 'crewai'
+Requires-Dist: opentelemetry-instrumentation-haystack>=0.44.0 ; extra == 'haystack'
+Requires-Dist: opentelemetry-instrumentation-lancedb>=0.44.0 ; extra == 'lancedb'
+Requires-Dist: opentelemetry-instrumentation-langchain>=0.44.0 ; extra == 'langchain'
+Requires-Dist: opentelemetry-instrumentation-llamaindex>=0.44.0 ; extra == 'llamaindex'
+Requires-Dist: opentelemetry-instrumentation-marqo>=0.44.0 ; extra == 'marqo'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.44.0 ; extra == 'mcp'
+Requires-Dist: opentelemetry-instrumentation-milvus>=0.44.0 ; extra == 'milvus'
+Requires-Dist: opentelemetry-instrumentation-mistralai>=0.44.0 ; extra == 'mistralai'
+Requires-Dist: opentelemetry-instrumentation-ollama>=0.44.0 ; extra == 'ollama'
+Requires-Dist: opentelemetry-instrumentation-pinecone>=0.44.0 ; extra == 'pinecone'
+Requires-Dist: opentelemetry-instrumentation-qdrant>=0.44.0 ; extra == 'qdrant'
+Requires-Dist: opentelemetry-instrumentation-replicate>=0.44.0 ; extra == 'replicate'
+Requires-Dist: opentelemetry-instrumentation-sagemaker>=0.44.0 ; extra == 'sagemaker'
+Requires-Dist: opentelemetry-instrumentation-together>=0.44.0 ; extra == 'together'
+Requires-Dist: opentelemetry-instrumentation-transformers>=0.44.0 ; extra == 'transformers'
+Requires-Dist: opentelemetry-instrumentation-vertexai>=0.44.0 ; extra == 'vertexai'
+Requires-Dist: opentelemetry-instrumentation-watsonx>=0.44.0 ; extra == 'watsonx'
+Requires-Dist: opentelemetry-instrumentation-weaviate>=0.44.0 ; extra == 'weaviate'
 Requires-Python: >=3.10, <4
 Provides-Extra: alephalpha
 Provides-Extra: all
@@ -81,7 +79,6 @@ Provides-Extra: bedrock
 Provides-Extra: chromadb
 Provides-Extra: cohere
 Provides-Extra: crewai
-Provides-Extra: google-generativeai
 Provides-Extra: haystack
 Provides-Extra: lancedb
 Provides-Extra: langchain

lmnr-0.7.2/pyproject.toml

@@ -0,0 +1,145 @@
+# Laminar Python
+
+# If you are looking for information about possible extras installations,
+# i.e. what you can pass into `pip install 'lmnr[extra1,extra2]'`, please see the
+# `[project.optional-dependencies]` section below.
+
+[project]
+name = "lmnr"
+version = "0.7.2"
+description = "Python SDK for Laminar"
+authors = [
+  { name = "lmnr.ai", email = "founders@lmnr.ai" }
+]
+readme = "README.md"
+requires-python = ">=3.10,<4"
+license = "Apache-2.0"
+dependencies = [
+  "pydantic (>=2.0.3,<3.0.0)",
+  "python-dotenv (>=1.0)",
+  "opentelemetry-api (>=1.33.0)",
+  "opentelemetry-sdk (>=1.33.0)",
+  "opentelemetry-exporter-otlp-proto-http (>=1.33.0)",
+  "opentelemetry-exporter-otlp-proto-grpc (>=1.33.0)",
+  "opentelemetry-instrumentation (>=0.54b0)",
+  "opentelemetry-semantic-conventions (>=0.54b0)",
+  "opentelemetry-semantic-conventions-ai (>=0.4.11)",
+  "tqdm (>=4.0)",
+  "tenacity (>=8.0)",
+  # Since 1.68.0, grpcio writes a warning message
+  # that looks scary, but is harmless.
+  # WARNING: All log messages before absl::InitializeLog() is called are written to STDERR
+  # E0000 00:00:1737439981.199902 9456033 init.cc:229] grpc_wait_for_shutdown_with_timeout() timed out.
+  #
+  # Remove this comment when we make sure that grpcio has resolved this.
+  # Related issue:
+  # https://discuss.ai.google.dev/t/warning-all-log-messages-before-absl-initializelog-is-called-are-written-to-stderr-e0000-001731955515-629532-17124-init-cc-229-grpc-wait-for-shutdown-with-timeout-timed-out/50020
+  # https://github.com/grpc/grpc/issues/38490
+  "grpcio>=1",
+  "httpx>=0.25.0",
+  "orjson>=3.10.18",
+  "packaging>=22.0",
+]
+# poetry would auto-generate these based on requires-python, but other build
+# systems don't, so we need to specify them manually.
+classifiers = [
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
+]
+
+[project.scripts]
+lmnr = "lmnr.cli:cli"
+
+[project.optional-dependencies]
+# List of all possible extras. You can specify one or more of these extras
+# when installing the package, using any of the following examples:
+# `pip install 'lmnr[anthropic,groq]'`
+# `uv pip install 'lmnr[anthropic,groq]'`
+# `uv add lmnr --extra anthropic --extra groq`
+# `poetry add 'lmnr[anthropic,groq]'`
+
+alephalpha=["opentelemetry-instrumentation-alephalpha>=0.44.0"]
+bedrock=["opentelemetry-instrumentation-bedrock>=0.44.0"]
+chromadb=["opentelemetry-instrumentation-chromadb>=0.44.0"]
+cohere=["opentelemetry-instrumentation-cohere>=0.44.0"]
+crewai=["opentelemetry-instrumentation-crewai>=0.44.0"]
+haystack=["opentelemetry-instrumentation-haystack>=0.44.0"]
+lancedb=["opentelemetry-instrumentation-lancedb>=0.44.0"]
+langchain=["opentelemetry-instrumentation-langchain>=0.44.0"]
+llamaindex=["opentelemetry-instrumentation-llamaindex>=0.44.0"]
+marqo=["opentelemetry-instrumentation-marqo>=0.44.0"]
+mcp=["opentelemetry-instrumentation-mcp>=0.44.0"]
+milvus=["opentelemetry-instrumentation-milvus>=0.44.0"]
+mistralai=["opentelemetry-instrumentation-mistralai>=0.44.0"]
+ollama=["opentelemetry-instrumentation-ollama>=0.44.0"]
+pinecone=["opentelemetry-instrumentation-pinecone>=0.44.0"]
+qdrant=["opentelemetry-instrumentation-qdrant>=0.44.0"]
+replicate=["opentelemetry-instrumentation-replicate>=0.44.0"]
+sagemaker=["opentelemetry-instrumentation-sagemaker>=0.44.0"]
+together=["opentelemetry-instrumentation-together>=0.44.0"]
+transformers=["opentelemetry-instrumentation-transformers>=0.44.0"]
+vertexai=["opentelemetry-instrumentation-vertexai>=0.44.0"]
+watsonx=["opentelemetry-instrumentation-watsonx>=0.44.0"]
+weaviate=["opentelemetry-instrumentation-weaviate>=0.44.0"]
+# `all` is the group added for convenience, if you want to install all
+# the instrumentations.
+# we suggest using package-manager-specific commands instead,
+# like `uv add lmnr --all-extras`
+all = [
+  "opentelemetry-instrumentation-alephalpha>=0.44.0",
+  "opentelemetry-instrumentation-bedrock>=0.44.0",
+  "opentelemetry-instrumentation-chromadb>=0.44.0",
+  "opentelemetry-instrumentation-cohere>=0.44.0",
+  "opentelemetry-instrumentation-crewai>=0.44.0",
+  "opentelemetry-instrumentation-haystack>=0.44.0",
+  "opentelemetry-instrumentation-lancedb>=0.44.0",
+  "opentelemetry-instrumentation-langchain>=0.44.0",
+  "opentelemetry-instrumentation-llamaindex>=0.44.0",
+  "opentelemetry-instrumentation-marqo>=0.44.0",
+  "opentelemetry-instrumentation-mcp>=0.44.0",
+  "opentelemetry-instrumentation-milvus>=0.44.0",
+  "opentelemetry-instrumentation-mistralai>=0.44.0",
+  "opentelemetry-instrumentation-ollama>=0.44.0",
+  "opentelemetry-instrumentation-pinecone>=0.44.0",
+  "opentelemetry-instrumentation-qdrant>=0.44.0",
+  "opentelemetry-instrumentation-replicate>=0.44.0",
+  "opentelemetry-instrumentation-sagemaker>=0.44.0",
+  "opentelemetry-instrumentation-together>=0.44.0",
+  "opentelemetry-instrumentation-transformers>=0.44.0",
+  "opentelemetry-instrumentation-vertexai>=0.44.0",
+  "opentelemetry-instrumentation-watsonx>=0.44.0",
+  "opentelemetry-instrumentation-weaviate>=0.44.0"
+]
+
+[dependency-groups]
+dev = [
+  "autopep8>=2.3.2",
+  "flake8>=7.2.0",
+  "pytest>=8.3.5",
+  "pytest-sugar>=1.0.0",
+  "pytest-asyncio>=0.26.0",
+  "playwright>=1.52.0",
+  "vcrpy>=7.0.0",
+  "openai>=1.98.0",
+  "pytest-recording>=0.13.4",
+  "patchright>=1.52.3",
+  "google-genai>=1.19.0",
+  "langgraph>=0.4.8",
+  "langchain-core>=0.3.64",
+  "langchain>=0.3.25",
+  "litellm>=1.72.6",
+  "groq>=0.30.0",
+  "anthropic>=0.60.0",
+  "langchain-openai>=0.3.28",
+]
+
+[build-system]
+requires = ["uv_build>=0.7.21,<0.8"]
+build-backend = "uv_build"
+
+[tool.uv.workspace]
+members = ["examples/fastapi-app"]

{lmnr-0.7.0 → lmnr-0.7.2}/src/lmnr/opentelemetry_lib/decorators/__init__.py

@@ -6,8 +6,15 @@ import types
 from typing import Any, AsyncGenerator, Callable, Generator, Literal
 
 from opentelemetry import context as context_api
-from opentelemetry.trace import Span
-
+from opentelemetry.trace import Span, Status, StatusCode
+
+from lmnr.opentelemetry_lib.tracing.context import (
+    CONTEXT_SESSION_ID_KEY,
+    CONTEXT_USER_ID_KEY,
+    attach_context,
+    detach_context,
+    get_event_attributes_from_context,
+)
 from lmnr.sdk.utils import get_input_from_func_args, is_method
 from lmnr.opentelemetry_lib import MAX_MANUAL_SPAN_PAYLOAD_SIZE
 from lmnr.opentelemetry_lib.tracing.tracer import get_tracer_with_context
@@ -180,7 +187,21 @@ def observe_base(
 
             span = _setup_span(span_name, span_type, association_properties)
             new_context = wrapper.push_span_context(span)
+            if session_id := association_properties.get("session_id"):
+                new_context = context_api.set_value(
+                    CONTEXT_SESSION_ID_KEY, session_id, new_context
+                )
+            if user_id := association_properties.get("user_id"):
+                new_context = context_api.set_value(
+                    CONTEXT_USER_ID_KEY, user_id, new_context
+                )
+            # Some auto-instrumentations are not under our control, so they
+            # don't have access to our isolated context. We attach the context
+            # to the OTEL global context, so that spans know their parent
+            # span and trace_id.
             ctx_token = context_api.attach(new_context)
+            # update our isolated context too
+            isolated_ctx_token = attach_context(new_context)
 
             _process_input(
                 span, fn, args, kwargs, ignore_input, ignore_inputs, input_formatter
@@ -195,7 +216,7 @@ def observe_base(
             finally:
                 # Always restore global context
                 context_api.detach(ctx_token)
-
+                detach_context(isolated_ctx_token)
             # span will be ended in the generator
             if isinstance(res, types.GeneratorType):
                 return _handle_generator(span, ctx_token, res)
@@ -240,7 +261,21 @@ def async_observe_base(
 
             span = _setup_span(span_name, span_type, association_properties)
             new_context = wrapper.push_span_context(span)
+            if session_id := association_properties.get("session_id"):
+                new_context = context_api.set_value(
+                    CONTEXT_SESSION_ID_KEY, session_id, new_context
+                )
+            if user_id := association_properties.get("user_id"):
+                new_context = context_api.set_value(
+                    CONTEXT_USER_ID_KEY, user_id, new_context
+                )
+            # Some auto-instrumentations are not under our control, so they
+            # don't have access to our isolated context. We attach the context
+            # to the OTEL global context, so that spans know their parent
+            # span and trace_id.
             ctx_token = context_api.attach(new_context)
+            # update our isolated context too
+            isolated_ctx_token = attach_context(new_context)
 
             _process_input(
                 span, fn, args, kwargs, ignore_input, ignore_inputs, input_formatter
@@ -255,6 +290,7 @@ def async_observe_base(
             finally:
                 # Always restore global context
                 context_api.detach(ctx_token)
+                detach_context(isolated_ctx_token)
 
             # span will be ended in the generator
             if isinstance(res, types.AsyncGeneratorType):
@@ -288,4 +324,7 @@ async def _ahandle_generator(span: Span, wrapper: TracerWrapper, res: AsyncGener
 
 def _process_exception(span: Span, e: Exception):
     # Note that this `escaped` is sent as a StringValue("True"), not a boolean.
-    span.record_exception(e, escaped=True)
+    span.record_exception(
+        e, attributes=get_event_attributes_from_context(), escaped=True
+    )
+    span.set_status(Status(StatusCode.ERROR, str(e)))

{lmnr-0.7.0 → lmnr-0.7.2}/src/lmnr/opentelemetry_lib/litellm/__init__.py

@@ -7,6 +7,7 @@ from opentelemetry.trace import SpanKind, Status, StatusCode, Tracer
 from lmnr.opentelemetry_lib.litellm.utils import model_as_dict, set_span_attribute
 from lmnr.opentelemetry_lib.tracing import TracerWrapper
 
+from lmnr.opentelemetry_lib.tracing.context import get_event_attributes_from_context
 from lmnr.opentelemetry_lib.utils.package_check import is_package_installed
 from lmnr.sdk.log import get_default_logger
 
@@ -141,10 +142,12 @@ try:
                 else:
                     span.set_status(Status(StatusCode.ERROR))
                     if isinstance(response_obj, Exception):
-                        span.record_exception(response_obj)
+                        attributes = get_event_attributes_from_context()
+                        span.record_exception(response_obj, attributes=attributes)
 
             except Exception as e:
-                span.record_exception(e)
+                attributes = get_event_attributes_from_context()
+                span.record_exception(e, attributes=attributes)
                 logger.error(f"Error in Laminar LiteLLM instrumentation: {e}")
             finally:
                 span.end(int(end_time.timestamp() * 1e9))

{lmnr-0.7.0 → lmnr-0.7.2}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/__init__.py

@@ -29,6 +29,10 @@ from .utils import (
     shared_metrics_attributes,
     should_emit_events,
 )
+from .streaming import (
+    WrappedAsyncMessageStreamManager,
+    WrappedMessageStreamManager,
+)
 from .version import __version__
 
 from lmnr.opentelemetry_lib.tracing.context import get_current_context
@@ -52,6 +56,7 @@ logger = logging.getLogger(__name__)
 
 _instruments = ("anthropic >= 0.3.11",)
 
+
 WRAPPED_METHODS = [
     {
         "package": "anthropic.resources.completions",
@@ -71,6 +76,15 @@ WRAPPED_METHODS = [
         "method": "stream",
         "span_name": "anthropic.chat",
     },
+    # This method is on an async resource, but is meant to be called as
+    # an async context manager (async with), which we don't need to await;
+    # thus, we wrap it with a sync wrapper
+    {
+        "package": "anthropic.resources.messages",
+        "object": "AsyncMessages",
+        "method": "stream",
+        "span_name": "anthropic.chat",
+    },
 ]
 
 WRAPPED_AMETHODS = [
@@ -86,12 +100,6 @@ WRAPPED_AMETHODS = [
         "method": "create",
         "span_name": "anthropic.chat",
     },
-    {
-        "package": "anthropic.resources.messages",
-        "object": "AsyncMessages",
-        "method": "stream",
-        "span_name": "anthropic.chat",
-    },
 ]
 
 
@@ -99,6 +107,23 @@ def is_streaming_response(response):
     return isinstance(response, Stream) or isinstance(response, AsyncStream)
 
 
+def is_stream_manager(response):
+    """Check if response is a MessageStreamManager or AsyncMessageStreamManager"""
+    try:
+        from anthropic.lib.streaming._messages import (
+            MessageStreamManager,
+            AsyncMessageStreamManager,
+        )
+
+        return isinstance(response, (MessageStreamManager, AsyncMessageStreamManager))
+    except ImportError:
+        # Check by class name as fallback
+        return (
+            response.__class__.__name__ == "MessageStreamManager"
+            or response.__class__.__name__ == "AsyncMessageStreamManager"
+        )
+
+
 @dont_throw
 async def _aset_token_usage(
     span,
@@ -437,6 +462,33 @@ def _wrap(
             event_logger,
             kwargs,
         )
+    elif is_stream_manager(response):
+        if response.__class__.__name__ == "AsyncMessageStreamManager":
+            return WrappedAsyncMessageStreamManager(
+                response,
+                span,
+                instance._client,
+                start_time,
+                token_histogram,
+                choice_counter,
+                duration_histogram,
+                exception_counter,
+                event_logger,
+                kwargs,
+            )
+        else:
+            return WrappedMessageStreamManager(
+                response,
+                span,
+                instance._client,
+                start_time,
+                token_histogram,
+                choice_counter,
+                duration_histogram,
+                exception_counter,
+                event_logger,
+                kwargs,
+            )
     elif response:
         try:
             metric_attributes = shared_metrics_attributes(response)
@@ -532,6 +584,33 @@ async def _awrap(
             event_logger,
             kwargs,
         )
+    elif is_stream_manager(response):
+        if response.__class__.__name__ == "AsyncMessageStreamManager":
+            return WrappedAsyncMessageStreamManager(
+                response,
+                span,
+                instance._client,
+                start_time,
+                token_histogram,
+                choice_counter,
+                duration_histogram,
+                exception_counter,
+                event_logger,
+                kwargs,
+            )
+        else:
+            return WrappedMessageStreamManager(
+                response,
+                span,
+                instance._client,
+                start_time,
+                token_histogram,
+                choice_counter,
+                duration_histogram,
+                exception_counter,
+                event_logger,
+                kwargs,
+            )
     elif response:
         metric_attributes = shared_metrics_attributes(response)
 

{lmnr-0.7.0 → lmnr-0.7.2}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/span_utils.py

@@ -113,18 +113,43 @@ async def aset_input_attributes(span, kwargs):
                 )
             for i, message in enumerate(kwargs.get("messages")):
                 prompt_index = i + (1 if has_system_message else 0)
+                content = message.get("content")
+                tool_use_blocks = []
+                other_blocks = []
+                if isinstance(content, list):
+                    for block in content:
+                        if dict(block).get("type") == "tool_use":
+                            tool_use_blocks.append(dict(block))
+                        else:
+                            other_blocks.append(block)
+                    content = other_blocks
                 set_span_attribute(
                     span,
                     f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.content",
-                    await _dump_content(
-                        message_index=i, span=span, content=message.get("content")
-                    ),
+                    await _dump_content(message_index=i, span=span, content=content),
                 )
                 set_span_attribute(
                     span,
                     f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.role",
                     message.get("role"),
                 )
+                if tool_use_blocks:
+                    for tool_num, tool_use_block in enumerate(tool_use_blocks):
+                        set_span_attribute(
+                            span,
+                            f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.tool_calls.{tool_num}.id",
+                            tool_use_block.get("id"),
+                        )
+                        set_span_attribute(
+                            span,
+                            f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.tool_calls.{tool_num}.name",
+                            tool_use_block.get("name"),
+                        )
+                        set_span_attribute(
+                            span,
+                            f"{SpanAttributes.LLM_PROMPTS}.{prompt_index}.tool_calls.{tool_num}.arguments",
+                            json.dumps(tool_use_block.get("input")),
+                        )
 
         if kwargs.get("tools") is not None:
             for i, tool in enumerate(kwargs.get("tools")):
@@ -160,8 +185,8 @@ def _set_span_completions(span, response):
             content_block_type = content.type
             # usually, Antrhopic responds with just one text block,
             # but the API allows for multiple text blocks, so concatenate them
-            if content_block_type == "text":
-                text += content.text
+            if content_block_type == "text" and hasattr(content, "text"):
+                text += content.text or ""
             elif content_block_type == "thinking":
                 content = dict(content)
                 # override the role to thinking
@@ -242,15 +267,33 @@ def set_streaming_response_attributes(span, complete_response_events):
     if not span.is_recording() or not complete_response_events:
         return
 
-    try:
-        for event in complete_response_events:
-            index = event.get("index")
-            prefix = f"{SpanAttributes.LLM_COMPLETIONS}.{index}"
+    index = 0
+    for event in complete_response_events:
+        prefix = f"{SpanAttributes.LLM_COMPLETIONS}.{index}"
+        set_span_attribute(span, f"{prefix}.finish_reason", event.get("finish_reason"))
+        role = "thinking" if event.get("type") == "thinking" else "assistant"
+        # Thinking is added as a separate completion, so we need to increment the index
+        if event.get("type") == "thinking":
+            index += 1
+        set_span_attribute(span, f"{prefix}.role", role)
+        if event.get("type") == "tool_use":
+            set_span_attribute(
+                span,
+                f"{prefix}.tool_calls.0.id",
+                event.get("id"),
+            )
             set_span_attribute(
-                span, f"{prefix}.finish_reason", event.get("finish_reason")
+                span,
+                f"{prefix}.tool_calls.0.name",
+                event.get("name"),
             )
-            role = "thinking" if event.get("type") == "thinking" else "assistant"
-            set_span_attribute(span, f"{prefix}.role", role)
+            tool_arguments = event.get("input")
+            if tool_arguments is not None:
+                set_span_attribute(
+                    span,
+                    f"{prefix}.tool_calls.0.arguments",
+                    # already stringified
+                    tool_arguments,
+                )
+        else:
             set_span_attribute(span, f"{prefix}.content", event.get("text"))
-    except Exception as e:
-        logger.warning("Failed to set completion attributes, error: %s", str(e))