lmnr 0.4.21b0__py3-none-any.whl → 0.4.23__py3-none-any.whl

lmnr/__init__.py

@@ -3,3 +3,4 @@ from .sdk.laminar import Laminar
 from .sdk.types import ChatMessage, PipelineRunError, PipelineRunResponse, NodeInput
 from .sdk.decorators import observe
 from .traceloop_sdk import Instruments
+from .traceloop_sdk.tracing.attributes import Attributes

lmnr/sdk/laminar.py

@@ -9,11 +9,13 @@ from opentelemetry.util.types import AttributeValue
 from opentelemetry.context import set_value, attach, detach
 from lmnr.traceloop_sdk import Traceloop
 from lmnr.traceloop_sdk.tracing import get_tracer
+from lmnr.traceloop_sdk.tracing.attributes import Attributes, SPAN_TYPE
+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, Optional, Set, Union
+from typing import Any, Literal, Optional, Set, Union
 
 import copy
 import datetime
@@ -279,6 +281,7 @@ class Laminar:
         cls,
         name: str,
         input: Any = None,
+        span_type: Union[Literal["DEFAULT"], Literal["LLM"]] = "DEFAULT",
     ):
         """Start a new span as the current span. Useful for manual
         instrumentation.
@@ -287,6 +290,7 @@ class Laminar:
         ```python
         with Laminar.start_as_current_span("my_span", input="my_input") as span:
             await my_async_function()
+            Laminar.set_span_output("my_output")`
         ```
 
         Args:
@@ -308,6 +312,7 @@ class Laminar:
                         SPAN_INPUT,
                         json.dumps(input),
                     )
+                span.set_attribute(SPAN_TYPE, span_type)
                 yield span
 
             # TODO: Figure out if this is necessary
@@ -327,7 +332,36 @@ class Laminar:
         """
         span = get_current_span()
         if output is not None and span != INVALID_SPAN:
-            span.set_attribute(SPAN_OUTPUT, json.dumps(output))
+            span.set_attribute(SPAN_OUTPUT, json_dumps(output))
+
+    @classmethod
+    def set_span_attributes(
+        cls,
+        attributes: dict[Attributes, Any],
+    ):
+        """Set attributes for the current span. Useful for manual
+        instrumentation.
+
+        Args:
+            attributes (dict[ATTRIBUTES, Any]): attributes to set for the span
+        """
+        span = get_current_span()
+        if span == INVALID_SPAN:
+            return
+
+        for key, value in attributes.items():
+            # Python 3.12+ should do: if key not in Attributes:
+            try:
+                Attributes(key.value)
+            except (TypeError, AttributeError):
+                cls.__logger.warning(
+                    f"Attribute {key} is not a valid Laminar attribute."
+                )
+                continue
+            if not isinstance(value, (str, int, float, bool)):
+                span.set_attribute(key.value, json_dumps(value))
+            else:
+                span.set_attribute(key.value, value)
 
     @classmethod
     def set_session(

lmnr/traceloop_sdk/decorators/base.py

@@ -1,6 +1,7 @@
 import json
 from functools import wraps
 import os
+import pydantic
 import types
 from typing import Any, Optional
 import warnings
@@ -17,13 +18,15 @@ from lmnr.traceloop_sdk.utils.json_encoder import JSONEncoder
 
 class CustomJSONEncoder(JSONEncoder):
     def default(self, o: Any) -> Any:
+        if isinstance(o, pydantic.BaseModel):
+            return o.model_dump_json()
         try:
             return super().default(o)
         except TypeError:
             return str(o)  # Fallback to string representation for unsupported types
 
 
-def _json_dumps(data: dict) -> str:
+def json_dumps(data: dict) -> str:
     try:
         with warnings.catch_warnings():
             warnings.simplefilter("ignore", RuntimeWarning)
@@ -59,7 +62,7 @@ def entity_method(
                     if _should_send_prompts():
                         span.set_attribute(
                             SPAN_INPUT,
-                            _json_dumps(
+                            json_dumps(
                                 get_input_from_func_args(
                                     fn, is_method(fn), args, kwargs
                                 )
@@ -78,7 +81,7 @@ def entity_method(
                     if _should_send_prompts():
                         span.set_attribute(
                             SPAN_OUTPUT,
-                            _json_dumps(res),
+                            json_dumps(res),
                         )
                 except TypeError:
                     pass
@@ -121,7 +124,7 @@ def aentity_method(
                     if _should_send_prompts():
                         span.set_attribute(
                             SPAN_INPUT,
-                            _json_dumps(
+                            json_dumps(
                                 get_input_from_func_args(
                                     fn, is_method(fn), args, kwargs
                                 )

lmnr/traceloop_sdk/tracing/attributes.py

@@ -1,3 +1,6 @@
+from enum import Enum
+from opentelemetry.semconv_ai import SpanAttributes
+
 SPAN_INPUT = "lmnr.span.input"
 SPAN_OUTPUT = "lmnr.span.output"
 SPAN_TYPE = "lmnr.span.type"
@@ -7,3 +10,14 @@ ASSOCIATION_PROPERTIES = "lmnr.association.properties"
 SESSION_ID = "session_id"
 USER_ID = "user_id"
 TRACE_TYPE = "trace_type"
+
+
+# exposed to the user, configurable
+class Attributes(Enum):
+    # not SpanAttributes.LLM_USAGE_PROMPT_TOKENS,
+    INPUT_TOKEN_COUNT = "gen_ai.usage.input_tokens"
+    # not SpanAttributes.LLM_USAGE_COMPLETION_TOKENS,
+    OUTPUT_TOKEN_COUNT = "gen_ai.usage.output_tokens"
+    PROVIDER = SpanAttributes.LLM_SYSTEM
+    REQUEST_MODEL = SpanAttributes.LLM_REQUEST_MODEL
+    RESPONSE_MODEL = SpanAttributes.LLM_RESPONSE_MODEL

{lmnr-0.4.21b0.dist-info → lmnr-0.4.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lmnr
-Version: 0.4.21b0
+Version: 0.4.23
 Summary: Python SDK for Laminar AI
 License: Apache-2.0
 Author: lmnr.ai
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: argparse (>=1.0,<2.0)
 Requires-Dist: backoff (>=2.0,<3.0)
 Requires-Dist: deprecated (>=1.0,<2.0)
@@ -18,34 +19,34 @@ 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.27.0,<2.0.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-http (>=1.27.0,<2.0.0)
-Requires-Dist: opentelemetry-instrumentation-alephalpha (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-anthropic (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-bedrock (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-chromadb (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-cohere (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-google-generativeai (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-groq (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-haystack (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-lancedb (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-langchain (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-llamaindex (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-marqo (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-milvus (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-mistralai (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-ollama (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-openai (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-pinecone (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-qdrant (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-replicate (>=0.32.0)
+Requires-Dist: opentelemetry-instrumentation-alephalpha (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-anthropic (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-bedrock (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-chromadb (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-cohere (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-google-generativeai (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-groq (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-haystack (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-lancedb (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-langchain (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-llamaindex (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-marqo (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-milvus (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-mistralai (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-ollama (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-openai (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-pinecone (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-qdrant (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-replicate (>=0.33.1)
 Requires-Dist: opentelemetry-instrumentation-requests (>=0.48b0,<0.49)
 Requires-Dist: opentelemetry-instrumentation-sqlalchemy (>=0.48b0,<0.49)
 Requires-Dist: opentelemetry-instrumentation-threading (>=0.48b0,<0.49)
-Requires-Dist: opentelemetry-instrumentation-together (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-transformers (>=0.32.0)
+Requires-Dist: opentelemetry-instrumentation-together (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-transformers (>=0.33.1)
 Requires-Dist: opentelemetry-instrumentation-urllib3 (>=0.48b0,<0.49)
-Requires-Dist: opentelemetry-instrumentation-vertexai (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-watsonx (>=0.32.0)
-Requires-Dist: opentelemetry-instrumentation-weaviate (>=0.32.0)
+Requires-Dist: opentelemetry-instrumentation-vertexai (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-watsonx (>=0.33.1)
+Requires-Dist: opentelemetry-instrumentation-weaviate (>=0.33.1)
 Requires-Dist: opentelemetry-sdk (>=1.27.0,<2.0.0)
 Requires-Dist: opentelemetry-semantic-conventions-ai (==0.4.1)
 Requires-Dist: pydantic (>=2.7,<3.0)

{lmnr-0.4.21b0.dist-info → lmnr-0.4.23.dist-info}/RECORD

@@ -1,9 +1,9 @@
-lmnr/__init__.py,sha256=5Ks8UIicCzCBgwSz0MOX3I7jVruPMUO3SmxIwUoODzQ,231
+lmnr/__init__.py,sha256=-MdXpUkDNhqJaQ5AVdBohIDQgGmeov_xwwtwErwXnQg,288
 lmnr/cli.py,sha256=Ptvm5dsNLKUY5lwnN8XkT5GtCYjzpRNi2WvefknB3OQ,1079
 lmnr/sdk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lmnr/sdk/decorators.py,sha256=ZSDaEZyjo-RUzRCltsNbe6x0t9SKl2xRQ2q4uaKvXtk,2250
 lmnr/sdk/evaluations.py,sha256=C2lhrevH3PDvnTX-qfop1k-NTqTFX4MWaSkc9oG5kxc,15199
-lmnr/sdk/laminar.py,sha256=lPSNZ_sz6oeMLZcJ1u3hAr3wb1Ha7mj5zkNtMY7pYUY,15013
+lmnr/sdk/laminar.py,sha256=IoQ_4DJGysKn7tEFZk3ILdRWGxmHvDPzxzXgNZifyws,16293
 lmnr/sdk/log.py,sha256=EgAMY77Zn1bv1imCqrmflD3imoAJ2yveOkIcrIP3e98,1170
 lmnr/sdk/types.py,sha256=HvaZEqVRduCZbkF7Cp8rgS5oBbc1qPvOD3PP9tFrRu4,4826
 lmnr/sdk/utils.py,sha256=s81p6uJehgJSaLWy3sR5fTpEDH7vzn3i_UujUHChl6M,3346
@@ -12,7 +12,7 @@ lmnr/traceloop_sdk/.python-version,sha256=9OLQBQVbD4zE4cJsPePhnAfV_snrPSoqEQw-PX
 lmnr/traceloop_sdk/__init__.py,sha256=hp3q1OsFaGgaQCEanJrL38BJN32hWqCNVCSjYpndEsY,2957
 lmnr/traceloop_sdk/config/__init__.py,sha256=DliMGp2NjYAqRFLKpWQPUKjGMHRO8QsVfazBA1qENQ8,248
 lmnr/traceloop_sdk/decorators/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lmnr/traceloop_sdk/decorators/base.py,sha256=-b8Q738m3StdLTgHARx8zw78m9htynKkZFFTYURQnOA,5524
+lmnr/traceloop_sdk/decorators/base.py,sha256=ZkvzVJfO4fOxRHwPobPL2ryW32nZjgO7cX7CXouyUnY,5621
 lmnr/traceloop_sdk/instruments.py,sha256=oMvIASueW3GeChpjIdH-DD9aFBVB8OtHZ0HawppTrlI,942
 lmnr/traceloop_sdk/tests/__init__.py,sha256=RYnG0-8zbXL0-2Ste1mEBf5sN4d_rQjGTCgPBuaZC74,20
 lmnr/traceloop_sdk/tests/cassettes/test_association_properties/test_langchain_and_external_association_properties.yaml,sha256=26g0wRA0juicHg_XrhcE8H4vhs1lawDs0o0aLFn-I7w,3103
@@ -35,7 +35,7 @@ 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=PXwS1GCZKdjQSypl__BSkQNZhh21RyzwTPnDOh61bnQ,250
+lmnr/traceloop_sdk/tracing/attributes.py,sha256=YBxDZ-9I9QlnehcCIUQcpeHTtv4gPU3vDtct7SqQ06Q,746
 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=_HDLuyy4XgobC1ig4qz5jYbB4tWAZSfD6gbgUqwmYJU,35522
@@ -44,8 +44,8 @@ lmnr/traceloop_sdk/utils/in_memory_span_exporter.py,sha256=H_4TRaThMO1H6vUQ0OpQv
 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.21b0.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
-lmnr-0.4.21b0.dist-info/METADATA,sha256=byzgOXZVgOUDOQ3TDkpgRMBI7_LFfXZX10_QSMpvwZk,10444
-lmnr-0.4.21b0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-lmnr-0.4.21b0.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
-lmnr-0.4.21b0.dist-info/RECORD,,
+lmnr-0.4.23.dist-info/LICENSE,sha256=67b_wJHVV1CBaWkrKFWU1wyqTPSdzH77Ls-59631COg,10411
+lmnr-0.4.23.dist-info/METADATA,sha256=BOAKiIyn49ReowUuPFpmqRYhgiQlK6CUSEEipTreYbo,10493
+lmnr-0.4.23.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+lmnr-0.4.23.dist-info/entry_points.txt,sha256=K1jE20ww4jzHNZLnsfWBvU3YKDGBgbOiYG5Y7ivQcq4,37
+lmnr-0.4.23.dist-info/RECORD,,

{lmnr-0.4.21b0.dist-info → lmnr-0.4.23.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any