lmnr 0.4.29b3__py3-none-any.whl → 0.4.30__py3-none-any.whl

lmnr/__init__.py

@@ -11,3 +11,4 @@ from .sdk.types import (
 from .sdk.decorators import observe
 from .traceloop_sdk import Instruments
 from .traceloop_sdk.tracing.attributes import Attributes
+from opentelemetry.trace import use_span

lmnr/sdk/laminar.py

@@ -1,28 +1,31 @@
-import re
-from lmnr.traceloop_sdk.instruments import Instruments
-from opentelemetry import context
-from opentelemetry.trace import (
-    INVALID_SPAN,
-    get_current_span,
-)
+from contextlib import contextmanager
+from contextvars import Context
+from opentelemetry import context, trace
 from opentelemetry.util.types import AttributeValue
 from opentelemetry.context import set_value, attach, detach
 from lmnr.traceloop_sdk import Traceloop
+from lmnr.traceloop_sdk.instruments import Instruments
 from lmnr.traceloop_sdk.tracing import get_tracer
-from lmnr.traceloop_sdk.tracing.attributes import Attributes, SPAN_TYPE
+from lmnr.traceloop_sdk.tracing.attributes import (
+    Attributes,
+    SPAN_TYPE,
+    OVERRIDE_PARENT_SPAN,
+)
 from lmnr.traceloop_sdk.decorators.base import json_dumps
-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, Literal, Optional, Set, Union
 
+import aiohttp
 import copy
 import datetime
 import dotenv
 import json
 import logging
 import os
+import random
+import re
 import requests
 import urllib.parse
 import uuid
@@ -196,8 +199,8 @@ class Laminar:
                 "API key or set the LMNR_PROJECT_API_KEY environment variable"
             )
         try:
-            current_span = get_current_span()
-            if current_span != INVALID_SPAN:
+            current_span = trace.get_current_span()
+            if current_span != trace.INVALID_SPAN:
                 parent_span_id = parent_span_id or uuid.UUID(
                     int=current_span.get_span_context().span_id
                 )
@@ -276,8 +279,8 @@ class Laminar:
         if value is not None:
             event["lmnr.event.value"] = value
 
-        current_span = get_current_span()
-        if current_span == INVALID_SPAN:
+        current_span = trace.get_current_span()
+        if current_span == trace.INVALID_SPAN:
             cls.__logger.warning(
                 "`Laminar().event()` called outside of span context. "
                 f"Event '{name}' will not be recorded in the trace. "
@@ -294,6 +297,8 @@ class Laminar:
         name: str,
         input: Any = None,
         span_type: Union[Literal["DEFAULT"], Literal["LLM"]] = "DEFAULT",
+        context: Optional[Context] = None,
+        trace_id: Optional[uuid.UUID] = None,
     ):
         """Start a new span as the current span. Useful for manual
         instrumentation. If `span_type` is set to `"LLM"`, you should report
@@ -314,30 +319,139 @@ class Laminar:
             span_type (Union[Literal["DEFAULT"], Literal["LLM"]], optional):\
                 type of the span. If you use `"LLM"`, you should report usage\
                 and response attributes manually. Defaults to "DEFAULT".
+            context (Optional[Context], optional): raw OpenTelemetry context\
+                to attach the span to. Defaults to None.
+            trace_id (Optional[uuid.UUID], optional): [EXPERIMENTAL] override\
+                the trace id for the span. If not provided, use the current\
+                trace id. Defaults to None.
         """
+
         with get_tracer() as tracer:
             span_path = get_span_path(name)
-            ctx = set_value("span_path", span_path)
+            ctx = set_value("span_path", span_path, context)
+            if trace_id is not None:
+                if isinstance(trace_id, uuid.UUID):
+                    span_context = trace.SpanContext(
+                        trace_id=int(trace_id),
+                        span_id=random.getrandbits(64),
+                        is_remote=False,
+                        trace_flags=trace.TraceFlags(trace.TraceFlags.SAMPLED),
+                    )
+                    ctx = trace.set_span_in_context(
+                        trace.NonRecordingSpan(span_context), ctx
+                    )
+                else:
+                    cls.__logger.warning(
+                        "trace_id provided to `Laminar.start_as_current_span`"
+                        " is not a valid UUID"
+                    )
             ctx_token = attach(ctx)
             with tracer.start_as_current_span(
                 name,
                 context=ctx,
-                attributes={SPAN_PATH: span_path},
+                attributes={SPAN_PATH: span_path, SPAN_TYPE: span_type},
             ) as span:
+                if trace_id is not None and isinstance(trace_id, uuid.UUID):
+                    span.set_attribute(OVERRIDE_PARENT_SPAN, True)
                 if input is not None:
                     span.set_attribute(
                         SPAN_INPUT,
                         json_dumps(input),
                     )
-                span.set_attribute(SPAN_TYPE, span_type)
                 yield span
 
-            # TODO: Figure out if this is necessary
+            # # TODO: Figure out if this is necessary
             try:
                 detach(ctx_token)
             except Exception:
                 pass
 
+    @classmethod
+    def start_span(
+        cls,
+        name: str,
+        input: Any = None,
+        span_type: Union[Literal["DEFAULT"], Literal["LLM"]] = "DEFAULT",
+        context: Optional[Context] = None,
+        trace_id: Optional[uuid.UUID] = None,
+    ):
+        """Start a new span. Useful for manual instrumentation.
+        If `span_type` is set to `"LLM"`, you should report usage and response
+        attributes manually. See `Laminar.set_span_attributes` for more
+        information.
+
+        Usage example:
+        ```python
+        from src.lmnr import Laminar, use_span
+        def foo(span):
+            with use_span(span):
+                with Laminar.start_as_current_span("foo_inner"):
+                    some_function()
+        
+        def bar():
+            with use_span(span):
+                openai_client.chat.completions.create()
+        
+        span = Laminar.start_span("outer")
+        foo(span)
+        bar(span)
+        # IMPORTANT: End the span manually
+        span.end()
+        
+        # Results in:
+        # | outer
+        # |   | foo
+        # |   |   | foo_inner
+        # |   | bar
+        # |   |   | openai.chat
+        ```
+
+        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.
+            span_type (Union[Literal["DEFAULT"], Literal["LLM"]], optional):\
+                type of the span. If you use `"LLM"`, you should report usage\
+                and response attributes manually. Defaults to "DEFAULT".
+            context (Optional[Context], optional): raw OpenTelemetry context\
+                to attach the span to. Defaults to None.
+            trace_id (Optional[uuid.UUID], optional): [EXPERIMENTAL] override\
+                the trace id for the span. If not provided, use the current\
+                trace id. Defaults to None.
+        """
+        with get_tracer() as tracer:
+            span_path = get_span_path(name)
+            ctx = set_value("span_path", span_path, context)
+            if trace_id is not None:
+                if isinstance(trace_id, uuid.UUID):
+                    span_context = trace.SpanContext(
+                        trace_id=int(trace_id),
+                        span_id=random.getrandbits(64),
+                        is_remote=False,
+                        trace_flags=trace.TraceFlags(trace.TraceFlags.SAMPLED),
+                    )
+                    ctx = trace.set_span_in_context(
+                        trace.NonRecordingSpan(span_context), ctx
+                    )
+                else:
+                    cls.__logger.warning(
+                        "trace_id provided to `Laminar.start_span`"
+                        " is not a valid UUID"
+                    )
+            span = tracer.start_span(
+                name,
+                context=ctx,
+                attributes={SPAN_PATH: span_path, SPAN_TYPE: span_type},
+            )
+            if trace_id is not None and isinstance(trace_id, uuid.UUID):
+                span.set_attribute(OVERRIDE_PARENT_SPAN, True)
+            if input is not None:
+                span.set_attribute(
+                    SPAN_INPUT,
+                    json_dumps(input),
+                )
+            return span
+
     @classmethod
     def set_span_output(cls, output: Any = None):
         """Set the output of the current span. Useful for manual
@@ -347,8 +461,8 @@ class Laminar:
             output (Any, optional): output of the span. Will be sent as an\
                 attribute, so must be json serializable. Defaults to None.
         """
-        span = get_current_span()
-        if output is not None and span != INVALID_SPAN:
+        span = trace.get_current_span()
+        if output is not None and span != trace.INVALID_SPAN:
             span.set_attribute(SPAN_OUTPUT, json_dumps(output))
 
     @classmethod
@@ -378,8 +492,8 @@ class Laminar:
         Args:
             attributes (dict[ATTRIBUTES, Any]): attributes to set for the span
         """
-        span = get_current_span()
-        if span == INVALID_SPAN:
+        span = trace.get_current_span()
+        if span == trace.INVALID_SPAN:
             return
 
         for key, value in attributes.items():

lmnr/sdk/types.py

@@ -129,7 +129,7 @@ class EvaluationResultDatapoint(pydantic.BaseModel):
     target: EvaluationDatapointTarget
     executor_output: ExecutorFunctionReturnType
     scores: dict[str, Numeric]
-    human_evaluators: dict[str, HumanEvaluator] = pydantic.Field(default_factory=dict)
+    human_evaluators: list[HumanEvaluator] = pydantic.Field(default_factory=list)
     trace_id: uuid.UUID
     executor_span_id: uuid.UUID
 

lmnr/traceloop_sdk/tracing/attributes.py

@@ -6,6 +6,7 @@ SPAN_OUTPUT = "lmnr.span.output"
 SPAN_TYPE = "lmnr.span.type"
 SPAN_PATH = "lmnr.span.path"
 SPAN_INSTRUMENTATION_SOURCE = "lmnr.span.instrumentation_source"
+OVERRIDE_PARENT_SPAN = "lmnr.internal.override_parent_span"
 
 ASSOCIATION_PROPERTIES = "lmnr.association.properties"
 SESSION_ID = "session_id"

lmnr/traceloop_sdk/tracing/tracing.py

@@ -184,8 +184,6 @@ class TracerWrapper(object):
 def set_association_properties(properties: dict) -> None:
     attach(set_value("association_properties", properties))
 
-    # TODO: When called inside observe decorator, this actually sets the properties on the parent span, not the current one
-    # Then, processor's on_start will assign this to current span
     span = trace.get_current_span()
     _set_association_properties_attributes(span, properties)
 
@@ -197,8 +195,6 @@ def update_association_properties(properties: dict) -> None:
 
     attach(set_value("association_properties", association_properties))
 
-    # TODO: When called inside observe decorator, this actually sets the properties on the parent span, not the current one
-    # Then, processor's on_start will assign this to current span
     span = trace.get_current_span()
     _set_association_properties_attributes(span, properties)
 
@@ -229,15 +225,6 @@ def set_managed_prompt_tracing_context(
     attach(set_value("prompt_template_variables", template_variables))
 
 
-def set_external_prompt_tracing_context(
-    template: str, variables: dict, version: int
-) -> None:
-    attach(set_value("managed_prompt", False))
-    attach(set_value("prompt_version", version))
-    attach(set_value("prompt_template", template))
-    attach(set_value("prompt_template_variables", variables))
-
-
 def init_spans_exporter(api_endpoint: str, headers: Dict[str, str]) -> SpanExporter:
     if "http" in api_endpoint.lower() or "https" in api_endpoint.lower():
         return HTTPExporter(endpoint=f"{api_endpoint}/v1/traces", headers=headers)

{lmnr-0.4.29b3.dist-info → lmnr-0.4.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.4.29b3
+Version: 0.4.30
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai

{lmnr-0.4.29b3.dist-info → lmnr-0.4.30.dist-info}/RECORD

@@ -1,12 +1,12 @@
-lmnr/__init__.py,sha256=qwI8S02jRm7QvXsyljuEurp-kUt8HOCAN_m9RKVQVtU,389
+lmnr/__init__.py,sha256=bIkXw003GaigTxNfGE_gwVtTDGdSdAPUr6CS_nN51oA,430
 lmnr/cli.py,sha256=Ptvm5dsNLKUY5lwnN8XkT5GtCYjzpRNi2WvefknB3OQ,1079
 lmnr/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/sdk/datasets.py,sha256=w8U9E6fvetAo65Cb2CbYzlfhY8CfXAR-VysrakG6-4I,1591
 lmnr/sdk/decorators.py,sha256=ZSDaEZyjo-RUzRCltsNbe6x0t9SKl2xRQ2q4uaKvXtk,2250
 lmnr/sdk/evaluations.py,sha256=5Vfyp0aIjuGpqfuM3cqsaaLpcoO7z6lcOOKxnyHCNHk,16264
-lmnr/sdk/laminar.py,sha256=H87fXSWb9shcPW4AeoYwvTXJ-jSTjzm2sI1A1U1Vkg8,18780
+lmnr/sdk/laminar.py,sha256=e5N3CuPN8MjdAxKr4YNaGQP9sWiumKMTvCzmw8kY_e0,23477
 lmnr/sdk/log.py,sha256=cZBeUoSK39LMEV-X4-eEhTWOciULRfHaKfRK8YqIM8I,1532
-lmnr/sdk/types.py,sha256=CHbKYnEkiwsEU3Fcnoz4tDawrjII2RLYhP6hzc3-t_M,5593
+lmnr/sdk/types.py,sha256=qGD1tkGszd-_sZJaZ_Zx9U_CdUYzoDkUeN2g-o48Gls,5588
 lmnr/sdk/utils.py,sha256=Uk8y15x-sd5tP2ERONahElLDJVEy_3dA_1_5g9A6auY,3358
 lmnr/traceloop_sdk/.flake8,sha256=bCxuDlGx3YQ55QHKPiGJkncHanh9qGjQJUujcFa3lAU,150
 lmnr/traceloop_sdk/.python-version,sha256=9OLQBQVbD4zE4cJsPePhnAfV_snrPSoqEQw-PXgPMOs,6
@@ -36,17 +36,17 @@ lmnr/traceloop_sdk/tests/test_sdk_initialization.py,sha256=fRaf6lrxFzJIN94P1Tav_
 lmnr/traceloop_sdk/tests/test_tasks.py,sha256=xlEx8BKp4yG83SCjK5WkPGfyC33JSrx4h8VyjVwGbgw,906
 lmnr/traceloop_sdk/tests/test_workflows.py,sha256=RVcfY3WAFIDZC15-aSua21aoQyYeWE7KypDyUsm-2EM,9372
 lmnr/traceloop_sdk/tracing/__init__.py,sha256=Ckq7zCM26VdJVB5tIZv0GTPyMZKyfso_KWD5yPHaqdo,66
-lmnr/traceloop_sdk/tracing/attributes.py,sha256=QeqItpCCwUipkwgXG7J7swJCD0yk9uuI28aepPhemtE,1201
+lmnr/traceloop_sdk/tracing/attributes.py,sha256=h970zmb7yTszzf2oHBfOY3cDYhE6O7LhkiHLqa_7x1k,1261
 lmnr/traceloop_sdk/tracing/content_allow_list.py,sha256=3feztm6PBWNelc8pAZUcQyEGyeSpNiVKjOaDk65l2ps,846
 lmnr/traceloop_sdk/tracing/context_manager.py,sha256=csVlB6kDmbgSPsROHwnddvGGblx55v6lJMRj0wsSMQM,304
-lmnr/traceloop_sdk/tracing/tracing.py,sha256=hFqTp7OGMCZnfxVtrmRq3wP3Ph5YvHq3fz9p00_Yk-Q,29433
+lmnr/traceloop_sdk/tracing/tracing.py,sha256=Wo3ooDmuUiiqIA7ULpDCjxP6Z5UFu7Ai5ViSFLwYV8Q,28741
 lmnr/traceloop_sdk/utils/__init__.py,sha256=pNhf0G3vTd5ccoc03i1MXDbricSaiqCbi1DLWhSekK8,604
 lmnr/traceloop_sdk/utils/in_memory_span_exporter.py,sha256=H_4TRaThMO1H6vUQ0OpQvzJk_fZH0OOsRAM1iZQXsR8,2112
 lmnr/traceloop_sdk/utils/json_encoder.py,sha256=dK6b_axr70IYL7Vv-bu4wntvDDuyntoqsHaddqX7P58,463
 lmnr/traceloop_sdk/utils/package_check.py,sha256=TZSngzJOpFhfUZLXIs38cpMxQiZSmp0D-sCrIyhz7BA,251
 lmnr/traceloop_sdk/version.py,sha256=OlatFEFA4ttqSSIiV8jdE-sq3KG5zu2hnC4B4mzWF3s,23
-lmnr-0.4.29b3.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
-lmnr-0.4.29b3.dist-info/METADATA,sha256=UQ97DYAQ772h0XegYk-od_sdoOTnD_hTM-M-wX5TWLQ,10690
-lmnr-0.4.29b3.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-lmnr-0.4.29b3.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
-lmnr-0.4.29b3.dist-info/RECORD,,
+lmnr-0.4.30.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.4.30.dist-info/METADATA,sha256=2IrMNi89yZnA1F4534jSQXD-YSOdHUUsJVeS3C_fRSY,10688
+lmnr-0.4.30.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+lmnr-0.4.30.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
+lmnr-0.4.30.dist-info/RECORD,,