lmnr 0.7.3__py3-none-any.whl → 0.7.4__py3-none-any.whl

lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/chat_wrappers.py

@@ -56,8 +56,8 @@ from opentelemetry.trace import SpanKind, Tracer
 from opentelemetry.trace.status import Status, StatusCode
 from wrapt import ObjectProxy
 
-from openai.types.chat import ChatCompletionMessageToolCall
 from openai.types.chat.chat_completion_message import FunctionCall
+import pydantic
 
 SPAN_NAME = "openai.chat"
 PROMPT_FILTER_KEY = "prompt_filter_results"
@@ -995,7 +995,7 @@ async def _abuild_from_streaming_response(
 
 
 def _parse_tool_calls(
-    tool_calls: Optional[List[Union[dict, ChatCompletionMessageToolCall]]],
+    tool_calls: Optional[List[Union[dict, pydantic.BaseModel]]],
 ) -> Union[List[ToolCall], None]:
     """
     Util to correctly parse the tool calls data from the OpenAI API to this module's

lmnr/opentelemetry_lib/tracing/__init__.py

@@ -74,7 +74,7 @@ class TracerWrapper(object):
             if not hasattr(cls, "instance"):
                 cls._initialize_logger(cls)
                 obj = super(TracerWrapper, cls).__new__(cls)
-                
+
                 # Store session recording options
                 cls.session_recording_options = session_recording_options or {}
 
@@ -249,13 +249,13 @@ class TracerWrapper(object):
             self._logger.warning("TracerWrapper not fully initialized, cannot flush")
             return False
         return self._span_processor.force_flush()
-    
+
     @classmethod
     def get_session_recording_options(cls) -> SessionRecordingOptions:
         """Get the session recording options set during initialization."""
         return cls.session_recording_options
 
-    def get_tracer(self):
+    def get_tracer(self) -> trace.Tracer:
         if self._tracer_provider is None:
             return trace.get_tracer_provider().get_tracer(TRACER_NAME)
         return self._tracer_provider.get_tracer(TRACER_NAME)

lmnr/opentelemetry_lib/tracing/attributes.py

@@ -14,6 +14,8 @@ SPAN_OUTPUT = "lmnr.span.output"
 SPAN_TYPE = "lmnr.span.type"
 SPAN_PATH = "lmnr.span.path"
 SPAN_IDS_PATH = "lmnr.span.ids_path"
+PARENT_SPAN_PATH = "lmnr.span.parent_path"
+PARENT_SPAN_IDS_PATH = "lmnr.span.parent_ids_path"
 SPAN_INSTRUMENTATION_SOURCE = "lmnr.span.instrumentation_source"
 SPAN_SDK_VERSION = "lmnr.span.sdk_version"
 SPAN_LANGUAGE_VERSION = "lmnr.span.language_version"

lmnr/opentelemetry_lib/tracing/processor.py

@@ -7,9 +7,11 @@ from opentelemetry.sdk.trace.export import (
     SimpleSpanProcessor,
 )
 from opentelemetry.sdk.trace import Span
-from opentelemetry.context import Context, get_value, get_current, set_value
+from opentelemetry.context import Context, get_value
 
 from lmnr.opentelemetry_lib.tracing.attributes import (
+    PARENT_SPAN_IDS_PATH,
+    PARENT_SPAN_PATH,
     SPAN_IDS_PATH,
     SPAN_INSTRUMENTATION_SOURCE,
     SPAN_LANGUAGE_VERSION,
@@ -52,20 +54,18 @@ class LaminarSpanProcessor(SpanProcessor):
         )
 
     def on_start(self, span: Span, parent_context: Context | None = None):
-        span_path_in_context = get_value("span_path", parent_context or get_current())
-        parent_span_path = span_path_in_context or (
+        parent_span_path = list(span.attributes.get(PARENT_SPAN_PATH, tuple())) or (
             self.__span_id_to_path.get(span.parent.span_id) if span.parent else None
         )
-        parent_span_ids_path = (
-            self.__span_id_lists.get(span.parent.span_id, []) if span.parent else []
-        )
+        parent_span_ids_path = list(
+            span.attributes.get(PARENT_SPAN_IDS_PATH, tuple())
+        ) or (self.__span_id_lists.get(span.parent.span_id, []) if span.parent else [])
         span_path = parent_span_path + [span.name] if parent_span_path else [span.name]
         span_ids_path = parent_span_ids_path + [
             str(uuid.UUID(int=span.get_span_context().span_id))
         ]
         span.set_attribute(SPAN_PATH, span_path)
         span.set_attribute(SPAN_IDS_PATH, span_ids_path)
-        set_value("span_path", span_path, get_current())
         self.__span_id_to_path[span.get_span_context().span_id] = span_path
         self.__span_id_lists[span.get_span_context().span_id] = span_ids_path
 

lmnr/sdk/laminar.py

@@ -13,6 +13,10 @@ from lmnr.opentelemetry_lib.tracing.instruments import Instruments
 from lmnr.opentelemetry_lib.tracing.tracer import get_tracer_with_context
 from lmnr.opentelemetry_lib.tracing.attributes import (
     ASSOCIATION_PROPERTIES,
+    PARENT_SPAN_IDS_PATH,
+    PARENT_SPAN_PATH,
+    SPAN_IDS_PATH,
+    SPAN_PATH,
     USER_ID,
     Attributes,
     SPAN_TYPE,
@@ -316,9 +320,29 @@ class Laminar:
 
         with get_tracer_with_context() as (tracer, isolated_context):
             ctx = context or isolated_context
+            path = []
+            span_ids_path = []
             if parent_span_context is not None:
+                if isinstance(parent_span_context, (dict, str)):
+                    try:
+                        laminar_span_context = LaminarSpanContext.deserialize(
+                            parent_span_context
+                        )
+                        path = laminar_span_context.span_path
+                        span_ids_path = laminar_span_context.span_ids_path
+                    except Exception:
+                        cls.__logger.warning(
+                            f"`start_as_current_span` Could not deserialize parent_span_context: {parent_span_context}. "
+                            "Will use it as is."
+                        )
+                        laminar_span_context = parent_span_context
+                else:
+                    laminar_span_context = parent_span_context
+                    if isinstance(laminar_span_context, LaminarSpanContext):
+                        path = laminar_span_context.span_path
+                        span_ids_path = laminar_span_context.span_ids_path
                 span_context = LaminarSpanContext.try_to_otel_span_context(
-                    parent_span_context, cls.__logger
+                    laminar_span_context, cls.__logger
                 )
                 ctx = trace.set_span_in_context(
                     trace.NonRecordingSpan(span_context), ctx
@@ -352,6 +376,8 @@ class Laminar:
                 context=ctx,
                 attributes={
                     SPAN_TYPE: span_type,
+                    PARENT_SPAN_PATH: path,
+                    PARENT_SPAN_IDS_PATH: span_ids_path,
                     **(label_props),
                     **(tag_props),
                 },
@@ -454,9 +480,29 @@ class Laminar:
 
         with get_tracer_with_context() as (tracer, isolated_context):
             ctx = context or isolated_context
+            path = []
+            span_ids_path = []
             if parent_span_context is not None:
+                if isinstance(parent_span_context, (dict, str)):
+                    try:
+                        laminar_span_context = LaminarSpanContext.deserialize(
+                            parent_span_context
+                        )
+                        path = laminar_span_context.span_path
+                        span_ids_path = laminar_span_context.span_ids_path
+                    except Exception:
+                        cls.__logger.warning(
+                            f"`start_span` Could not deserialize parent_span_context: {parent_span_context}. "
+                            "Will use it as is."
+                        )
+                        laminar_span_context = parent_span_context
+                else:
+                    laminar_span_context = parent_span_context
+                    if isinstance(laminar_span_context, LaminarSpanContext):
+                        path = laminar_span_context.span_path
+                        span_ids_path = laminar_span_context.span_ids_path
                 span_context = LaminarSpanContext.try_to_otel_span_context(
-                    parent_span_context, cls.__logger
+                    laminar_span_context, cls.__logger
                 )
                 ctx = trace.set_span_in_context(
                     trace.NonRecordingSpan(span_context), ctx
@@ -491,6 +537,8 @@ class Laminar:
                 context=ctx,
                 attributes={
                     SPAN_TYPE: span_type,
+                    PARENT_SPAN_PATH: path,
+                    PARENT_SPAN_IDS_PATH: span_ids_path,
                     **(label_props),
                     **(tag_props),
                 },
@@ -662,6 +710,8 @@ class Laminar:
             trace_id=uuid.UUID(int=span.get_span_context().trace_id),
             span_id=uuid.UUID(int=span.get_span_context().span_id),
             is_remote=span.get_span_context().is_remote,
+            span_path=span.attributes.get(SPAN_PATH, []),
+            span_ids_path=span.attributes.get(SPAN_IDS_PATH, []),
         )
 
     @classmethod

lmnr/sdk/types.py

@@ -169,6 +169,8 @@ class LaminarSpanContext(pydantic.BaseModel):
     trace_id: uuid.UUID
     span_id: uuid.UUID
     is_remote: bool = pydantic.Field(default=False)
+    span_path: list[str] = pydantic.Field(default=[])
+    span_ids_path: list[str] = pydantic.Field(default=[])  # stringified UUIDs
 
     def __str__(self) -> str:
         return self.model_dump_json()
@@ -199,7 +201,7 @@ class LaminarSpanContext(pydantic.BaseModel):
                 "Please use `LaminarSpanContext` instead."
             )
             return span_context
-        elif isinstance(span_context, dict) or isinstance(span_context, str):
+        elif isinstance(span_context, (dict, str)):
             try:
                 laminar_span_context = cls.deserialize(span_context)
                 return SpanContext(
@@ -221,6 +223,9 @@ class LaminarSpanContext(pydantic.BaseModel):
                 "trace_id": data.get("trace_id") or data.get("traceId"),
                 "span_id": data.get("span_id") or data.get("spanId"),
                 "is_remote": data.get("is_remote") or data.get("isRemote", False),
+                "span_path": data.get("span_path") or data.get("spanPath", []),
+                "span_ids_path": data.get("span_ids_path")
+                or data.get("spanIdsPath", []),
             }
             return cls.model_validate(converted_data)
         elif isinstance(data, str):
@@ -356,5 +361,6 @@ class MaskInputOptions(TypedDict):
     email: bool | None
     tel: bool | None
 
+
 class SessionRecordingOptions(TypedDict):
-    mask_input_options: MaskInputOptions | None
+    mask_input_options: MaskInputOptions | None

lmnr/version.py

@@ -3,7 +3,7 @@ import httpx
 from packaging import version
 
 
-__version__ = "0.7.3"
+__version__ = "0.7.4"
 PYTHON_VERSION = f"{sys.version_info.major}.{sys.version_info.minor}"
 
 

{lmnr-0.7.3.dist-info → lmnr-0.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lmnr
-Version: 0.7.3
+Version: 0.7.4
 Summary: Python SDK for Laminar
 Author: lmnr.ai
 Author-email: lmnr.ai <founders@lmnr.ai>

{lmnr-0.7.3.dist-info → lmnr-0.7.4.dist-info}/RECORD

@@ -28,7 +28,7 @@ lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/__init__.py,sha25
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/langgraph/utils.py,sha256=9dff6c2595e79edb38818668aed1220efc188d8a982594c04f4ceeb6e3ff47a6,1512
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/__init__.py,sha256=8b91dc16af927eee75b969c0980c606680b347a87f8533bc0f4a092e5ec6e5c9,2071
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/__init__.py,sha256=9d182c8cef5ee1e205dc4c2f7c8e49d8403ee9fee66072c5cfdd29a0d54f61a2,15149
-lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=92aed53560c49e0ec3ef5e20ddb6c2096bb26078cc3e10b2f80a9dcef7a3e520,38937
+lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/chat_wrappers.py,sha256=4a1e682cd455661dde3b9442c7c16d055958e77ba5fff24c6fe08ab967c30da2,38882
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/completion_wrappers.py,sha256=3a45c07d9d0f37baf409a48e2a1b577f28041c623c41f59ada1c87b94285ae3b,9537
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/config.py,sha256=8016e4af0291a77484ce88d7d1ca06146b1229ae0e0a0f46e042faf75b456a8f,507
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/shared/embeddings_wrappers.py,sha256=324eeeaf8dd862f49c15bb7290d414e77ad51cdf532c2cfd74358783cdf654a5,9330
@@ -45,13 +45,13 @@ lmnr/opentelemetry_lib/opentelemetry/instrumentation/openai/version.py,sha256=4f
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/opentelemetry/__init__.py,sha256=1f86cdf738e2f68586b0a4569bb1e40edddd85c529f511ef49945ddb7b61fab5,2648
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/skyvern/__init__.py,sha256=764e4fe979fb08d7821419a3cc5c3ae89a6664b626ef928259f8f175c939eaea,6334
 lmnr/opentelemetry_lib/opentelemetry/instrumentation/threading/__init__.py,sha256=90aa8558467d7e469fe1a6c75372c113da403557715f03b522b2fab94b287c40,6320
-lmnr/opentelemetry_lib/tracing/__init__.py,sha256=1019d25eab017547e914aa9703d4c4bc3fabb7ae0327f0dcb266c3d09f9a08e8,10207
+lmnr/opentelemetry_lib/tracing/__init__.py,sha256=b96aee7590af1853fffc4c3d8ce9127a67e1ce589f695a99aabe6b37d70b0e48,10203
 lmnr/opentelemetry_lib/tracing/_instrument_initializers.py,sha256=a15a46a0515462319195a96f7cdb695e72a1559c3212964f5883ab824031bf70,15125
-lmnr/opentelemetry_lib/tracing/attributes.py,sha256=32fa30565b977c2a92202dc2bf1ded583a81d02a6bf5ba52958f75a8be08cbbe,1497
+lmnr/opentelemetry_lib/tracing/attributes.py,sha256=88afbd1ad56bd423167f27010d86169e061ebca1f00549961da763eca51055db,1591
 lmnr/opentelemetry_lib/tracing/context.py,sha256=83f842be0fc29a96647cbf005c39ea761b0fb5913c4102f965411f47906a6135,4103
 lmnr/opentelemetry_lib/tracing/exporter.py,sha256=6af8e61fd873e8f5db315d9b9f1edbf46b860ba7e50140f0bdcc6864c6d35a03,2082
 lmnr/opentelemetry_lib/tracing/instruments.py,sha256=e3c12315bda301416d1f3bc8d354ad16d4da211e2ecfa019265f4b565307c118,5655
-lmnr/opentelemetry_lib/tracing/processor.py,sha256=fd11e4d48eb5932f47898b8f70b8b5880f7ee7e58478f1ef20caff20e1f34252,3381
+lmnr/opentelemetry_lib/tracing/processor.py,sha256=cbc70f138e70c878ef57b02a2c46ef48dd7f694a522623a82dff1623b73d1e1c,3353
 lmnr/opentelemetry_lib/tracing/tracer.py,sha256=33769a9a97385f5697eb0e0a6b1813a57ed956c7a8379d7ac2523e700e7dd528,1362
 lmnr/opentelemetry_lib/utils/__init__.py,sha256=a4d85fd06def4dde5c728734de2d4c5c36eb89c49a8aa09b8b50cb5a149e90af,604
 lmnr/opentelemetry_lib/utils/json_encoder.py,sha256=74ae9bfdac6bef42182fb56ff9bbb8c27b6f0c3bb29eda2ab0769d76a5fb3f9f,463
@@ -85,12 +85,12 @@ lmnr/sdk/datasets.py,sha256=3fd851c5f97bf88eaa84b1451a053eaff23b4497cbb45eac2f9e
 lmnr/sdk/decorators.py,sha256=2ccf9ecd9616ad1d52301febd8af630288ba63db2d36302236f606a460fc08ca,6516
 lmnr/sdk/eval_control.py,sha256=291394ac385c653ae9b5167e871bebeb4fe8fc6b7ff2ed38e636f87015dcba86,184
 lmnr/sdk/evaluations.py,sha256=b41f7737b084dc5b64b2952659b729622e0918fd492bfcddde7177d1a1c690ae,22572
-lmnr/sdk/laminar.py,sha256=f9dbacc6549d19701db7a986cb29c82114b1a054900a282b1ae9dbe6a488129b,34974
+lmnr/sdk/laminar.py,sha256=24d680407ce694f1a7ec0e9c0524eae3deb7d638ad5caff3a591ddf7963ad480,37533
 lmnr/sdk/log.py,sha256=9edfd83263f0d4845b1b2d1beeae2b4ed3f8628de941f371a893d72b79c348d4,2213
-lmnr/sdk/types.py,sha256=ded526d1289442672236265bd6cbb4381fc55d8ce0fce1d6e7b2541e54c758c4,12948
+lmnr/sdk/types.py,sha256=49358ddd00a1f1e75ffc8cbba62aaf49f4d3031eebf52de86005715a54a846b7,13244
 lmnr/sdk/utils.py,sha256=4beb884ae6fbbc7d8cf639b036b726ea6a2a658f0a6386faf5735a13d706a2d8,5039
-lmnr/version.py,sha256=65bb6a01739adaee6189918df22c9e8df76cfc10339b704416f686014f066b2b,1321
-lmnr-0.7.3.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
-lmnr-0.7.3.dist-info/entry_points.txt,sha256=abdf3411b7dd2d7329a241f2da6669bab4e314a747a586ecdb9f888f3035003c,39
-lmnr-0.7.3.dist-info/METADATA,sha256=2952132a1ddd7d9e0f8c50fdd39e159174825b812b898bf48135c1c69ee7d5db,14196
-lmnr-0.7.3.dist-info/RECORD,,
+lmnr/version.py,sha256=d1c12ee42adc0a3de888632fcfe36693a8dd749bbed2ad12dd1ab2783608bcd2,1321
+lmnr-0.7.4.dist-info/WHEEL,sha256=ab6157bc637547491fb4567cd7ddf26b04d63382916ca16c29a5c8e94c9c9ef7,79
+lmnr-0.7.4.dist-info/entry_points.txt,sha256=abdf3411b7dd2d7329a241f2da6669bab4e314a747a586ecdb9f888f3035003c,39
+lmnr-0.7.4.dist-info/METADATA,sha256=91677f6dc8a33790ec9e9e3bc6e1e90561d335359f3a73590c563aed8fb90163,14196
+lmnr-0.7.4.dist-info/RECORD,,