lmnr 0.7.4__tar.gz → 0.7.5__tar.gz

{lmnr-0.7.4 → lmnr-0.7.5}/PKG-INFO

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

{lmnr-0.7.4 → lmnr-0.7.5}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.7.4"
+version = "0.7.5"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -124,14 +124,15 @@ dev = [
   "pytest-asyncio>=0.26.0",
   "playwright>=1.52.0",
   "vcrpy>=7.0.0",
-  "openai>=1.99.7",
+  # litellm breaks with openai>=1.100.0 (as of litellm 1.75.8)
+  "openai>=1.99.7,<1.100.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",
+  "litellm>=1.75.8",
   "groq>=0.30.0",
   "anthropic>=0.60.0",
   "langchain-openai>=0.3.28",

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/decorators/__init__.py

@@ -65,14 +65,17 @@ def json_dumps(data: dict) -> str:
 
 
 def _setup_span(
-    span_name: str, span_type: str, association_properties: dict[str, Any] | None
+    span_name: str,
+    span_type: str,
+    association_properties: dict[str, Any] | None,
+    preserve_global_context: bool = False,
 ):
     """Set up a span with the given name, type, and association properties."""
     with get_tracer_with_context() as (tracer, isolated_context):
         # Create span in isolated context
         span = tracer.start_span(
             span_name,
-            context=isolated_context,
+            context=isolated_context if not preserve_global_context else None,
             attributes={SPAN_TYPE: span_type},
         )
 
@@ -167,6 +170,7 @@ def _cleanup_span(span: Span, wrapper: TracerWrapper):
 
 
 def observe_base(
+    *,
     name: str | None = None,
     ignore_input: bool = False,
     ignore_inputs: list[str] | None = None,
@@ -175,6 +179,7 @@ def observe_base(
     association_properties: dict[str, Any] | None = None,
     input_formatter: Callable[..., str] | None = None,
     output_formatter: Callable[..., str] | None = None,
+    preserve_global_context: bool = False,
 ):
     def decorate(fn):
         @wraps(fn)
@@ -185,7 +190,9 @@ def observe_base(
             span_name = name or fn.__name__
             wrapper = TracerWrapper()
 
-            span = _setup_span(span_name, span_type, association_properties)
+            span = _setup_span(
+                span_name, span_type, association_properties, preserve_global_context
+            )
             new_context = wrapper.push_span_context(span)
             if session_id := association_properties.get("session_id"):
                 new_context = context_api.set_value(
@@ -241,6 +248,7 @@ def observe_base(
 
 # Async Decorators
 def async_observe_base(
+    *,
     name: str | None = None,
     ignore_input: bool = False,
     ignore_inputs: list[str] | None = None,
@@ -249,6 +257,7 @@ def async_observe_base(
     association_properties: dict[str, Any] | None = None,
     input_formatter: Callable[..., str] | None = None,
     output_formatter: Callable[..., str] | None = None,
+    preserve_global_context: bool = False,
 ):
     def decorate(fn):
         @wraps(fn)
@@ -259,7 +268,9 @@ def async_observe_base(
             span_name = name or fn.__name__
             wrapper = TracerWrapper()
 
-            span = _setup_span(span_name, span_type, association_properties)
+            span = _setup_span(
+                span_name, span_type, association_properties, preserve_global_context
+            )
             new_context = wrapper.push_span_context(span)
             if session_id := association_properties.get("session_id"):
                 new_context = context_api.set_value(

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -56,7 +56,6 @@ from opentelemetry.trace import SpanKind, Tracer
 from opentelemetry.trace.status import Status, StatusCode
 from wrapt import ObjectProxy
 
-from openai.types.chat.chat_completion_message import FunctionCall
 import pydantic
 
 SPAN_NAME = "openai.chat"
@@ -1014,7 +1013,7 @@ def _parse_tool_calls(
             tool_call_data = copy.deepcopy(tool_call)
         elif _is_tool_call_model(tool_call):
             tool_call_data = tool_call.model_dump()
-        elif isinstance(tool_call, FunctionCall):
+        elif _is_function_call(tool_call):
             function_call = tool_call.model_dump()
             tool_call_data = ToolCall(
                 id="",
@@ -1040,6 +1039,15 @@ def _is_tool_call_model(tool_call):
         return False
 
 
+def _is_function_call(model: Union[dict, pydantic.BaseModel]) -> bool:
+    try:
+        from openai.types.chat.chat_completion_message import FunctionCall
+
+        return isinstance(model, FunctionCall)
+    except Exception:
+        return False
+
+
 @singledispatch
 def _parse_choice_event(choice) -> ChoiceEvent:
     has_message = choice.message is not None

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/v1/responses_wrappers.py

@@ -464,7 +464,9 @@ def responses_get_or_create_wrapper(tracer: Tracer, wrapped, instance, args, kwa
             output_blocks={block.id: block for block in parsed_response.output}
             | existing_data.get("output_blocks", {}),
             usage=existing_data.get("usage", parsed_response.usage),
-            output_text=existing_data.get("output_text", parsed_response.output_text),
+            output_text=existing_data.get(
+                "output_text", _get_output_text(parsed_response)
+            ),
             request_model=existing_data.get("request_model", kwargs.get("model")),
             response_model=existing_data.get("response_model", parsed_response.model),
         )
@@ -560,7 +562,9 @@ async def async_responses_get_or_create_wrapper(
             output_blocks={block.id: block for block in parsed_response.output}
             | existing_data.get("output_blocks", {}),
             usage=existing_data.get("usage", parsed_response.usage),
-            output_text=existing_data.get("output_text", parsed_response.output_text),
+            output_text=existing_data.get(
+                "output_text", _get_output_text(parsed_response)
+            ),
             request_model=existing_data.get("request_model", kwargs.get("model")),
             response_model=existing_data.get("response_model", parsed_response.model),
         )
@@ -639,4 +643,16 @@ async def async_responses_cancel_wrapper(
     return response
 
 
+def _get_output_text(parsed_response: Response) -> Optional[str]:
+    output_text = None
+    if hasattr(parsed_response, "output_text"):
+        output_text = parsed_response.output_text
+    else:
+        try:
+            output_text = parsed_response.output[0].content[0].text
+        except Exception:
+            pass
+    return output_text
+
+
 # TODO: build streaming responses

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/tracing/_instrument_initializers.py

@@ -51,19 +51,26 @@ class BedrockInstrumentorInitializer(InstrumentorInitializer):
 
 
 class BrowserUseInstrumentorInitializer(InstrumentorInitializer):
-    def init_instrumentor(self, *args, **kwargs) -> BaseInstrumentor | None:
+    def init_instrumentor(
+        self, client, async_client, *args, **kwargs
+    ) -> BaseInstrumentor | None:
         if not is_package_installed("browser-use"):
             return None
 
         version = get_package_version("browser-use")
         from packaging.version import parse
 
-        if version and parse(version) >= parse("0.5.0"):
-            return None
+        if version and parse(version) < parse("0.5.0"):
+            from lmnr.sdk.browser.browser_use_otel import BrowserUseLegacyInstrumentor
+
+            return BrowserUseLegacyInstrumentor()
 
-        from lmnr.sdk.browser.browser_use_otel import BrowserUseInstrumentor
+        if version and parse(version) >= parse("1.0.0rc1"):
+            from lmnr.sdk.browser.browser_use_cdp_otel import BrowserUseInstrumentor
 
-        return BrowserUseInstrumentor()
+            return BrowserUseInstrumentor(async_client)
+
+        return None
 
 
 class ChromaInstrumentorInitializer(InstrumentorInitializer):
@@ -102,22 +109,6 @@ class CrewAIInstrumentorInitializer(InstrumentorInitializer):
         return CrewAiInstrumentor()
 
 
-class GoogleGenerativeAIInstrumentorInitializer(InstrumentorInitializer):
-    def init_instrumentor(self, *args, **kwargs) -> BaseInstrumentor | None:
-        if not is_package_installed("google-generativeai"):
-            return None
-        if not is_package_installed(
-            "opentelemetry-instrumentation-google-generativeai"
-        ):
-            return None
-
-        from opentelemetry.instrumentation.google_generativeai import (
-            GoogleGenerativeAiInstrumentor,
-        )
-
-        return GoogleGenerativeAiInstrumentor()
-
-
 class GoogleGenAIInstrumentorInitializer(InstrumentorInitializer):
     def init_instrumentor(self, *args, **kwargs) -> BaseInstrumentor | None:
         if not is_package_installed("google-genai"):

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/tracing/attributes.py

@@ -19,6 +19,7 @@ PARENT_SPAN_IDS_PATH = "lmnr.span.parent_ids_path"
 SPAN_INSTRUMENTATION_SOURCE = "lmnr.span.instrumentation_source"
 SPAN_SDK_VERSION = "lmnr.span.sdk_version"
 SPAN_LANGUAGE_VERSION = "lmnr.span.language_version"
+HUMAN_EVALUATOR_OPTIONS = "lmnr.span.human_evaluator_options"
 
 ASSOCIATION_PROPERTIES = "lmnr.association.properties"
 SESSION_ID = "session_id"

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/opentelemetry_lib/tracing/instruments.py

@@ -20,7 +20,6 @@ class Instruments(Enum):
     CHROMA = "chroma"
     COHERE = "cohere"
     CREWAI = "crewai"
-    GOOGLE_GENERATIVEAI = "google_generativeai"
     GOOGLE_GENAI = "google_genai"
     GROQ = "groq"
     HAYSTACK = "haystack"
@@ -63,7 +62,6 @@ INSTRUMENTATION_INITIALIZERS: dict[
     Instruments.CHROMA: initializers.ChromaInstrumentorInitializer(),
     Instruments.COHERE: initializers.CohereInstrumentorInitializer(),
     Instruments.CREWAI: initializers.CrewAIInstrumentorInitializer(),
-    Instruments.GOOGLE_GENERATIVEAI: initializers.GoogleGenerativeAIInstrumentorInitializer(),
     Instruments.GOOGLE_GENAI: initializers.GoogleGenAIInstrumentorInitializer(),
     Instruments.GROQ: initializers.GroqInstrumentorInitializer(),
     Instruments.HAYSTACK: initializers.HaystackInstrumentorInitializer(),

lmnr-0.7.5/src/lmnr/sdk/browser/browser_use_cdp_otel.py

@@ -0,0 +1,95 @@
+from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
+from lmnr.sdk.browser.utils import with_tracer_and_client_wrapper
+from lmnr.version import __version__
+from lmnr.sdk.browser.cdp_utils import (
+    is_recorder_present,
+    start_recording_events,
+    take_full_snapshot,
+)
+
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.trace import get_tracer, Tracer
+from typing import Collection
+from wrapt import wrap_function_wrapper
+import uuid
+
+# Stable versions, e.g. 1.0.0, satisfy this condition too
+_instruments = ("browser-use >= 1.0.0rc1",)
+
+WRAPPED_METHODS = [
+    {
+        "package": "browser_use.browser.session",
+        "object": "BrowserSession",
+        "method": "get_or_create_cdp_session",
+        "action": "inject_session_recorder",
+    },
+    {
+        "package": "browser_use.browser.session",
+        "object": "BrowserSession",
+        "method": "on_SwitchTabEvent",
+        "action": "take_full_snapshot",
+    },
+]
+
+
+@with_tracer_and_client_wrapper
+async def _wrap(
+    tracer: Tracer, client: AsyncLaminarClient, to_wrap, wrapped, instance, args, kwargs
+):
+    result = await wrapped(*args, **kwargs)
+
+    if to_wrap.get("action") == "inject_session_recorder":
+        is_registered = await is_recorder_present(result)
+        if not is_registered:
+            await start_recording_events(result, str(uuid.uuid4()), client)
+
+    if to_wrap.get("action") == "take_full_snapshot":
+        target_id = result
+        if target_id:
+            cdp_session = await instance.get_or_create_cdp_session(target_id)
+            await take_full_snapshot(cdp_session)
+
+    return result
+
+
+class BrowserUseInstrumentor(BaseInstrumentor):
+    def __init__(self, async_client: AsyncLaminarClient):
+        super().__init__()
+        self.async_client = async_client
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _instruments
+
+    def _instrument(self, **kwargs):
+        tracer_provider = kwargs.get("tracer_provider")
+        tracer = get_tracer(__name__, __version__, tracer_provider)
+
+        for wrapped_method in WRAPPED_METHODS:
+            wrap_package = wrapped_method.get("package")
+            wrap_object = wrapped_method.get("object")
+            wrap_method = wrapped_method.get("method")
+
+            try:
+                wrap_function_wrapper(
+                    wrap_package,
+                    f"{wrap_object}.{wrap_method}",
+                    _wrap(
+                        tracer,
+                        self.async_client,
+                        wrapped_method,
+                    ),
+                )
+            except (ModuleNotFoundError, ImportError):
+                pass  # that's ok, we're not instrumenting everything
+
+    def _uninstrument(self, **kwargs):
+        for wrapped_method in WRAPPED_METHODS:
+            wrap_package = wrapped_method.get("package")
+            wrap_object = wrapped_method.get("object")
+            wrap_method = wrapped_method.get("method")
+
+            unwrap(
+                f"{wrap_package}.{wrap_object}" if wrap_object else wrap_package,
+                wrap_method,
+            )

{lmnr-0.7.4 → lmnr-0.7.5}/src/lmnr/sdk/browser/browser_use_otel.py

@@ -1,5 +1,5 @@
 from lmnr.opentelemetry_lib.decorators import json_dumps
-from lmnr.sdk.laminar import Laminar
+from lmnr import Laminar
 from lmnr.sdk.browser.utils import with_tracer_wrapper
 from lmnr.sdk.utils import get_input_from_func_args
 from lmnr.version import __version__
@@ -16,11 +16,11 @@ try:
 except ImportError as e:
     raise ImportError(
         f"Attempted to import {__file__}, but it is designed "
-        "to patch Browser Use, which is not installed. Use `pip install browser-use` "
+        "to patch Browser Use < 0.5.0, which is not installed. Use `pip install browser-use` "
         "to install Browser Use or remove this import."
     ) from e
 
-_instruments = ("browser-use >= 0.1.0",)
+_instruments = ("browser-use < 0.5.0",)
 
 WRAPPED_METHODS = [
     {
@@ -89,7 +89,6 @@ async def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
             span_name = f"agent.step.{step_info.step_number}"
 
     with Laminar.start_as_current_span(span_name) as span:
-        span.set_attributes(attributes)
         result = await wrapped(*args, **kwargs)
         if not to_wrap.get("ignore_output"):
             to_serialize = result
@@ -104,7 +103,7 @@ async def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
         return result
 
 
-class BrowserUseInstrumentor(BaseInstrumentor):
+class BrowserUseLegacyInstrumentor(BaseInstrumentor):
     def __init__(self):
         super().__init__()