lmnr 0.6.9__tar.gz → 0.6.10__tar.gz

{lmnr-0.6.9 → lmnr-0.6.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lmnr
-Version: 0.6.9
+Version: 0.6.10
 Summary: Python SDK for Laminar
 License: Apache-2.0
 Author: lmnr.ai

{lmnr-0.6.9 → lmnr-0.6.10}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.6.9"
+version = "0.6.10"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/cli.py

@@ -100,9 +100,14 @@ async def run_evaluation(args):
             sys.modules[name] = mod
 
             spec.loader.exec_module(mod)
-            evaluations: list[Evaluation] | None = EVALUATION_INSTANCES.get()
-            if evaluations is None:
-                LOG.warning("Evaluation instance not found")
+            evaluations = []
+            try:
+                evaluations: list[Evaluation] | None = EVALUATION_INSTANCES.get()
+                if evaluations is None:
+                    raise LookupError()
+            # may be raised by `get()` or manually by us above
+            except LookupError:
+                log_evaluation_instance_not_found()
                 if args.continue_on_error:
                     continue
                 return
@@ -130,6 +135,14 @@ async def run_evaluation(args):
         PREPARE_ONLY.reset(prep_token)
 
 
+def log_evaluation_instance_not_found():
+    LOG.warning(
+        "Evaluation instance not found. "
+        "`evaluate` must be called at the top level of the file, "
+        "not inside a function when running evaluations from the CLI."
+    )
+
+
 def cli():
     parser = ArgumentParser(
         prog="lmnr",

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/opentelemetry_lib/__init__.py

@@ -54,6 +54,8 @@ class TracerManager:
 
     @staticmethod
     def flush() -> bool:
+        if not hasattr(TracerManager, "_TracerManager__tracer_wrapper"):
+            return False
         return TracerManager.__tracer_wrapper.flush()
 
     @staticmethod

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/__init__.py

@@ -11,7 +11,7 @@ from .utils import (
 from langchain_core.runnables.graph import Graph
 from opentelemetry.trace import Tracer
 from wrapt import wrap_function_wrapper
-from opentelemetry.trace import get_tracer, get_current_span
+from opentelemetry.trace import get_tracer
 
 from lmnr.opentelemetry_lib.tracing.context_properties import (
     update_association_properties,
@@ -81,7 +81,9 @@ async def async_wrap_pregel_stream(
             "langgraph.nodes": json.dumps(nodes),
         },
     )
-    return await wrapped(*args, **kwargs)
+
+    async for item in wrapped(*args, **kwargs):
+        yield item
 
 
 class LanggraphInstrumentor(BaseInstrumentor):

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

@@ -0,0 +1,162 @@
+import atexit
+import logging
+import threading
+
+from lmnr.opentelemetry_lib.tracing.processor import LaminarSpanProcessor
+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.opentelemetry_lib.tracing.instruments import (
+    Instruments,
+    init_instrumentations,
+)
+
+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
+
+TRACER_NAME = "lmnr.tracer"
+
+MAX_EVENTS_OR_ATTRIBUTES_PER_SPAN = 5000
+
+
+class TracerWrapper(object):
+    resource_attributes: dict = {}
+    enable_content_tracing: bool = True
+    _lock = threading.Lock()
+    _tracer_provider: TracerProvider | None = None
+    _logger: logging.Logger
+    _client: LaminarClient
+    _async_client: AsyncLaminarClient
+    _resource: Resource
+    _span_processor: SpanProcessor
+
+    def __new__(
+        cls,
+        disable_batch=False,
+        exporter: SpanExporter | None = None,
+        instruments: set[Instruments] | None = None,
+        block_instruments: set[Instruments] | None = None,
+        base_url: str = "https://api.lmnr.ai",
+        port: int = 8443,
+        http_port: int = 443,
+        project_api_key: str | None = None,
+        max_export_batch_size: int | None = 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}"
+        with cls._lock:
+            if not hasattr(cls, "instance"):
+                cls._initialize_logger(cls)
+                obj = super(TracerWrapper, cls).__new__(cls)
+
+                obj._client = LaminarClient(
+                    base_url=base_http_url,
+                    project_api_key=project_api_key,
+                )
+                obj._async_client = AsyncLaminarClient(
+                    base_url=base_http_url,
+                    project_api_key=project_api_key,
+                )
+
+                obj._resource = Resource(attributes=TracerWrapper.resource_attributes)
+
+                obj._span_processor = LaminarSpanProcessor(
+                    base_url=base_url,
+                    api_key=project_api_key,
+                    port=http_port if force_http else port,
+                    exporter=exporter,
+                    max_export_batch_size=max_export_batch_size,
+                    timeout_seconds=timeout_seconds,
+                    force_http=force_http,
+                    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,
+                    block_instruments=block_instruments,
+                    client=obj._client,
+                    async_client=obj._async_client,
+                )
+
+                cls.instance = obj
+
+                # Force flushes for debug environments (e.g. local development)
+                atexit.register(obj.exit_handler)
+
+            return cls.instance
+
+    def exit_handler(self):
+        if isinstance(self._span_processor, LaminarSpanProcessor):
+            self._span_processor.clear()
+        self.flush()
+
+    def _initialize_logger(self):
+        self._logger = logging.getLogger(__name__)
+        console_log_handler = logging.StreamHandler()
+        console_log_handler.setFormatter(VerboseColorfulFormatter())
+        self._logger.addHandler(console_log_handler)
+
+    @staticmethod
+    def set_static_params(
+        resource_attributes: dict,
+        enable_content_tracing: bool,
+    ) -> None:
+        TracerWrapper.resource_attributes = resource_attributes
+        TracerWrapper.enable_content_tracing = enable_content_tracing
+
+    @classmethod
+    def verify_initialized(cls) -> bool:
+        with cls._lock:
+            return hasattr(cls, "instance") and hasattr(cls.instance, "_span_processor")
+
+    @classmethod
+    def clear(cls):
+        if not cls.verify_initialized():
+            return
+        # Any state cleanup. Now used in between tests
+        if isinstance(cls.instance._span_processor, LaminarSpanProcessor):
+            cls.instance._span_processor.clear()
+
+    def shutdown(self):
+        if self._tracer_provider is None:
+            return
+        self._tracer_provider.shutdown()
+
+    def flush(self):
+        if not hasattr(self, "_span_processor"):
+            self._logger.warning("TracerWrapper not fully initialized, cannot flush")
+            return False
+        return self._span_processor.force_flush()
+
+    def get_tracer(self):
+        if self._tracer_provider is None:
+            return trace.get_tracer_provider().get_tracer(TRACER_NAME)
+        return self._tracer_provider.get_tracer(TRACER_NAME)

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/sdk/client/asynchronous/resources/evals.py

@@ -33,6 +33,10 @@ class AsyncEvals(BaseAsyncResource):
             },
             headers=self._headers(),
         )
+        if response.status_code != 200:
+            if response.status_code == 401:
+                raise ValueError("Unauthorized. Please check your project API key.")
+            raise ValueError(f"Error initializing evaluation: {response.text}")
         resp_json = response.json()
         return InitEvaluationResponse.model_validate(resp_json)
 

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/sdk/client/synchronous/resources/evals.py

@@ -35,6 +35,10 @@ class Evals(BaseResource):
             },
             headers=self._headers(),
         )
+        if response.status_code != 200:
+            if response.status_code == 401:
+                raise ValueError("Unauthorized. Please check your project API key.")
+            raise ValueError(f"Error initializing evaluation: {response.text}")
         resp_json = response.json()
         return InitEvaluationResponse.model_validate(resp_json)
 

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/sdk/evaluations.py

@@ -199,11 +199,11 @@ class Evaluation:
         self.base_http_url = f"{base_url}:{http_port or 443}"
 
         api_key = project_api_key or from_env("LMNR_PROJECT_API_KEY")
-        if not api_key:
+        if not api_key and not L.is_initialized():
             raise ValueError(
-                "Please initialize the Laminar object with"
-                " your project API key or set the LMNR_PROJECT_API_KEY"
-                " environment variable in your environment or .env file"
+                "Please pass the project API key to `evaluate`"
+                " or set the LMNR_PROJECT_API_KEY environment variable"
+                " in your environment or .env file"
             )
         self.project_api_key = api_key
 
@@ -212,17 +212,12 @@ class Evaluation:
                 base_url=L.get_base_http_url(),
                 project_api_key=L.get_project_api_key(),
             )
-            if project_api_key and project_api_key != L.get_project_api_key():
-                self._logger.warning(
-                    "Project API key is different from the one used to initialize"
-                    " Laminar. Ignoring the project API key passed to the evaluation."
-                )
-            return
+        else:
+            self.client = AsyncLaminarClient(
+                base_url=self.base_http_url,
+                project_api_key=self.project_api_key,
+            )
 
-        self.client = AsyncLaminarClient(
-            base_url=self.base_http_url,
-            project_api_key=self.project_api_key,
-        )
         L.initialize(
             project_api_key=project_api_key,
             base_url=base_url,
@@ -261,7 +256,7 @@ class Evaluation:
         except Exception as e:
             self.reporter.stopWithError(e)
             await self._shutdown()
-            return {}
+            raise
 
         average_scores = get_average_scores(result_datapoints)
         self.reporter.stop(average_scores, evaluation.projectId, evaluation.id)

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/sdk/laminar.py

@@ -114,6 +114,12 @@ class Laminar:
         Raises:
             ValueError: If project API key is not set
         """
+        if cls.is_initialized():
+            cls.__logger.info(
+                "Laminar is already initialized. Skipping initialization."
+            )
+            return
+
         cls.__project_api_key = project_api_key or from_env("LMNR_PROJECT_API_KEY")
         if not cls.__project_api_key:
             raise ValueError(
@@ -691,6 +697,7 @@ class Laminar:
     def shutdown(cls):
         if cls.is_initialized():
             TracerManager.shutdown()
+            cls.__initialized = False
 
     @classmethod
     def set_span_tags(cls, tags: list[str]):

{lmnr-0.6.9 → lmnr-0.6.10}/src/lmnr/version.py

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

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

@@ -1,157 +0,0 @@
-import atexit
-import logging
-
-from lmnr.opentelemetry_lib.tracing.processor import LaminarSpanProcessor
-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.opentelemetry_lib.tracing.instruments import (
-    Instruments,
-    init_instrumentations,
-)
-
-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
-
-module_logger = logging.getLogger(__name__)
-console_log_handler = logging.StreamHandler()
-console_log_handler.setFormatter(VerboseColorfulFormatter())
-module_logger.addHandler(console_log_handler)
-
-
-TRACER_NAME = "lmnr.tracer"
-
-MAX_EVENTS_OR_ATTRIBUTES_PER_SPAN = 5000
-
-
-class TracerWrapper(object):
-    resource_attributes: dict = {}
-    enable_content_tracing: bool = True
-    __tracer_provider: TracerProvider | None = None
-    __logger: logging.Logger
-    __client: LaminarClient
-    __async_client: AsyncLaminarClient
-    __resource: Resource
-    __span_processor: SpanProcessor
-
-    def __new__(
-        cls,
-        disable_batch=False,
-        exporter: SpanExporter | None = None,
-        instruments: set[Instruments] | None = None,
-        block_instruments: set[Instruments] | None = None,
-        base_url: str = "https://api.lmnr.ai",
-        port: int = 8443,
-        http_port: int = 443,
-        project_api_key: str | None = None,
-        max_export_batch_size: int | None = 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"):
-            obj = cls.instance = super(TracerWrapper, cls).__new__(cls)
-
-            obj.__client = LaminarClient(
-                base_url=base_http_url,
-                project_api_key=project_api_key,
-            )
-            obj.__async_client = AsyncLaminarClient(
-                base_url=base_http_url,
-                project_api_key=project_api_key,
-            )
-
-            obj.__resource = Resource(attributes=TracerWrapper.resource_attributes)
-
-            obj.__span_processor = LaminarSpanProcessor(
-                base_url=base_url,
-                api_key=project_api_key,
-                port=http_port if force_http else port,
-                exporter=exporter,
-                max_export_batch_size=max_export_batch_size,
-                timeout_seconds=timeout_seconds,
-                force_http=force_http,
-                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,
-                block_instruments=block_instruments,
-                client=obj.__client,
-                async_client=obj.__async_client,
-            )
-
-            # Force flushes for debug environments (e.g. local development)
-            atexit.register(obj.exit_handler)
-
-        return cls.instance
-
-    def exit_handler(self):
-        if isinstance(self.__span_processor, LaminarSpanProcessor):
-            self.__span_processor.clear()
-        self.flush()
-
-    def _initialize_logger(self):
-        self.__logger = logging.getLogger(__name__)
-        console_log_handler = logging.StreamHandler()
-        console_log_handler.setFormatter(VerboseColorfulFormatter())
-        self.__logger.addHandler(console_log_handler)
-
-    @staticmethod
-    def set_static_params(
-        resource_attributes: dict,
-        enable_content_tracing: bool,
-    ) -> None:
-        TracerWrapper.resource_attributes = resource_attributes
-        TracerWrapper.enable_content_tracing = enable_content_tracing
-
-    @classmethod
-    def verify_initialized(cls) -> bool:
-        return hasattr(cls, "instance")
-
-    @classmethod
-    def clear(cls):
-        # Any state cleanup. Now used in between tests
-        if isinstance(cls.instance.__span_processor, LaminarSpanProcessor):
-            cls.instance.__span_processor.clear()
-
-    def shutdown(self):
-        if self.__tracer_provider is None:
-            return
-        self.__tracer_provider.shutdown()
-
-    def flush(self):
-        return self.__span_processor.force_flush()
-
-    def get_tracer(self):
-        if self.__tracer_provider is None:
-            return trace.get_tracer_provider().get_tracer(TRACER_NAME)
-        return self.__tracer_provider.get_tracer(TRACER_NAME)