lmnr 0.6.0__tar.gz → 0.6.1__tar.gz

{lmnr-0.6.0 → lmnr-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lmnr
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python SDK for Laminar
 License: Apache-2.0
 Author: lmnr.ai
@@ -90,6 +90,7 @@ Requires-Dist: opentelemetry-instrumentation-replicate (>=0.40.5) ; extra == "al
 Requires-Dist: opentelemetry-instrumentation-replicate (>=0.40.5) ; extra == "replicate"
 Requires-Dist: opentelemetry-instrumentation-sagemaker (>=0.40.5) ; extra == "all"
 Requires-Dist: opentelemetry-instrumentation-sagemaker (>=0.40.5) ; extra == "sagemaker"
+Requires-Dist: opentelemetry-instrumentation-threading (>=0.54b0)
 Requires-Dist: opentelemetry-instrumentation-together (>=0.40.5) ; extra == "all"
 Requires-Dist: opentelemetry-instrumentation-together (>=0.40.5) ; extra == "together"
 Requires-Dist: opentelemetry-instrumentation-transformers (>=0.40.5) ; extra == "all"

{lmnr-0.6.0 → lmnr-0.6.1}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.6.0"
+version = "0.6.1"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -36,6 +36,7 @@ dependencies = [
   # https://github.com/grpc/grpc/issues/38490
   "grpcio<1.68.0",
   "httpx>=0.25.0",
+  "opentelemetry-instrumentation-threading>=0.54b0",
 ]
 
 [project.scripts]
@@ -117,10 +118,11 @@ dev = [
   "pytest>=8.3.5",
   "pytest-sugar>=1.0.0",
   "pytest-asyncio>=0.26.0",
-  "playwright>=1.51.0",
+  "playwright>=1.52.0",
   "vcrpy>=7.0.0",
   "openai>=1.77.0",
   "pytest-recording>=0.13.4",
+  "patchright>=1.52.3",
 ]
 
 [build-system]

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/opentelemetry_lib/__init__.py

@@ -1,3 +1,4 @@
+import logging
 import sys
 
 from typing import Optional, Set
@@ -20,6 +21,7 @@ class TracerManager:
         exporter: Optional[SpanExporter] = None,
         resource_attributes: dict = {},
         instruments: Optional[Set[Instruments]] = None,
+        block_instruments: Optional[Set[Instruments]] = None,
         base_url: str = "https://api.lmnr.ai",
         port: int = 8443,
         http_port: int = 443,
@@ -27,6 +29,8 @@ class TracerManager:
         max_export_batch_size: Optional[int] = None,
         force_http: bool = False,
         timeout_seconds: int = 30,
+        set_global_tracer_provider: bool = True,
+        otel_logger_level: int = logging.ERROR,
     ) -> None:
         enable_content_tracing = True
 
@@ -37,6 +41,7 @@ class TracerManager:
             disable_batch=disable_batch,
             exporter=exporter,
             instruments=instruments,
+            block_instruments=block_instruments,
             base_url=base_url,
             port=port,
             http_port=http_port,
@@ -44,6 +49,8 @@ class TracerManager:
             max_export_batch_size=max_export_batch_size,
             force_http=force_http,
             timeout_seconds=timeout_seconds,
+            set_global_tracer_provider=set_global_tracer_provider,
+            otel_logger_level=otel_logger_level,
         )
 
     @staticmethod

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/opentelemetry_lib/tracing/__init__.py

@@ -11,13 +11,12 @@ from lmnr.opentelemetry_lib.tracing.instruments import (
 )
 
 from opentelemetry import trace
+from opentelemetry.instrumentation.threading import ThreadingInstrumentor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider, SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
-
 from typing import Optional, Set
 
-
 module_logger = logging.getLogger(__name__)
 console_log_handler = logging.StreamHandler()
 console_log_handler.setFormatter(VerboseColorfulFormatter())
@@ -52,7 +51,12 @@ class TracerWrapper(object):
         max_export_batch_size: Optional[int] = None,
         force_http: bool = False,
         timeout_seconds: int = 10,
+        set_global_tracer_provider: bool = True,
+        otel_logger_level: int = logging.ERROR,
     ) -> "TracerWrapper":
+        # Silence some opentelemetry warnings
+        logging.getLogger("opentelemetry.trace").setLevel(otel_logger_level)
+
         base_http_url = f"{base_url}:{http_port}"
         cls._initialize_logger(cls)
         if not hasattr(cls, "instance"):
@@ -68,7 +72,6 @@ class TracerWrapper(object):
             )
 
             obj.__resource = Resource(attributes=TracerWrapper.resource_attributes)
-            obj.__tracer_provider = TracerProvider(resource=obj.__resource)
 
             obj.__span_processor = LaminarSpanProcessor(
                 base_url=base_url,
@@ -81,8 +84,24 @@ class TracerWrapper(object):
                 disable_batch=disable_batch,
             )
 
+            lmnr_provider = TracerProvider(resource=obj.__resource)
+            global_provider = trace.get_tracer_provider()
+            if set_global_tracer_provider and isinstance(
+                global_provider, trace.ProxyTracerProvider
+            ):
+                trace.set_tracer_provider(lmnr_provider)
+
+            obj.__tracer_provider = lmnr_provider
+
             obj.__tracer_provider.add_span_processor(obj.__span_processor)
 
+            # This is not a real instrumentation and does not generate telemetry
+            # data, but it is required to ensure that OpenTelemetry context
+            # propagation is enabled.
+            # See the README at:
+            # https://pypi.org/project/opentelemetry-instrumentation-threading/
+            ThreadingInstrumentor().instrument()
+
             init_instrumentations(
                 tracer_provider=obj.__tracer_provider,
                 instruments=instruments,

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/sdk/browser/playwright_otel.py

@@ -1,6 +1,7 @@
 import logging
 import uuid
 
+from lmnr.opentelemetry_lib.utils.package_check import is_package_installed
 from lmnr.sdk.browser.pw_utils import handle_navigation_async, handle_navigation_sync
 from lmnr.sdk.browser.utils import with_tracer_and_client_wrapper
 from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
@@ -22,17 +23,31 @@ from typing import Collection
 from wrapt import wrap_function_wrapper
 
 try:
-    from playwright.async_api import Browser, BrowserContext, Page
-    from playwright.sync_api import (
-        Browser as SyncBrowser,
-        BrowserContext as SyncBrowserContext,
-        Page as SyncPage,
-    )
+    if is_package_installed("playwright"):
+        from playwright.async_api import Browser, BrowserContext, Page
+        from playwright.sync_api import (
+            Browser as SyncBrowser,
+            BrowserContext as SyncBrowserContext,
+            Page as SyncPage,
+        )
+    elif is_package_installed("patchright"):
+        from patchright.async_api import Browser, BrowserContext, Page
+        from patchright.sync_api import (
+            Browser as SyncBrowser,
+            BrowserContext as SyncBrowserContext,
+            Page as SyncPage,
+        )
+    else:
+        raise ImportError(
+            "Attempted to import lmnr.sdk.browser.playwright_otel, but neither "
+            "playwright nor patchright is installed. Use `pip install playwright` "
+            "or `pip install patchright` to install one of the supported browsers."
+        )
 except ImportError as e:
     raise ImportError(
         f"Attempted to import {__file__}, but it is designed "
         "to patch Playwright, which is not installed. Use `pip install playwright` "
-        "to install Playwright or remove this import."
+        "or `pip install patchright` to install Playwright or remove this import."
     ) from e
 
 # all available versions at https://pypi.org/project/playwright/#history

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/sdk/browser/pw_utils.py

@@ -6,19 +6,31 @@ import threading
 
 from opentelemetry import trace
 
+from lmnr.opentelemetry_lib.utils.package_check import is_package_installed
 from lmnr.sdk.decorators import observe
 from lmnr.sdk.browser.utils import retry_sync, retry_async
 from lmnr.sdk.client.synchronous.sync_client import LaminarClient
 from lmnr.sdk.client.asynchronous.async_client import AsyncLaminarClient
 
+
 try:
-    from playwright.async_api import Page
-    from playwright.sync_api import Page as SyncPage
+    if is_package_installed("playwright"):
+        from playwright.async_api import Page
+        from playwright.sync_api import Page as SyncPage
+    elif is_package_installed("patchright"):
+        from patchright.async_api import Page
+        from patchright.sync_api import Page as SyncPage
+    else:
+        raise ImportError(
+            "Attempted to import lmnr.sdk.browser.pw_utils, but neither "
+            "playwright nor patchright is installed. Use `pip install playwright` "
+            "or `pip install patchright` to install one of the supported browsers."
+        )
 except ImportError as e:
     raise ImportError(
-        f"Attempted to import {__file__}, but it is designed "
-        "to patch Playwright, which is not installed. Use `pip install playwright` "
-        "to install Playwright or remove this import."
+        "Attempted to import lmnr.sdk.browser.pw_utils, but neither "
+        "playwright nor patchright is installed. Use `pip install playwright` "
+        "or `pip install patchright` to install one of the supported browsers."
     ) from e
 
 logger = logging.getLogger(__name__)

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/sdk/laminar.py

@@ -59,9 +59,12 @@ class Laminar:
         http_port: Optional[int] = None,
         grpc_port: Optional[int] = None,
         instruments: Optional[Set[Instruments]] = None,
+        disabled_instruments: Optional[Set[Instruments]] = None,
         disable_batch: bool = False,
         max_export_batch_size: Optional[int] = None,
         export_timeout_seconds: Optional[int] = None,
+        set_global_tracer_provider: bool = True,
+        otel_logger_level: int = logging.ERROR,
     ):
         """Initialize Laminar context across the application.
         This method must be called before using any other Laminar methods or
@@ -86,6 +89,8 @@ class Laminar:
                         enable. Defaults to all instruments. You can pass\
                         an empty set to disable all instruments. Read more:\
                         https://docs.lmnr.ai/tracing/automatic-instrumentation
+            disabled_instruments (Optional[Set[Instruments]], optional): Instruments to\
+                        disable. Defaults to None.
             disable_batch (bool, optional): If set to True, spans will be sent\
                         immediately to the backend. Useful for debugging, but\
                         may cause performance overhead in production.
@@ -94,6 +99,13 @@ class Laminar:
                         exporter. Defaults to 30 seconds (unlike the\
                         OpenTelemetry default of 10 seconds).
                         Defaults to None.
+            set_global_tracer_provider (bool, optional): If set to True, the\
+                        Laminar tracer provider will be set as the global\
+                        tracer provider. OpenTelemetry allows only one tracer\
+                        provider per app, so set this to False, if you are using\
+                        another tracing library. Setting this to False may break\
+                        some external instrumentations, e.g. LiteLLM.
+                        Defaults to True.
 
         Raises:
             ValueError: If project API key is not set
@@ -133,9 +145,12 @@ class Laminar:
             port=grpc_port or 8443,
             project_api_key=cls.__project_api_key,
             instruments=instruments,
+            block_instruments=disabled_instruments,
             disable_batch=disable_batch,
             max_export_batch_size=max_export_batch_size,
             timeout_seconds=export_timeout_seconds,
+            set_global_tracer_provider=set_global_tracer_provider,
+            otel_logger_level=otel_logger_level,
         )
 
     @classmethod

{lmnr-0.6.0 → lmnr-0.6.1}/src/lmnr/version.py

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