lmnr 0.4.8__tar.gz → 0.4.10__tar.gz

{lmnr-0.4.8 → lmnr-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.4.8
+Version: 0.4.10
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai
@@ -11,11 +11,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: asyncio (>=3.4.3,<4.0.0)
-Requires-Dist: backoff (>=2.2.1,<3.0.0)
-Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: deprecated (>=1.2.14,<2.0.0)
-Requires-Dist: jinja2 (>=3.1.2,<4.0.0)
+Requires-Dist: asyncio (>=3.0,<4.0)
+Requires-Dist: backoff (>=2.0,<3.0)
+Requires-Dist: colorama (>=0.4,<0.5)
+Requires-Dist: deprecated (>=1.0,<2.0)
+Requires-Dist: jinja2 (>=3.0,<4.0)
 Requires-Dist: opentelemetry-api (>=1.27.0,<2.0.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (>=1.26.0,<2.0.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.26.0,<2.0.0)
@@ -49,11 +49,11 @@ Requires-Dist: opentelemetry-instrumentation-watsonx (>=0.30.0,<0.31.0)
 Requires-Dist: opentelemetry-instrumentation-weaviate (>=0.30.0,<0.31.0)
 Requires-Dist: opentelemetry-sdk (>=1.27.0,<2.0.0)
 Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.1)
-Requires-Dist: posthog (>3.0.2,<4)
-Requires-Dist: pydantic (>=2.7.4,<3.0.0)
-Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
-Requires-Dist: requests (>=2.32.3,<3.0.0)
-Requires-Dist: tenacity (>=8.2.3,<9.0.0)
+Requires-Dist: posthog (>=3.0,<4.0)
+Requires-Dist: pydantic (>=2.7,<3.0)
+Requires-Dist: python-dotenv (>=1.0,<2.0)
+Requires-Dist: requests (>=2.0,<3.0)
+Requires-Dist: tenacity (>=8.0,<9.0)
 Description-Content-Type: text/markdown
 
 # Laminar Python
@@ -77,16 +77,19 @@ pip install lmnr
 And the in your main Python file
 
 ```python
-from lmnr import Laminar as L
+from lmnr import Laminar as L, Instruments
 
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI, Instruments.ANTHROPIC})
 ```
 
-This will automatically instrument most of the LLM, Vector DB, and related
-calls with OpenTelemetry-compatible instrumentation.
+If you want to automatically instrument particular LLM, Vector DB, and related
+calls with OpenTelemetry-compatible instrumentation, then pass the appropriate instruments to `.initialize()`.
+
+You can pass an empty set as `instruments=set()` to disable any kind of automatic instrumentation. 
+Also if you want to automatically instrument all supported libraries, then pass `instruments=None` or don't pass `instruments` at all.
 
-We rely on the amazing [OpenLLMetry](https://github.com/traceloop/openllmetry), open-source package
-by TraceLoop, to achieve that.
+Our code is based on the [OpenLLMetry](https://github.com/traceloop/openllmetry), open-source package
+by TraceLoop. Also, we are grateful to Traceloop for implementing autoinstrumentations for many libraries.
 
 ### Project API key
 
@@ -105,8 +108,8 @@ import os
 from openai import OpenAI
 
 
-from lmnr import observe, Laminar as L
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+from lmnr import observe, Laminar as L, Instruments
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI})
 
 client = OpenAI(api_key=os.environ["OPENAI_API_KEY"])
 
@@ -128,40 +131,32 @@ print(poem_writer(topic="laminar flow"))
 
 ### Manual instrumentation
 
-Our manual instrumentation is a very thin wrapper around OpenTelemetry's
-`trace.start_span`. Our wrapper sets the span into the active context.
-You don't have to explicitly pass the spans around, it is enough to
-just call `L.start_span`, and OpenTelemetry will handle the context management
+Also, you can `Laminar.start_as_current_span` if you want to record a chunk of your code.
 
 ```python
-from lmnr import observe, Laminar as L
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+from lmnr import observe, Laminar as L, Instruments
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI})
 
 def poem_writer(topic="turbulence"):
-    
-    span = L.start_span("poem_writer", topic) # start a span
-
     prompt = f"write a poem about {topic}"
-
-    # OpenAI calls are still automatically instrumented with OpenLLMetry
-    response = client.chat.completions.create(
-        model="gpt-4o",
-        messages=[
-            {"role": "system", "content": "You are a helpful assistant."},
-            {"role": "user", "content": prompt},
-        ],
-    )
-    poem = response.choices[0].message.content
-    # while within the span, you can attach laminar events to it
-    L.event("event_name", "event_value")
-
-    L.set_span_output(span, poem) # set an output
-    
-    # IMPORTANT: don't forget to end all the spans (usually in `finally` blocks)
-    # Otherwise, the trace may not be sent/displayed correctly
-    span.end()
-
-    return poem
+    messages = [
+        {"role": "system", "content": "You are a helpful assistant."},
+        {"role": "user", "content": prompt},
+    ]
+
+    with L.start_as_current_span(name="poem_writer", input=messages):
+        # OpenAI calls are still automatically instrumented with OpenLLMetry
+        response = client.chat.completions.create(
+            model="gpt-4o",
+            messages=messages,
+        )
+        poem = response.choices[0].message.content
+        # while within the span, you can attach laminar events to it
+        L.event("event_name", "event_value")
+
+        L.set_span_output(poem) # set an output
+
+        return poem
 ```
 
 
@@ -204,7 +199,7 @@ Example use:
 ```python
 from lmnr import Laminar as L
 
-L.initialize('<YOUR_PROJECT_API_KEY>')
+L.initialize('<YOUR_PROJECT_API_KEY>', instruments=set())
 
 result = l.run(
     pipeline = 'my_pipeline_name',

{lmnr-0.4.8 → lmnr-0.4.10}/README.md

@@ -19,16 +19,19 @@ pip install lmnr
 And the in your main Python file
 
 ```python
-from lmnr import Laminar as L
+from lmnr import Laminar as L, Instruments
 
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI, Instruments.ANTHROPIC})
 ```
 
-This will automatically instrument most of the LLM, Vector DB, and related
-calls with OpenTelemetry-compatible instrumentation.
+If you want to automatically instrument particular LLM, Vector DB, and related
+calls with OpenTelemetry-compatible instrumentation, then pass the appropriate instruments to `.initialize()`.
+
+You can pass an empty set as `instruments=set()` to disable any kind of automatic instrumentation. 
+Also if you want to automatically instrument all supported libraries, then pass `instruments=None` or don't pass `instruments` at all.
 
-We rely on the amazing [OpenLLMetry](https://github.com/traceloop/openllmetry), open-source package
-by TraceLoop, to achieve that.
+Our code is based on the [OpenLLMetry](https://github.com/traceloop/openllmetry), open-source package
+by TraceLoop. Also, we are grateful to Traceloop for implementing autoinstrumentations for many libraries.
 
 ### Project API key
 
@@ -47,8 +50,8 @@ import os
 from openai import OpenAI
 
 
-from lmnr import observe, Laminar as L
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+from lmnr import observe, Laminar as L, Instruments
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI})
 
 client = OpenAI(api_key=os.environ["OPENAI_API_KEY"])
 
@@ -70,40 +73,32 @@ print(poem_writer(topic="laminar flow"))
 
 ### Manual instrumentation
 
-Our manual instrumentation is a very thin wrapper around OpenTelemetry's
-`trace.start_span`. Our wrapper sets the span into the active context.
-You don't have to explicitly pass the spans around, it is enough to
-just call `L.start_span`, and OpenTelemetry will handle the context management
+Also, you can `Laminar.start_as_current_span` if you want to record a chunk of your code.
 
 ```python
-from lmnr import observe, Laminar as L
-L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>")
+from lmnr import observe, Laminar as L, Instruments
+L.initialize(project_api_key="<LMNR_PROJECT_API_KEY>", instruments={Instruments.OPENAI})
 
 def poem_writer(topic="turbulence"):
-    
-    span = L.start_span("poem_writer", topic) # start a span
-
     prompt = f"write a poem about {topic}"
-
-    # OpenAI calls are still automatically instrumented with OpenLLMetry
-    response = client.chat.completions.create(
-        model="gpt-4o",
-        messages=[
-            {"role": "system", "content": "You are a helpful assistant."},
-            {"role": "user", "content": prompt},
-        ],
-    )
-    poem = response.choices[0].message.content
-    # while within the span, you can attach laminar events to it
-    L.event("event_name", "event_value")
-
-    L.set_span_output(span, poem) # set an output
-    
-    # IMPORTANT: don't forget to end all the spans (usually in `finally` blocks)
-    # Otherwise, the trace may not be sent/displayed correctly
-    span.end()
-
-    return poem
+    messages = [
+        {"role": "system", "content": "You are a helpful assistant."},
+        {"role": "user", "content": prompt},
+    ]
+
+    with L.start_as_current_span(name="poem_writer", input=messages):
+        # OpenAI calls are still automatically instrumented with OpenLLMetry
+        response = client.chat.completions.create(
+            model="gpt-4o",
+            messages=messages,
+        )
+        poem = response.choices[0].message.content
+        # while within the span, you can attach laminar events to it
+        L.event("event_name", "event_value")
+
+        L.set_span_output(poem) # set an output
+
+        return poem
 ```
 
 
@@ -146,7 +141,7 @@ Example use:
 ```python
 from lmnr import Laminar as L
 
-L.initialize('<YOUR_PROJECT_API_KEY>')
+L.initialize('<YOUR_PROJECT_API_KEY>', instruments=set())
 
 result = l.run(
     pipeline = 'my_pipeline_name',

{lmnr-0.4.8 → lmnr-0.4.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lmnr"
-version = "0.4.8"
+version = "0.4.10"
 description = "Python SDK for Laminar AI"
 authors = [
   { name = "lmnr.ai", email = "founders@lmnr.ai" }
@@ -11,7 +11,7 @@ license = "Apache-2.0"
 
 [tool.poetry]
 name = "lmnr"
-version = "0.4.8"
+version = "0.4.10"
 description = "Python SDK for Laminar AI"
 authors = ["lmnr.ai"]
 readme = "README.md"
@@ -19,11 +19,11 @@ license = "Apache-2.0"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<4"
-pydantic = "^2.7.4"
-requests = "^2.32.3"
-python-dotenv = "^1.0.1"
-backoff = "^2.2.1"
-asyncio = "^3.4.3"
+pydantic = "~=2.7"
+requests = "~=2.0"
+python-dotenv = "~=1.0"
+backoff = "~=2.0"
+asyncio = "~=3.0"
 opentelemetry-api = "^1.27.0"
 opentelemetry-sdk = "^1.27.0"
 opentelemetry-exporter-otlp-proto-http = "^1.26.0"
@@ -33,11 +33,11 @@ opentelemetry-instrumentation-sqlalchemy = "^0.48b0"
 opentelemetry-instrumentation-urllib3 = "^0.48b0"
 opentelemetry-instrumentation-threading = "^0.48b0"
 opentelemetry-semantic-conventions-ai = "0.4.1"
-colorama = "^0.4.6"
-tenacity = "^8.2.3"
-jinja2 = "^3.1.2"
-deprecated = "^1.2.14"
-posthog = ">3.0.2, <4"
+colorama = "^0.4"
+tenacity = "~=8.0"
+jinja2 = "~=3.0"
+deprecated = "~=1.0"
+posthog = "~=3.0"
 opentelemetry-instrumentation-mistralai = "^0.30.0"
 opentelemetry-instrumentation-openai = "^0.30.0"
 opentelemetry-instrumentation-ollama = "^0.30.0"

{lmnr-0.4.8 → lmnr-0.4.10}/src/lmnr/__init__.py

@@ -2,3 +2,4 @@ from .sdk.evaluations import Evaluation
 from .sdk.laminar import Laminar
 from .sdk.types import ChatMessage, PipelineRunError, PipelineRunResponse, NodeInput
 from .sdk.decorators import observe
+from .traceloop_sdk import Instruments

{lmnr-0.4.8 → lmnr-0.4.10}/src/lmnr/sdk/decorators.py

@@ -3,11 +3,11 @@ from lmnr.traceloop_sdk.decorators.base import (
     aentity_method,
 )
 from opentelemetry.trace import INVALID_SPAN, get_current_span
-from lmnr.traceloop_sdk import Traceloop
 
 from typing import Callable, Optional, ParamSpec, TypeVar, cast
 
-from .laminar import Laminar as L
+from lmnr.traceloop_sdk.tracing.tracing import update_association_properties
+
 from .utils import is_async
 
 P = ParamSpec("P")
@@ -57,7 +57,7 @@ def observe(
             association_properties["session_id"] = session_id
         if user_id is not None:
             association_properties["user_id"] = user_id
-        Traceloop.set_association_properties(association_properties)
+        update_association_properties(association_properties)
         return (
             aentity_method(name=name)(func)
             if is_async(func)

{lmnr-0.4.8 → lmnr-0.4.10}/src/lmnr/sdk/laminar.py

@@ -1,9 +1,8 @@
+from lmnr.traceloop_sdk.instruments import Instruments
 from opentelemetry import context
 from opentelemetry.trace import (
     INVALID_SPAN,
     get_current_span,
-    set_span_in_context,
-    Span,
     SpanKind,
 )
 from opentelemetry.semconv_ai import SpanAttributes
@@ -16,7 +15,7 @@ from contextlib import contextmanager
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
 
 from pydantic.alias_generators import to_snake
-from typing import Any, Optional, Union
+from typing import Any, Optional, Set, Union
 
 import copy
 import datetime
@@ -27,6 +26,8 @@ import os
 import requests
 import uuid
 
+from lmnr.traceloop_sdk.tracing.tracing import set_association_properties, update_association_properties
+
 from .log import VerboseColorfulFormatter
 
 from .types import (
@@ -51,6 +52,7 @@ class Laminar:
         project_api_key: Optional[str] = None,
         env: dict[str, str] = {},
         base_url: Optional[str] = None,
+        instruments: Optional[Set[Instruments]] = None,
     ):
         """Initialize Laminar context across the application.
         This method must be called before using any other Laminar methods or
@@ -104,6 +106,7 @@ class Laminar:
                 endpoint=cls.__base_url,
                 headers={"authorization": f"Bearer {cls.__project_api_key}"},
             ),
+            instruments=instruments,
         )
 
     @classmethod
@@ -354,50 +357,15 @@ class Laminar:
                 yield span
 
     @classmethod
-    def start_span(
-        cls,
-        name: str,
-        input: Any = None,
-    ) -> Span:
-        """Start a new span with the given name. Useful for manual
-        instrumentation.
-
-        Args:
-            name (str): name of the span
-            input (Any, optional): input to the span. Will be sent as an
-                attribute, so must be json serializable. Defaults to None.
-
-        Returns:
-            Tuple[Span, object]: Span - the started span, object -
-                    context token
-                    that must be passed to `end_span` to end the span.
-
-        """
-        tracer = get_tracer().__enter__()
-        span = tracer.start_span(name)
-        # apparently, detaching from this context is not mandatory.
-        # According to traceloop, and the github issue in opentelemetry,
-        # the context is collected by the garbage collector.
-        # https://github.com/open-telemetry/opentelemetry-python/issues/2606#issuecomment-2106320379
-        context.attach(set_span_in_context(span))
-
-        if input is not None:
-            span.set_attribute(
-                SpanAttributes.TRACELOOP_ENTITY_INPUT, json.dumps({"input": input})
-            )
-
-        return span
-
-    @classmethod
-    def set_span_output(cls, span: Span, output: Any = None):
-        """Set the output of the span. Useful for manual instrumentation.
+    def set_span_output(cls, output: Any = None):
+        """Set the output of the current span. Useful for manual instrumentation.
 
         Args:
-            span (Span): the span to set the output for
             output (Any, optional): output of the span. Will be sent as an
                 attribute, so must be json serializable. Defaults to None.
         """
-        if output is not None:
+        span = get_current_span()
+        if output is not None and span != INVALID_SPAN:
             span.set_attribute(
                 SpanAttributes.TRACELOOP_ENTITY_OUTPUT, json.dumps(output)
             )
@@ -421,26 +389,12 @@ class Laminar:
                             Useful for grouping spans or traces by user.
                             Defaults to None.
         """
-        current_span = get_current_span()
-        if current_span != INVALID_SPAN:
-            cls.__logger.debug(
-                "Laminar().set_session() called inside a span context. Setting"
-                " it manually in the current span."
-            )
-            if session_id is not None:
-                current_span.set_attribute(
-                    "traceloop.association.properties.session_id", session_id
-                )
-            if user_id is not None:
-                current_span.set_attribute(
-                    "traceloop.association.properties.user_id", user_id
-                )
         association_properties = {}
         if session_id is not None:
             association_properties["session_id"] = session_id
         if user_id is not None:
             association_properties["user_id"] = user_id
-        Traceloop.set_association_properties(association_properties)
+        update_association_properties(association_properties)
 
     @classmethod
     def clear_session(cls):
@@ -448,7 +402,7 @@ class Laminar:
         props: dict = copy.copy(context.get_value("association_properties"))
         props.pop("session_id", None)
         props.pop("user_id", None)
-        Traceloop.set_association_properties(props)
+        set_association_properties(props)
 
     @classmethod
     def create_evaluation(cls, name: str) -> CreateEvaluationResponse:

{lmnr-0.4.8 → lmnr-0.4.10}/src/lmnr/sdk/types.py

@@ -2,7 +2,7 @@ import datetime
 import requests
 import pydantic
 import uuid
-from typing import Any, Awaitable, Callable, Literal, Optional, TypeAlias, Union
+from typing import Any, Literal, Optional, TypeAlias, Union
 
 from .utils import to_dict
 

{lmnr-0.4.8 → lmnr-0.4.10}/src/lmnr/traceloop_sdk/__init__.py

@@ -18,11 +18,7 @@ from lmnr.traceloop_sdk.config import (
     is_tracing_enabled,
     is_metrics_enabled,
 )
-from lmnr.traceloop_sdk.tracing.tracing import (
-    TracerWrapper,
-    set_association_properties,
-    set_external_prompt_tracing_context,
-)
+from lmnr.traceloop_sdk.tracing.tracing import TracerWrapper
 from typing import Dict
 
 
@@ -38,14 +34,14 @@ class Traceloop:
     def init(
         app_name: Optional[str] = sys.argv[0],
         api_endpoint: str = "https://api.lmnr.ai",
-        api_key: str = None,
+        api_key: Optional[str] = None,
         headers: Dict[str, str] = {},
         disable_batch=False,
-        exporter: SpanExporter = None,
-        metrics_exporter: MetricExporter = None,
-        metrics_headers: Dict[str, str] = None,
-        processor: SpanProcessor = None,
-        propagator: TextMapPropagator = None,
+        exporter: Optional[SpanExporter] = None,
+        metrics_exporter: Optional[MetricExporter] = None,
+        metrics_headers: Optional[Dict[str, str]] = None,
+        processor: Optional[SpanProcessor] = None,
+        propagator: Optional[TextMapPropagator] = None,
         should_enrich_metrics: bool = True,
         resource_attributes: dict = {},
         instruments: Optional[Set[Instruments]] = None,
@@ -130,9 +126,3 @@ class Traceloop:
         )
 
         Traceloop.__metrics_wrapper = MetricsWrapper(exporter=metrics_exporter)
-
-    def set_association_properties(properties: dict) -> None:
-        set_association_properties(properties)
-
-    def set_prompt(template: str, variables: dict, version: int):
-        set_external_prompt_tracing_context(template, variables, version)