lmnr 0.6.21__tar.gz → 0.7.1__tar.gz

{lmnr-0.6.21 → lmnr-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.6.21
+Version: 0.7.1
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>
@@ -17,14 +17,15 @@ Requires-Dist: opentelemetry-api>=1.33.0
 Requires-Dist: opentelemetry-sdk>=1.33.0
 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: tqdm>=4.0
 Requires-Dist: tenacity>=8.0
 Requires-Dist: grpcio>=1
 Requires-Dist: httpx>=0.25.0
-Requires-Dist: opentelemetry-instrumentation-threading>=0.54b0
 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'

{lmnr-0.6.21 → lmnr-0.7.1}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.6.21"
+version = "0.7.1"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -21,6 +21,7 @@ dependencies = [
   "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.9)",
   "tqdm (>=4.0)",
@@ -36,8 +37,8 @@ dependencies = [
   # https://github.com/grpc/grpc/issues/38490
   "grpcio>=1",
   "httpx>=0.25.0",
-  "opentelemetry-instrumentation-threading>=0.54b0",
   "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.
@@ -132,7 +133,7 @@ dev = [
   "pytest-asyncio>=0.26.0",
   "playwright>=1.52.0",
   "vcrpy>=7.0.0",
-  "openai>=1.77.0",
+  "openai>=1.98.0",
   "pytest-recording>=0.13.4",
   "patchright>=1.52.3",
   "google-genai>=1.19.0",
@@ -142,6 +143,7 @@ dev = [
   "litellm>=1.72.6",
   "groq>=0.30.0",
   "anthropic>=0.57.1",
+  "langchain-openai>=0.3.28",
 ]
 
 [build-system]

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/__init__.py

@@ -9,7 +9,6 @@ from .sdk.types import (
     HumanEvaluator,
     RunAgentResponseChunk,
     StepChunkContent,
-    TracingLevel,
 )
 from .sdk.decorators import observe
 from .sdk.types import LaminarSpanContext
@@ -18,7 +17,6 @@ from .opentelemetry_lib.tracing.attributes import Attributes
 from .opentelemetry_lib.tracing.instruments import Instruments
 from .opentelemetry_lib.tracing.processor import LaminarSpanProcessor
 from .opentelemetry_lib.tracing.tracer import get_laminar_tracer_provider, get_tracer
-from opentelemetry.trace import use_span
 
 __all__ = [
     "AgentOutput",
@@ -36,10 +34,8 @@ __all__ = [
     "LaminarSpanProcessor",
     "RunAgentResponseChunk",
     "StepChunkContent",
-    "TracingLevel",
     "get_laminar_tracer_provider",
     "get_tracer",
     "evaluate",
     "observe",
-    "use_span",
 ]

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/decorators/__init__.py

@@ -5,13 +5,19 @@ import orjson
 import types
 from typing import Any, AsyncGenerator, Callable, Generator, Literal
 
-from opentelemetry import trace
 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
+from lmnr.opentelemetry_lib.tracing.tracer import get_tracer_with_context
 from lmnr.opentelemetry_lib.tracing.attributes import (
     ASSOCIATION_PROPERTIES,
     SPAN_INPUT,
@@ -37,6 +43,7 @@ def default_json(o):
     try:
         return str(o)
     except Exception:
+        logger.debug("Failed to serialize data to JSON, inner type: %s", type(o))
         pass
     return DEFAULT_PLACEHOLDER
 
@@ -61,8 +68,13 @@ def _setup_span(
     span_name: str, span_type: str, association_properties: dict[str, Any] | None
 ):
     """Set up a span with the given name, type, and association properties."""
-    with get_tracer() as tracer:
-        span = tracer.start_span(span_name, attributes={SPAN_TYPE: span_type})
+    with get_tracer_with_context() as (tracer, isolated_context):
+        # Create span in isolated context
+        span = tracer.start_span(
+            span_name,
+            context=isolated_context,
+            attributes={SPAN_TYPE: span_type},
+        )
 
         if association_properties is not None:
             for key, value in association_properties.items():
@@ -148,10 +160,10 @@ def _process_output(
         pass
 
 
-def _cleanup_span(span: Span, ctx_token):
+def _cleanup_span(span: Span, wrapper: TracerWrapper):
     """Clean up span and context."""
     span.end()
-    context_api.detach(ctx_token)
+    wrapper.pop_span_context()
 
 
 def observe_base(
@@ -171,10 +183,25 @@ def observe_base(
                 return fn(*args, **kwargs)
 
             span_name = name or fn.__name__
+            wrapper = TracerWrapper()
 
             span = _setup_span(span_name, span_type, association_properties)
-            ctx = trace.set_span_in_context(span, context_api.get_current())
-            ctx_token = context_api.attach(ctx)
+            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
@@ -184,9 +211,12 @@ def observe_base(
                 res = fn(*args, **kwargs)
             except Exception as e:
                 _process_exception(span, e)
-                _cleanup_span(span, ctx_token)
+                _cleanup_span(span, wrapper)
                 raise e
-
+            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)
@@ -201,7 +231,7 @@ def observe_base(
                 return _ahandle_generator(span, ctx_token, res)
 
             _process_output(span, res, ignore_output, output_formatter)
-            _cleanup_span(span, ctx_token)
+            _cleanup_span(span, wrapper)
             return res
 
         return wrap
@@ -227,10 +257,25 @@ def async_observe_base(
                 return await fn(*args, **kwargs)
 
             span_name = name or fn.__name__
+            wrapper = TracerWrapper()
 
             span = _setup_span(span_name, span_type, association_properties)
-            ctx = trace.set_span_in_context(span, context_api.get_current())
-            ctx_token = context_api.attach(ctx)
+            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
@@ -240,8 +285,12 @@ def async_observe_base(
                 res = await fn(*args, **kwargs)
             except Exception as e:
                 _process_exception(span, e)
-                _cleanup_span(span, ctx_token)
+                _cleanup_span(span, wrapper)
                 raise e
+            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):
@@ -250,7 +299,7 @@ def async_observe_base(
                 return await _ahandle_generator(span, ctx_token, res)
 
             _process_output(span, res, ignore_output, output_formatter)
-            _cleanup_span(span, ctx_token)
+            _cleanup_span(span, wrapper)
             return res
 
         return wrap
@@ -258,24 +307,24 @@ def async_observe_base(
     return decorate
 
 
-def _handle_generator(span: Span, ctx_token, res: Generator[Any, Any, Any]):
-    yield from res
-
-    span.end()
-    if ctx_token is not None:
-        context_api.detach(ctx_token)
-
+def _handle_generator(span: Span, wrapper: TracerWrapper, res: Generator):
+    try:
+        yield from res
+    finally:
+        _cleanup_span(span, wrapper)
 
-async def _ahandle_generator(span: Span, ctx_token, res: AsyncGenerator[Any, Any]):
-    # async with contextlib.aclosing(res) as closing_gen:
-    async for part in res:
-        yield part
 
-    span.end()
-    if ctx_token is not None:
-        context_api.detach(ctx_token)
+async def _ahandle_generator(span: Span, wrapper: TracerWrapper, res: AsyncGenerator):
+    try:
+        async for part in res:
+            yield part
+    finally:
+        _cleanup_span(span, wrapper)
 
 
 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.6.21 → lmnr-0.7.1}/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.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/anthropic/__init__.py

@@ -30,6 +30,8 @@ from .utils import (
     should_emit_events,
 )
 from .version import __version__
+
+from lmnr.opentelemetry_lib.tracing.context import get_current_context
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY, unwrap
 from opentelemetry.metrics import Counter, Histogram, Meter, get_meter
@@ -396,9 +398,10 @@ def _wrap(
         name,
         kind=SpanKind.CLIENT,
         attributes={
-            SpanAttributes.LLM_SYSTEM: "Anthropic",
+            SpanAttributes.LLM_SYSTEM: "anthropic",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
 
     _handle_input(span, event_logger, kwargs)
@@ -493,9 +496,10 @@ async def _awrap(
         name,
         kind=SpanKind.CLIENT,
         attributes={
-            SpanAttributes.LLM_SYSTEM: "Anthropic",
+            SpanAttributes.LLM_SYSTEM: "anthropic",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
     await _ahandle_input(span, event_logger, kwargs)
 

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py

@@ -8,6 +8,11 @@ from typing import AsyncGenerator, Callable, Collection, Generator
 
 from google.genai import types
 
+from lmnr.opentelemetry_lib.tracing.context import (
+    get_current_context,
+    get_event_attributes_from_context,
+)
+
 from .config import (
     Config,
 )
@@ -474,6 +479,7 @@ def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
             SpanAttributes.LLM_SYSTEM: "gemini",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
 
     if span.is_recording():
@@ -488,8 +494,9 @@ def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
         span.end()
         return response
     except Exception as e:
+        attributes = get_event_attributes_from_context()
         span.set_attribute(ERROR_TYPE, e.__class__.__name__)
-        span.record_exception(e)
+        span.record_exception(e, attributes=attributes)
         span.set_status(Status(StatusCode.ERROR, str(e)))
         span.end()
         raise e
@@ -509,6 +516,7 @@ async def _awrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
             SpanAttributes.LLM_SYSTEM: "gemini",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
 
     if span.is_recording():
@@ -525,8 +533,9 @@ async def _awrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
             span.end()
             return response
     except Exception as e:
+        attributes = get_event_attributes_from_context()
         span.set_attribute(ERROR_TYPE, e.__class__.__name__)
-        span.record_exception(e)
+        span.record_exception(e, attributes=attributes)
         span.set_status(Status(StatusCode.ERROR, str(e)))
         span.end()
         raise e

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/groq/__init__.py

@@ -27,6 +27,7 @@ from .utils import (
     should_emit_events,
 )
 from .version import __version__
+from lmnr.opentelemetry_lib.tracing.context import get_current_context
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY, unwrap
 from opentelemetry.metrics import Counter, Histogram, Meter, get_meter
@@ -245,6 +246,7 @@ def _wrap(
             SpanAttributes.LLM_SYSTEM: "Groq",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
 
     _handle_input(span, kwargs, event_logger)
@@ -327,6 +329,7 @@ async def _awrap(
             SpanAttributes.LLM_SYSTEM: "Groq",
             SpanAttributes.LLM_REQUEST_TYPE: LLMRequestTypeValues.COMPLETION.value,
         },
+        context=get_current_context(),
     )
 
     _handle_input(span, kwargs, event_logger)

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/__init__.py

@@ -12,10 +12,7 @@ from langchain_core.runnables.graph import Graph
 from opentelemetry.trace import Tracer
 from wrapt import wrap_function_wrapper
 from opentelemetry.trace import get_tracer
-
-from lmnr.opentelemetry_lib.tracing.context_properties import (
-    update_association_properties,
-)
+from opentelemetry.context import get_value, attach, set_value
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import unwrap
@@ -45,12 +42,13 @@ def wrap_pregel_stream(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs)
         }
         for edge in graph.edges
     ]
-    update_association_properties(
-        {
-            "langgraph.edges": json.dumps(edges),
-            "langgraph.nodes": json.dumps(nodes),
-        },
-    )
+    d = {
+        "langgraph.edges": json.dumps(edges),
+        "langgraph.nodes": json.dumps(nodes),
+    }
+    association_properties = get_value("lmnr.langgraph.graph") or {}
+    association_properties.update(d)
+    attach(set_value("lmnr.langgraph.graph", association_properties))
     return wrapped(*args, **kwargs)
 
 
@@ -75,12 +73,14 @@ async def async_wrap_pregel_stream(
         }
         for edge in graph.edges
     ]
-    update_association_properties(
-        {
-            "langgraph.edges": json.dumps(edges),
-            "langgraph.nodes": json.dumps(nodes),
-        },
-    )
+
+    d = {
+        "langgraph.edges": json.dumps(edges),
+        "langgraph.nodes": json.dumps(nodes),
+    }
+    association_properties = get_value("lmnr.langgraph.graph") or {}
+    association_properties.update(d)
+    attach(set_value("lmnr.langgraph.graph", association_properties))
 
     async for item in wrapped(*args, **kwargs):
         yield item

{lmnr-0.6.21 → lmnr-0.7.1}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/__init__.py

@@ -395,6 +395,12 @@ def get_token_count_from_string(string: str, model_name: str):
                 f"Failed to get tiktoken encoding for model_name {model_name}, error: {str(ex)}"
             )
             return None
+        except Exception as ex:
+            # Other exceptions in tiktoken
+            logger.warning(
+                f"Failed to get tiktoken encoding for model_name {model_name}, error: {str(ex)}"
+            )
+            return None
 
         tiktoken_encodings[model_name] = encoding
     else: