lmnr 0.6.18__tar.gz → 0.6.20__tar.gz

{lmnr-0.6.18 → lmnr-0.6.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.6.18
+Version: 0.6.20
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>
@@ -12,7 +12,7 @@ Requires-Dist: opentelemetry-sdk>=1.33.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.33.0
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc>=1.33.0
 Requires-Dist: opentelemetry-semantic-conventions>=0.54b0
-Requires-Dist: opentelemetry-semantic-conventions-ai>=0.4.8
+Requires-Dist: opentelemetry-semantic-conventions-ai>=0.4.9
 Requires-Dist: tqdm>=4.0
 Requires-Dist: tenacity>=8.0
 Requires-Dist: grpcio>=1
@@ -36,7 +36,6 @@ Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-milvus>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-mistralai>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-ollama>=0.40.12 ; extra == 'all'
-Requires-Dist: opentelemetry-instrumentation-openai>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-pinecone>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-qdrant>=0.40.12 ; extra == 'all'
 Requires-Dist: opentelemetry-instrumentation-replicate>=0.40.12 ; extra == 'all'
@@ -62,7 +61,6 @@ Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.12 ; extra == 'mcp'
 Requires-Dist: opentelemetry-instrumentation-milvus>=0.40.12 ; extra == 'milvus'
 Requires-Dist: opentelemetry-instrumentation-mistralai>=0.40.12 ; extra == 'mistralai'
 Requires-Dist: opentelemetry-instrumentation-ollama>=0.40.12 ; extra == 'ollama'
-Requires-Dist: opentelemetry-instrumentation-openai>=0.40.12 ; extra == 'openai'
 Requires-Dist: opentelemetry-instrumentation-pinecone>=0.40.12 ; extra == 'pinecone'
 Requires-Dist: opentelemetry-instrumentation-qdrant>=0.40.12 ; extra == 'qdrant'
 Requires-Dist: opentelemetry-instrumentation-replicate>=0.40.12 ; extra == 'replicate'
@@ -91,7 +89,6 @@ Provides-Extra: mcp
 Provides-Extra: milvus
 Provides-Extra: mistralai
 Provides-Extra: ollama
-Provides-Extra: openai
 Provides-Extra: pinecone
 Provides-Extra: qdrant
 Provides-Extra: replicate

{lmnr-0.6.18 → lmnr-0.6.20}/pyproject.toml

@@ -6,7 +6,7 @@
 
 [project]
 name = "lmnr"
-version = "0.6.18"
+version = "0.6.20"
 description = "Python SDK for Laminar"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -22,7 +22,7 @@ dependencies = [
   "opentelemetry-exporter-otlp-proto-http (>=1.33.0)",
   "opentelemetry-exporter-otlp-proto-grpc (>=1.33.0)",
   "opentelemetry-semantic-conventions (>=0.54b0)",
-  "opentelemetry-semantic-conventions-ai (>=0.4.8)",
+  "opentelemetry-semantic-conventions-ai (>=0.4.9)",
   "tqdm (>=4.0)",
   "tenacity (>=8.0)",
   # Since 1.68.0, grpcio writes a warning message
@@ -45,10 +45,10 @@ lmnr = "lmnr.cli:cli"
 [project.optional-dependencies]
 # List of all possible extras. You can specify one or more of these extras
 # when installing the package, using any of the following examples:
-# `pip install 'lmnr[anthropic,openai]'`
-# `uv pip install 'lmnr[anthropic,openai]'`
-# `uv add lmnr --extra anthropic --extra openai`
-# `poetry add 'lmnr[anthropic,openai]'`
+# `pip install 'lmnr[anthropic,groq]'`
+# `uv pip install 'lmnr[anthropic,groq]'`
+# `uv add lmnr --extra anthropic --extra groq`
+# `poetry add 'lmnr[anthropic,groq]'`
 
 alephalpha=["opentelemetry-instrumentation-alephalpha>=0.40.12"]
 anthropic=["opentelemetry-instrumentation-anthropic>=0.40.12"]
@@ -73,7 +73,6 @@ mcp=["opentelemetry-instrumentation-mcp>=0.40.12"]
 milvus=["opentelemetry-instrumentation-milvus>=0.40.12"]
 mistralai=["opentelemetry-instrumentation-mistralai>=0.40.12"]
 ollama=["opentelemetry-instrumentation-ollama>=0.40.12"]
-openai=["opentelemetry-instrumentation-openai>=0.40.12"]
 pinecone=["opentelemetry-instrumentation-pinecone>=0.40.12"]
 qdrant=["opentelemetry-instrumentation-qdrant>=0.40.12"]
 replicate=["opentelemetry-instrumentation-replicate>=0.40.12"]
@@ -106,7 +105,6 @@ all = [
   "opentelemetry-instrumentation-milvus>=0.40.12",
   "opentelemetry-instrumentation-mistralai>=0.40.12",
   "opentelemetry-instrumentation-ollama>=0.40.12",
-  "opentelemetry-instrumentation-openai>=0.40.12",
   "opentelemetry-instrumentation-pinecone>=0.40.12",
   "opentelemetry-instrumentation-qdrant>=0.40.12",
   "opentelemetry-instrumentation-replicate>=0.40.12",

{lmnr-0.6.18 → lmnr-0.6.20}/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/__init__.py

@@ -11,6 +11,7 @@ from google.genai import types
 from .config import (
     Config,
 )
+from .schema_utils import SchemaJSONEncoder, process_schema
 from .utils import (
     dont_throw,
     get_content,
@@ -24,8 +25,9 @@ from opentelemetry.trace import Tracer
 from wrapt import wrap_function_wrapper
 
 from opentelemetry import context as context_api
-from opentelemetry.trace import get_tracer, SpanKind, Span
+from opentelemetry.trace import get_tracer, SpanKind, Span, Status, StatusCode
 from opentelemetry.semconv._incubating.attributes import gen_ai_attributes
+from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
 
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.utils import _SUPPRESS_INSTRUMENTATION_KEY, unwrap
@@ -78,7 +80,7 @@ WRAPPED_METHODS = [
 
 def should_send_prompts():
     return (
-        os.getenv("TRACELOOP_TRACE_CONTENT") or "true"
+        os.getenv("LAMINAR_TRACE_CONTENT") or "true"
     ).lower() == "true" or context_api.get_value("override_enable_content_tracing")
 
 
@@ -128,6 +130,29 @@ def _set_request_attributes(span, args, kwargs):
         span, gen_ai_attributes.GEN_AI_REQUEST_SEED, config_dict.get("seed")
     )
 
+    if schema := config_dict.get("response_schema"):
+        try:
+            set_span_attribute(
+                span,
+                # TODO: change to SpanAttributes.LLM_REQUEST_STRUCTURED_OUTPUT_SCHEMA
+                # when we upgrade to opentelemetry-semantic-conventions-ai>=0.4.10
+                "gen_ai.request.structured_output_schema",
+                json.dumps(process_schema(schema), cls=SchemaJSONEncoder),
+            )
+        except Exception:
+            pass
+    elif json_schema := config_dict.get("response_json_schema"):
+        try:
+            set_span_attribute(
+                span,
+                # TODO: change to SpanAttributes.LLM_REQUEST_STRUCTURED_OUTPUT_SCHEMA
+                # when we upgrade to opentelemetry-semantic-conventions-ai>=0.4.10
+                "gen_ai.request.structured_output_schema",
+                json.dumps(json_schema),
+            )
+        except Exception:
+            pass
+
     tools: list[types.FunctionDeclaration] = []
     arg_tools = config_dict.get("tools", kwargs.get("tools"))
     if arg_tools:
@@ -454,16 +479,20 @@ def _wrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
     if span.is_recording():
         _set_request_attributes(span, args, kwargs)
 
-    if to_wrap.get("is_streaming"):
-        return _build_from_streaming_response(span, wrapped(*args, **kwargs))
-    else:
+    try:
         response = wrapped(*args, **kwargs)
-
-    if span.is_recording():
-        _set_response_attributes(span, response)
-
-    span.end()
-    return response
+        if to_wrap.get("is_streaming"):
+            return _build_from_streaming_response(span, response)
+        if span.is_recording():
+            _set_response_attributes(span, response)
+        span.end()
+        return response
+    except Exception as e:
+        span.set_attribute(ERROR_TYPE, e.__class__.__name__)
+        span.record_exception(e)
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+        raise e
 
 
 @with_tracer_wrapper
@@ -485,16 +514,22 @@ async def _awrap(tracer: Tracer, to_wrap, wrapped, instance, args, kwargs):
     if span.is_recording():
         _set_request_attributes(span, args, kwargs)
 
-    if to_wrap.get("is_streaming"):
-        return _abuild_from_streaming_response(span, await wrapped(*args, **kwargs))
-    else:
+    try:
         response = await wrapped(*args, **kwargs)
-
-    if span.is_recording():
-        _set_response_attributes(span, response)
-
-    span.end()
-    return response
+        if to_wrap.get("is_streaming"):
+            return _abuild_from_streaming_response(span, response)
+        else:
+            if span.is_recording():
+                _set_response_attributes(span, response)
+
+            span.end()
+            return response
+    except Exception as e:
+        span.set_attribute(ERROR_TYPE, e.__class__.__name__)
+        span.record_exception(e)
+        span.set_status(Status(StatusCode.ERROR, str(e)))
+        span.end()
+        raise e
 
 
 class GoogleGenAiSdkInstrumentor(BaseInstrumentor):

lmnr-0.6.20/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/google_genai/schema_utils.py

@@ -0,0 +1,23 @@
+from typing import Any
+from google.genai._api_client import BaseApiClient
+from google.genai._transformers import t_schema
+from google.genai.types import JSONSchemaType
+
+import json
+
+DUMMY_CLIENT = BaseApiClient(api_key="dummy")
+
+
+def process_schema(schema: Any) -> dict[str, Any]:
+    # The only thing we need from the client is the t_schema function
+    json_schema = t_schema(DUMMY_CLIENT, schema).json_schema.model_dump(
+        exclude_unset=True, exclude_none=True
+    )
+    return json_schema
+
+
+class SchemaJSONEncoder(json.JSONEncoder):
+    def default(self, o: Any) -> Any:
+        if isinstance(o, JSONSchemaType):
+            return o.value
+        return super().default(o)

lmnr-0.6.20/src/lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/__init__.py

@@ -0,0 +1,61 @@
+"""
+Initially copied over from openllmetry, commit
+b3a18c9f7e6ff2368c8fb0bc35fd9123f11121c4
+"""
+
+from typing import Callable, Collection, Optional
+
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from .shared.config import Config
+from .utils import is_openai_v1
+from typing_extensions import Coroutine
+
+_instruments = ("openai >= 0.27.0",)
+
+
+class OpenAIInstrumentor(BaseInstrumentor):
+    """An instrumentor for OpenAI's client library."""
+
+    def __init__(
+        self,
+        enrich_assistant: bool = False,
+        enrich_token_usage: bool = False,
+        exception_logger=None,
+        get_common_metrics_attributes: Callable[[], dict] = lambda: {},
+        upload_base64_image: Optional[
+            Callable[[str, str, str, str], Coroutine[None, None, str]]
+        ] = lambda *args: "",
+        enable_trace_context_propagation: bool = True,
+        use_legacy_attributes: bool = True,
+    ):
+        super().__init__()
+        Config.enrich_assistant = enrich_assistant
+        Config.enrich_token_usage = enrich_token_usage
+        Config.exception_logger = exception_logger
+        Config.get_common_metrics_attributes = get_common_metrics_attributes
+        Config.upload_base64_image = upload_base64_image
+        Config.enable_trace_context_propagation = enable_trace_context_propagation
+        Config.use_legacy_attributes = use_legacy_attributes
+
+    def instrumentation_dependencies(self) -> Collection[str]:
+        return _instruments
+
+    def _instrument(self, **kwargs):
+        if is_openai_v1():
+            from .v1 import OpenAIV1Instrumentor
+
+            OpenAIV1Instrumentor().instrument(**kwargs)
+        else:
+            from .v0 import OpenAIV0Instrumentor
+
+            OpenAIV0Instrumentor().instrument(**kwargs)
+
+    def _uninstrument(self, **kwargs):
+        if is_openai_v1():
+            from .v1 import OpenAIV1Instrumentor
+
+            OpenAIV1Instrumentor().uninstrument(**kwargs)
+        else:
+            from .v0 import OpenAIV0Instrumentor
+
+            OpenAIV0Instrumentor().uninstrument(**kwargs)