lmnr 0.4.8__py3-none-any.whl → 0.4.10__py3-none-any.whl

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/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/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/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/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)

lmnr/traceloop_sdk/decorators/__init__.py

@@ -1,131 +0,0 @@
-from typing import Optional
-
-from opentelemetry.semconv_ai import TraceloopSpanKindValues
-
-from lmnr.traceloop_sdk.decorators.base import (
-    aentity_class,
-    aentity_method,
-    entity_class,
-    entity_method,
-)
-
-
-def task(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
-):
-    if method_name is None:
-        return entity_method(name=name, version=version, tlp_span_kind=tlp_span_kind)
-    else:
-        return entity_class(
-            name=name,
-            version=version,
-            method_name=method_name,
-            tlp_span_kind=tlp_span_kind,
-        )
-
-
-def workflow(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.WORKFLOW,
-):
-    if method_name is None:
-        return entity_method(name=name, version=version, tlp_span_kind=tlp_span_kind)
-    else:
-        return entity_class(
-            name=name,
-            version=version,
-            method_name=method_name,
-            tlp_span_kind=tlp_span_kind,
-        )
-
-
-def agent(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-):
-    return workflow(
-        name=name,
-        version=version,
-        method_name=method_name,
-        tlp_span_kind=TraceloopSpanKindValues.AGENT,
-    )
-
-
-def tool(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-):
-    return task(
-        name=name,
-        version=version,
-        method_name=method_name,
-        tlp_span_kind=TraceloopSpanKindValues.TOOL,
-    )
-
-
-# Async Decorators
-def atask(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
-):
-    if method_name is None:
-        return aentity_method(name=name, version=version, tlp_span_kind=tlp_span_kind)
-    else:
-        return aentity_class(
-            name=name,
-            version=version,
-            method_name=method_name,
-            tlp_span_kind=tlp_span_kind,
-        )
-
-
-def aworkflow(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.WORKFLOW,
-):
-    if method_name is None:
-        return aentity_method(name=name, version=version, tlp_span_kind=tlp_span_kind)
-    else:
-        return aentity_class(
-            name=name,
-            version=version,
-            method_name=method_name,
-            tlp_span_kind=tlp_span_kind,
-        )
-
-
-def aagent(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-):
-    return atask(
-        name=name,
-        version=version,
-        method_name=method_name,
-        tlp_span_kind=TraceloopSpanKindValues.AGENT,
-    )
-
-
-def atool(
-    name: Optional[str] = None,
-    version: Optional[int] = None,
-    method_name: Optional[str] = None,
-):
-    return atask(
-        name=name,
-        version=version,
-        method_name=method_name,
-        tlp_span_kind=TraceloopSpanKindValues.TOOL,
-    )

lmnr/traceloop_sdk/decorators/base.py

@@ -7,15 +7,10 @@ import warnings
 
 from opentelemetry import trace
 from opentelemetry import context as context_api
-from opentelemetry.semconv_ai import SpanAttributes, TraceloopSpanKindValues
-
-from lmnr.traceloop_sdk.tracing import get_tracer, set_workflow_name
-from lmnr.traceloop_sdk.tracing.tracing import (
-    TracerWrapper,
-    set_entity_path,
-    get_chained_entity_path,
-)
-from lmnr.traceloop_sdk.utils import camel_to_snake
+from opentelemetry.semconv_ai import SpanAttributes
+
+from lmnr.traceloop_sdk.tracing import get_tracer
+from lmnr.traceloop_sdk.tracing.tracing import TracerWrapper
 from lmnr.traceloop_sdk.utils.json_encoder import JSONEncoder
 
 
@@ -40,8 +35,6 @@ def _json_dumps(data: dict) -> str:
 
 def entity_method(
     name: Optional[str] = None,
-    version: Optional[int] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
 ):
     def decorate(fn):
         @wraps(fn)
@@ -49,33 +42,13 @@ def entity_method(
             if not TracerWrapper.verify_initialized():
                 return fn(*args, **kwargs)
 
-            entity_name = name or fn.__name__
-            if tlp_span_kind in [
-                TraceloopSpanKindValues.WORKFLOW,
-                TraceloopSpanKindValues.AGENT,
-            ]:
-                set_workflow_name(entity_name)
-            span_name = f"{entity_name}.{tlp_span_kind.value}"
+            span_name = name or fn.__name__
 
             with get_tracer() as tracer:
                 span = tracer.start_span(span_name)
                 ctx = trace.set_span_in_context(span)
                 ctx_token = context_api.attach(ctx)
 
-                if tlp_span_kind in [
-                    TraceloopSpanKindValues.TASK,
-                    TraceloopSpanKindValues.TOOL,
-                ]:
-                    entity_path = get_chained_entity_path(entity_name)
-                    set_entity_path(entity_path)
-
-                span.set_attribute(
-                    SpanAttributes.TRACELOOP_SPAN_KIND, tlp_span_kind.value
-                )
-                span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, entity_name)
-                if version:
-                    span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_VERSION, version)
-
                 try:
                     if _should_send_prompts():
                         span.set_attribute(
@@ -110,69 +83,25 @@ def entity_method(
     return decorate
 
 
-def entity_class(
-    name: Optional[str],
-    version: Optional[int],
-    method_name: str,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
-):
-    def decorator(cls):
-        task_name = name if name else camel_to_snake(cls.__name__)
-        method = getattr(cls, method_name)
-        setattr(
-            cls,
-            method_name,
-            entity_method(name=task_name, version=version, tlp_span_kind=tlp_span_kind)(
-                method
-            ),
-        )
-        return cls
-
-    return decorator
-
-
 # Async Decorators
 
 
 def aentity_method(
     name: Optional[str] = None,
-    version: Optional[int] = None,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
 ):
     def decorate(fn):
         @wraps(fn)
         async def wrap(*args, **kwargs):
             if not TracerWrapper.verify_initialized():
-                print("Tracer not initialized")
                 return await fn(*args, **kwargs)
 
-            entity_name = name or fn.__name__
-            if tlp_span_kind in [
-                TraceloopSpanKindValues.WORKFLOW,
-                TraceloopSpanKindValues.AGENT,
-            ]:
-                set_workflow_name(entity_name)
-            span_name = f"{entity_name}.{tlp_span_kind.value}"
+            span_name = name or fn.__name__
 
             with get_tracer() as tracer:
                 span = tracer.start_span(span_name)
                 ctx = trace.set_span_in_context(span)
                 ctx_token = context_api.attach(ctx)
 
-                if tlp_span_kind in [
-                    TraceloopSpanKindValues.TASK,
-                    TraceloopSpanKindValues.TOOL,
-                ]:
-                    entity_path = get_chained_entity_path(entity_name)
-                    set_entity_path(entity_path)
-
-                span.set_attribute(
-                    SpanAttributes.TRACELOOP_SPAN_KIND, tlp_span_kind.value
-                )
-                span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_NAME, entity_name)
-                if version:
-                    span.set_attribute(SpanAttributes.TRACELOOP_ENTITY_VERSION, version)
-
                 try:
                     if _should_send_prompts():
                         span.set_attribute(
@@ -206,27 +135,6 @@ def aentity_method(
     return decorate
 
 
-def aentity_class(
-    name: Optional[str],
-    version: Optional[int],
-    method_name: str,
-    tlp_span_kind: Optional[TraceloopSpanKindValues] = TraceloopSpanKindValues.TASK,
-):
-    def decorator(cls):
-        task_name = name if name else camel_to_snake(cls.__name__)
-        method = getattr(cls, method_name)
-        setattr(
-            cls,
-            method_name,
-            aentity_method(
-                name=task_name, version=version, tlp_span_kind=tlp_span_kind
-            )(method),
-        )
-        return cls
-
-    return decorator
-
-
 def _handle_generator(span, res):
     # for some reason the SPAN_KEY is not being set in the context of the generator, so we re-set it
     context_api.attach(trace.set_span_in_context(span))

lmnr/traceloop_sdk/tests/__init__.py

@@ -1 +1 @@
-"""unit tests."""
+# """unit tests."""