lmnr 0.5.1a0__py3-none-any.whl → 0.5.3__py3-none-any.whl

lmnr/__init__.py

@@ -6,26 +6,21 @@ from .sdk.laminar import Laminar
 from .sdk.types import (
     AgentOutput,
     FinalOutputChunkContent,
-    ChatMessage,
     HumanEvaluator,
-    NodeInput,
-    PipelineRunError,
-    PipelineRunResponse,
     RunAgentResponseChunk,
     StepChunkContent,
     TracingLevel,
 )
 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__ = [
     "AgentOutput",
     "AsyncLaminarClient",
     "Attributes",
-    "ChatMessage",
     "EvaluationDataset",
     "FinalOutputChunkContent",
     "HumanEvaluator",
@@ -34,9 +29,6 @@ __all__ = [
     "LaminarClient",
     "LaminarDataset",
     "LaminarSpanContext",
-    "NodeInput",
-    "PipelineRunError",
-    "PipelineRunResponse",
     "RunAgentResponseChunk",
     "StepChunkContent",
     "TracingLevel",

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/{openllmetry_sdk → opentelemetry_lib}/__init__.py

@@ -1,6 +1,5 @@
 import sys
 
-from contextlib import contextmanager
 from typing import Optional, Set
 from opentelemetry.sdk.trace import SpanProcessor
 from opentelemetry.sdk.trace.export import SpanExporter
@@ -8,18 +7,17 @@ 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
 
 
 class TracerManager:
     __tracer_wrapper: TracerWrapper
-    __initialized: bool = False
 
     @staticmethod
     def init(
@@ -53,6 +51,9 @@ class TracerManager:
 
         # Tracer init
         resource_attributes.update({SERVICE_NAME: app_name})
+        TracerWrapper.set_static_params(
+            resource_attributes, enable_content_tracing, api_endpoint, headers
+        )
         TracerManager.__tracer_wrapper = TracerWrapper(
             disable_batch=disable_batch,
             processor=processor,
@@ -63,41 +64,12 @@ class TracerManager:
             base_http_url=base_http_url,
             project_api_key=project_api_key,
             max_export_batch_size=max_export_batch_size,
-            resource_attributes=resource_attributes,
-            enable_content_tracing=enable_content_tracing,
-            endpoint=api_endpoint,
-            headers=headers,
         )
-        TracerManager.__initialized = True
 
     @staticmethod
     def flush() -> bool:
         return TracerManager.__tracer_wrapper.flush()
 
     @staticmethod
-    def shutdown() -> bool:
-        try:
-            res = TracerManager.__tracer_wrapper.shutdown()
-            TracerManager.__tracer_wrapper = None
-            TracerManager.__initialized = False
-            return res
-        except Exception:
-            return False
-
-    @staticmethod
-    def is_initialized() -> bool:
-        return TracerManager.__initialized
-
-    @staticmethod
-    def get_tracer_wrapper() -> TracerWrapper:
-        return TracerManager.__tracer_wrapper
-
-
-@contextmanager
-def get_tracer(flush_on_exit: bool = False):
-    wrapper = TracerManager.get_tracer_wrapper()
-    try:
-        yield wrapper.get_tracer()
-    finally:
-        if flush_on_exit:
-            wrapper.flush()
+    def shutdown():
+        TracerManager.__tracer_wrapper.shutdown()

lmnr/{openllmetry_sdk → opentelemetry_lib}/decorators/base.py

@@ -1,7 +1,6 @@
 import json
 from functools import wraps
 import logging
-import os
 import pydantic
 import types
 from typing import Any, Literal, Optional, Union
@@ -11,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 import get_tracer
-from lmnr.openllmetry_sdk.tracing.attributes import SPAN_INPUT, SPAN_OUTPUT, SPAN_TYPE
-from lmnr.openllmetry_sdk import TracerManager
-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):
@@ -40,13 +39,14 @@ def json_dumps(data: dict) -> str:
 def entity_method(
     name: Optional[str] = None,
     ignore_input: bool = False,
+    ignore_inputs: Optional[list[str]] = None,
     ignore_output: bool = False,
     span_type: Union[Literal["DEFAULT"], Literal["LLM"], Literal["TOOL"]] = "DEFAULT",
 ):
     def decorate(fn):
         @wraps(fn)
         def wrap(*args, **kwargs):
-            if not TracerManager.is_initialized():
+            if not TracerWrapper.verify_initialized():
                 return fn(*args, **kwargs)
 
             span_name = name or fn.__name__
@@ -58,9 +58,15 @@ def entity_method(
                 ctx_token = context_api.attach(ctx)
 
                 try:
-                    if _should_send_prompts() and not ignore_input:
+                    if not ignore_input:
                         inp = json_dumps(
-                            get_input_from_func_args(fn, is_method(fn), args, kwargs)
+                            get_input_from_func_args(
+                                fn,
+                                is_method=is_method(fn),
+                                func_args=args,
+                                func_kwargs=kwargs,
+                                ignore_inputs=ignore_inputs,
+                            )
                         )
                         if len(inp) > MAX_MANUAL_SPAN_PAYLOAD_SIZE:
                             span.set_attribute(
@@ -83,7 +89,7 @@ def entity_method(
                     return _handle_generator(span, res)
 
                 try:
-                    if _should_send_prompts() and not ignore_output:
+                    if not ignore_output:
                         output = json_dumps(res)
                         if len(output) > MAX_MANUAL_SPAN_PAYLOAD_SIZE:
                             span.set_attribute(
@@ -108,13 +114,14 @@ def entity_method(
 def aentity_method(
     name: Optional[str] = None,
     ignore_input: bool = False,
+    ignore_inputs: Optional[list[str]] = None,
     ignore_output: bool = False,
     span_type: Union[Literal["DEFAULT"], Literal["LLM"], Literal["TOOL"]] = "DEFAULT",
 ):
     def decorate(fn):
         @wraps(fn)
         async def wrap(*args, **kwargs):
-            if not TracerManager.is_initialized():
+            if not TracerWrapper.verify_initialized():
                 return await fn(*args, **kwargs)
 
             span_name = name or fn.__name__
@@ -126,9 +133,15 @@ def aentity_method(
                 ctx_token = context_api.attach(ctx)
 
                 try:
-                    if _should_send_prompts() and not ignore_input:
+                    if not ignore_input:
                         inp = json_dumps(
-                            get_input_from_func_args(fn, is_method(fn), args, kwargs)
+                            get_input_from_func_args(
+                                fn,
+                                is_method=is_method(fn),
+                                func_args=args,
+                                func_kwargs=kwargs,
+                                ignore_inputs=ignore_inputs,
+                            )
                         )
                         if len(inp) > MAX_MANUAL_SPAN_PAYLOAD_SIZE:
                             span.set_attribute(
@@ -151,7 +164,7 @@ def aentity_method(
                     return await _ahandle_generator(span, ctx_token, res)
 
                 try:
-                    if _should_send_prompts() and not ignore_output:
+                    if not ignore_output:
                         output = json_dumps(res)
                         if len(output) > MAX_MANUAL_SPAN_PAYLOAD_SIZE:
                             span.set_attribute(
@@ -192,12 +205,6 @@ async def _ahandle_generator(span, ctx_token, res):
     context_api.detach(ctx_token)
 
 
-def _should_send_prompts():
-    return (
-        os.getenv("TRACELOOP_TRACE_CONTENT") or "true"
-    ).lower() == "true" or context_api.get_value("override_enable_content_tracing")
-
-
 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)

lmnr/{openllmetry_sdk → opentelemetry_lib}/instruments.py

@@ -11,6 +11,7 @@ class Instruments(Enum):
     CHROMA = "chroma"
     COHERE = "cohere"
     GOOGLE_GENERATIVEAI = "google_generativeai"
+    GOOGLE_GENAI = "google_genai"
     GROQ = "groq"
     HAYSTACK = "haystack"
     LANCEDB = "lancedb"
@@ -23,6 +24,7 @@ class Instruments(Enum):
     OPENAI = "openai"
     PINECONE = "pinecone"
     PLAYWRIGHT = "playwright"
+    PATCHRIGHT = "patchright"
     QDRANT = "qdrant"
     REPLICATE = "replicate"
     SAGEMAKER = "sagemaker"