lmnr 0.5.2__tar.gz → 0.5.3__tar.gz

{lmnr-0.5.2 → lmnr-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lmnr
-Version: 0.5.2
+Version: 0.5.3
 Summary: Python SDK for Laminar
 License: Apache-2.0
 Author: lmnr.ai
@@ -222,7 +222,7 @@ def handle_user_request(topic: str):
 Laminar allows you to automatically instrument majority of the most popular LLM, Vector DB, database, requests, and other libraries.
 
 If you want to automatically instrument a default set of libraries, then simply do NOT pass `instruments` argument to `.initialize()`.
-See the full list of available instrumentations in the [enum](https://github.com/lmnr-ai/lmnr-python/blob/main/src/lmnr/openllmetry_sdk/instruments.py).
+See the full list of available instrumentations in the [enum](https://github.com/lmnr-ai/lmnr-python/blob/main/src/lmnr/opentelemetry_lib/instruments.py).
 
 If you want to automatically instrument only specific LLM, Vector DB, or other
 calls with OpenTelemetry-compatible instrumentation, then pass the appropriate instruments to `.initialize()`.

{lmnr-0.5.2 → lmnr-0.5.3}/README.md

@@ -113,7 +113,7 @@ def handle_user_request(topic: str):
 Laminar allows you to automatically instrument majority of the most popular LLM, Vector DB, database, requests, and other libraries.
 
 If you want to automatically instrument a default set of libraries, then simply do NOT pass `instruments` argument to `.initialize()`.
-See the full list of available instrumentations in the [enum](https://github.com/lmnr-ai/lmnr-python/blob/main/src/lmnr/openllmetry_sdk/instruments.py).
+See the full list of available instrumentations in the [enum](https://github.com/lmnr-ai/lmnr-python/blob/main/src/lmnr/opentelemetry_lib/instruments.py).
 
 If you want to automatically instrument only specific LLM, Vector DB, or other
 calls with OpenTelemetry-compatible instrumentation, then pass the appropriate instruments to `.initialize()`.

{lmnr-0.5.2 → lmnr-0.5.3}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.5.2"
+version = "0.5.3"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -120,6 +120,9 @@ dev = [
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.uv.workspace]
+members = ["examples/fastapi-app"]
 # we can move to uv_build, once it's more stable
 # https://github.com/astral-sh/uv/issues/3957
 # requires = ["uv_build>=0.6.16,<0.7"]

{lmnr-0.5.2 → lmnr-0.5.3}/src/lmnr/__init__.py

@@ -13,8 +13,8 @@ from .sdk.types import (
 )
 from .sdk.decorators import observe
 from .sdk.types import LaminarSpanContext
-from .openllmetry_sdk import Instruments
-from .openllmetry_sdk.tracing.attributes import Attributes
+from .opentelemetry_lib import Instruments
+from .opentelemetry_lib.tracing.attributes import Attributes
 from opentelemetry.trace import use_span
 
 __all__ = [

{lmnr-0.5.2 → lmnr-0.5.3}/src/lmnr/cli.py

@@ -1,18 +1,17 @@
 from argparse import ArgumentParser
 import asyncio
 import importlib.util
-import logging
 import os
 import re
 import sys
+from typing import Optional
+
+from lmnr.sdk.evaluations import Evaluation
 
 from .sdk.eval_control import PREPARE_ONLY, EVALUATION_INSTANCE
-from .sdk.log import ColorfulFormatter
+from .sdk.log import get_default_logger
 
-LOG = logging.getLogger(__name__)
-console_log_handler = logging.StreamHandler()
-console_log_handler.setFormatter(ColorfulFormatter())
-LOG.addHandler(console_log_handler)
+LOG = get_default_logger(__name__)
 
 
 EVAL_DIR = "evals"
@@ -28,7 +27,10 @@ async def run_evaluation(args):
             if re.match(r".*_eval\.py$", f) or re.match(r"eval_.*\.py$", f)
         ]
         if len(files) == 0:
-            LOG.error("No evaluation files found in evals directory")
+            LOG.error("No evaluation files found in `evals` directory")
+            LOG.info(
+                "Eval files must be located in the `evals` directory and must be named *_eval.py or eval_*.py"
+            )
             return
         files.sort()
         LOG.info(f"Located {len(files)} evaluation files in {EVAL_DIR}")
@@ -53,7 +55,7 @@ async def run_evaluation(args):
             sys.modules[name] = mod
 
             spec.loader.exec_module(mod)
-            evaluation = EVALUATION_INSTANCE.get()
+            evaluation: Optional[Evaluation] = EVALUATION_INSTANCE.get()
             if evaluation is None:
                 LOG.warning("Evaluation instance not found")
                 if args.fail_on_error:

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/__init__.py

@@ -7,12 +7,12 @@ from opentelemetry.sdk.resources import SERVICE_NAME
 from opentelemetry.propagators.textmap import TextMapPropagator
 from opentelemetry.util.re import parse_env_headers
 
-from lmnr.openllmetry_sdk.instruments import Instruments
-from lmnr.openllmetry_sdk.config import (
+from lmnr.opentelemetry_lib.instruments import Instruments
+from lmnr.opentelemetry_lib.config import (
     is_content_tracing_enabled,
     is_tracing_enabled,
 )
-from lmnr.openllmetry_sdk.tracing.tracing import TracerWrapper
+from lmnr.opentelemetry_lib.tracing.tracing import TracerWrapper
 from typing import Dict
 
 

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/decorators/base.py

@@ -10,11 +10,11 @@ from opentelemetry import context as context_api
 from opentelemetry.trace import Span
 
 from lmnr.sdk.utils import get_input_from_func_args, is_method
-from lmnr.openllmetry_sdk.tracing import get_tracer
-from lmnr.openllmetry_sdk.tracing.attributes import SPAN_INPUT, SPAN_OUTPUT, SPAN_TYPE
-from lmnr.openllmetry_sdk.tracing.tracing import TracerWrapper
-from lmnr.openllmetry_sdk.utils.json_encoder import JSONEncoder
-from lmnr.openllmetry_sdk.config import MAX_MANUAL_SPAN_PAYLOAD_SIZE
+from lmnr.opentelemetry_lib.tracing import get_tracer
+from lmnr.opentelemetry_lib.tracing.attributes import SPAN_INPUT, SPAN_OUTPUT, SPAN_TYPE
+from lmnr.opentelemetry_lib.tracing.tracing import TracerWrapper
+from lmnr.opentelemetry_lib.utils.json_encoder import JSONEncoder
+from lmnr.opentelemetry_lib.config import MAX_MANUAL_SPAN_PAYLOAD_SIZE
 
 
 class CustomJSONEncoder(JSONEncoder):

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/instruments.py

@@ -24,6 +24,7 @@ class Instruments(Enum):
     OPENAI = "openai"
     PINECONE = "pinecone"
     PLAYWRIGHT = "playwright"
+    PATCHRIGHT = "patchright"
     QDRANT = "qdrant"
     REPLICATE = "replicate"
     SAGEMAKER = "sagemaker"

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/opentelemetry/instrumentation/google_genai/utils.py

@@ -34,7 +34,7 @@ def dont_throw(func):
             return func(*args, **kwargs)
         except Exception as e:
             logger.debug(
-                "OpenLLMetry failed to trace in %s, error: %s",
+                "Laminar failed to trace in %s, error: %s",
                 func.__name__,
                 traceback.format_exc(),
             )

lmnr-0.5.3/src/lmnr/opentelemetry_lib/tracing/__init__.py

@@ -0,0 +1 @@
+from lmnr.opentelemetry_lib.tracing.context_manager import get_tracer

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/tracing/context_manager.py

@@ -1,6 +1,6 @@
 from contextlib import contextmanager
 
-from lmnr.openllmetry_sdk.tracing.tracing import TracerWrapper
+from lmnr.opentelemetry_lib.tracing.tracing import TracerWrapper
 
 
 @contextmanager

{lmnr-0.5.2/src/lmnr/openllmetry_sdk → lmnr-0.5.3/src/lmnr/opentelemetry_lib}/tracing/tracing.py

@@ -7,8 +7,8 @@ from contextvars import Context
 from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
 from lmnr.sdk.client.synchronous.sync_client import LaminarClient
 from lmnr.sdk.log import VerboseColorfulFormatter
-from lmnr.openllmetry_sdk.instruments import Instruments
-from lmnr.openllmetry_sdk.tracing.attributes import (
+from lmnr.opentelemetry_lib.instruments import Instruments
+from lmnr.opentelemetry_lib.tracing.attributes import (
     ASSOCIATION_PROPERTIES,
     SPAN_IDS_PATH,
     SPAN_INSTRUMENTATION_SOURCE,
@@ -17,9 +17,9 @@ from lmnr.openllmetry_sdk.tracing.attributes import (
     SPAN_PATH,
     TRACING_LEVEL,
 )
-from lmnr.openllmetry_sdk.tracing.content_allow_list import ContentAllowList
-from lmnr.openllmetry_sdk.utils import is_notebook
-from lmnr.openllmetry_sdk.utils.package_check import is_package_installed
+from lmnr.opentelemetry_lib.tracing.content_allow_list import ContentAllowList
+from lmnr.opentelemetry_lib.utils import is_notebook
+from lmnr.opentelemetry_lib.utils.package_check import is_package_installed
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import (
     OTLPSpanExporter as HTTPExporter,
@@ -455,6 +455,9 @@ def init_instrumentations(
         elif instrument == Instruments.PLAYWRIGHT:
             if init_playwright_instrumentor(client, async_client):
                 instrument_set = True
+        elif instrument == Instruments.PATCHRIGHT:
+            if init_patchright_instrumentor(client, async_client):
+                instrument_set = True
         elif instrument == Instruments.BROWSER_USE:
             if init_browser_use_instrumentor():
                 instrument_set = True
@@ -499,6 +502,21 @@ def init_playwright_instrumentor(
         return False
 
 
+def init_patchright_instrumentor(
+    client: LaminarClient, async_client: AsyncLaminarClient
+):
+    try:
+        if is_package_installed("patchright"):
+            from lmnr.sdk.browser.patchright_otel import PatchrightInstrumentor
+
+            instrumentor = PatchrightInstrumentor(client, async_client)
+            instrumentor.instrument()
+        return True
+    except Exception as e:
+        module_logger.error(f"Error initializing patchright instrumentor: {e}")
+        return False
+
+
 def init_openai_instrumentor(should_enrich_metrics: bool):
     try:
         if is_package_installed("openai") and is_package_installed(

{lmnr-0.5.2 → lmnr-0.5.3}/src/lmnr/sdk/browser/browser_use_otel.py

@@ -1,4 +1,4 @@
-from lmnr.openllmetry_sdk.decorators.base import json_dumps
+from lmnr.opentelemetry_lib.decorators.base import json_dumps
 from lmnr.sdk.browser.utils import with_tracer_wrapper
 from lmnr.sdk.utils import get_input_from_func_args
 from lmnr.version import __version__
@@ -8,6 +8,16 @@ from opentelemetry.instrumentation.utils import unwrap
 from opentelemetry.trace import get_tracer, Tracer
 from typing import Collection
 from wrapt import wrap_function_wrapper
+import pydantic
+
+try:
+    from browser_use import AgentHistoryList
+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 install Browser Use or remove this import."
+    ) from e
 
 _instruments = ("browser-use >= 0.1.0",)
 
@@ -18,7 +28,7 @@ WRAPPED_METHODS = [
         "method": "run",
         "span_name": "agent.run",
         "ignore_input": False,
-        "ignore_output": True,
+        "ignore_output": False,
         "span_type": "DEFAULT",
     },
     {
@@ -73,7 +83,14 @@ async def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
         span.set_attributes(attributes)
         result = await wrapped(*args, **kwargs)
         if not to_wrap.get("ignore_output"):
-            span.set_attribute("lmnr.span.output", json_dumps(result))
+            if isinstance(result, AgentHistoryList):
+                result = result.final_result()
+            serialized = (
+                result.model_dump_json()
+                if isinstance(result, pydantic.BaseModel)
+                else json_dumps(result)
+            )
+            span.set_attribute("lmnr.span.output", serialized)
         return result
 
 

lmnr-0.5.3/src/lmnr/sdk/browser/patchright_otel.py

@@ -0,0 +1,177 @@
+from lmnr.sdk.browser.playwright_otel import (
+    _wrap_new_page,
+    _wrap_new_page_async,
+    _wrap_new_browser_sync,
+    _wrap_new_browser_async,
+    _wrap_new_context_sync,
+    _wrap_new_context_async,
+    _wrap_close_browser_sync,
+    _wrap_close_browser_async,
+)
+from lmnr.sdk.client.synchronous.sync_client import LaminarClient
+from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.utils import unwrap
+from opentelemetry.trace import get_tracer
+from lmnr.version import __version__
+from typing import Collection
+from wrapt import wrap_function_wrapper
+
+_instruments = ("patchright >= 1.9.0",)
+
+WRAPPED_METHODS = [
+    {
+        "package": "patchright.sync_api",
+        "object": "BrowserContext",
+        "method": "new_page",
+        "wrapper": _wrap_new_page,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "Browser",
+        "method": "new_page",
+        "wrapper": _wrap_new_page,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "BrowserType",
+        "method": "launch",
+        "wrapper": _wrap_new_browser_sync,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "BrowserType",
+        "method": "connect",
+        "wrapper": _wrap_new_browser_sync,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "BrowserType",
+        "method": "connect_over_cdp",
+        "wrapper": _wrap_new_browser_sync,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "Browser",
+        "method": "close",
+        "wrapper": _wrap_close_browser_sync,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "Browser",
+        "method": "new_context",
+        "wrapper": _wrap_new_context_sync,
+    },
+    {
+        "package": "patchright.sync_api",
+        "object": "BrowserType",
+        "method": "launch_persistent_context",
+        "wrapper": _wrap_new_context_sync,
+    },
+]
+
+WRAPPED_METHODS_ASYNC = [
+    {
+        "package": "patchright.async_api",
+        "object": "BrowserContext",
+        "method": "new_page",
+        "wrapper": _wrap_new_page_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "Browser",
+        "method": "new_page",
+        "wrapper": _wrap_new_page_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "BrowserType",
+        "method": "launch",
+        "wrapper": _wrap_new_browser_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "BrowserType",
+        "method": "connect",
+        "wrapper": _wrap_new_browser_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "BrowserType",
+        "method": "connect_over_cdp",
+        "wrapper": _wrap_new_browser_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "Browser",
+        "method": "close",
+        "wrapper": _wrap_close_browser_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "Browser",
+        "method": "new_context",
+        "wrapper": _wrap_new_context_async,
+    },
+    {
+        "package": "patchright.async_api",
+        "object": "BrowserType",
+        "method": "launch_persistent_context",
+        "wrapper": _wrap_new_context_async,
+    },
+]
+
+
+class PatchrightInstrumentor(BaseInstrumentor):
+    def __init__(self, client: LaminarClient, async_client: AsyncLaminarClient):
+        super().__init__()
+        self.client = client
+        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}",
+                    wrapped_method.get("wrapper")(
+                        tracer,
+                        self.client,
+                        wrapped_method,
+                    ),
+                )
+            except ModuleNotFoundError:
+                pass
+
+        for wrapped_method in WRAPPED_METHODS_ASYNC:
+            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}",
+                    wrapped_method.get("wrapper")(
+                        tracer,
+                        self.async_client,
+                        wrapped_method,
+                    ),
+                )
+            except ModuleNotFoundError:
+                pass
+
+    def _uninstrument(self, **kwargs):
+        for wrapped_method in WRAPPED_METHODS + WRAPPED_METHODS_ASYNC:
+            wrap_package = wrapped_method.get("package")
+            wrap_object = wrapped_method.get("object")
+            wrap_method = wrapped_method.get("method")
+            unwrap(wrap_package, f"{wrap_object}.{wrap_method}")

{lmnr-0.5.2 → lmnr-0.5.3}/src/lmnr/sdk/browser/playwright_otel.py

@@ -22,10 +22,11 @@ from typing import Collection
 from wrapt import wrap_function_wrapper
 
 try:
-    from playwright.async_api import Browser, BrowserContext
+    from playwright.async_api import Browser, BrowserContext, Page
     from playwright.sync_api import (
         Browser as SyncBrowser,
         BrowserContext as SyncBrowserContext,
+        Page as SyncPage,
     )
 except ImportError as e:
     raise ImportError(
@@ -88,10 +89,15 @@ def _wrap_new_browser_sync(
             _context_spans[id(context)] = span
         span.set_attribute("lmnr.internal.has_browser_session", True)
         trace_id = format(span.get_span_context().trace_id, "032x")
+
+        def handle_page_navigation(page: SyncPage):
+            return handle_navigation_sync(page, session_id, trace_id, client)
+
         context.on(
             "page",
-            lambda page: handle_navigation_sync(page, session_id, trace_id, client),
+            handle_page_navigation,
         )
+
         for page in context.pages:
             handle_navigation_sync(page, session_id, trace_id, client)
     return browser
@@ -115,7 +121,7 @@ async def _wrap_new_browser_async(
         span.set_attribute("lmnr.internal.has_browser_session", True)
         trace_id = format(span.get_span_context().trace_id, "032x")
 
-        async def handle_page_navigation(page):
+        async def handle_page_navigation(page: Page):
             return await handle_navigation_async(page, session_id, trace_id, client)
 
         context.on("page", handle_page_navigation)
@@ -140,9 +146,12 @@ def _wrap_new_context_sync(
     span.set_attribute("lmnr.internal.has_browser_session", True)
     trace_id = format(span.get_span_context().trace_id, "032x")
 
+    def handle_page_navigation(page: SyncPage):
+        return handle_navigation_sync(page, session_id, trace_id, client)
+
     context.on(
         "page",
-        lambda page: handle_navigation_sync(page, session_id, trace_id, client),
+        handle_page_navigation,
     )
     for page in context.pages:
         handle_navigation_sync(page, session_id, trace_id, client)
@@ -153,7 +162,7 @@ def _wrap_new_context_sync(
 async def _wrap_new_context_async(
     tracer: Tracer, client: AsyncLaminarClient, to_wrap, wrapped, instance, args, kwargs
 ):
-    context: SyncBrowserContext = await wrapped(*args, **kwargs)
+    context: BrowserContext = await wrapped(*args, **kwargs)
     session_id = str(uuid.uuid4().hex)
     span = get_current_span()
     if span == INVALID_SPAN:
@@ -311,10 +320,10 @@ WRAPPED_METHODS_ASYNC = [
         "wrapper": _wrap_new_context_async,
     },
     {
-        "package": "playwright.sync_api",
+        "package": "playwright.async_api",
         "object": "BrowserType",
         "method": "launch_persistent_context",
-        "wrapper": _wrap_new_context_sync,
+        "wrapper": _wrap_new_context_async,
     },
 ]