langwatch 0.2.17__py3-none-any.whl → 0.2.18__py3-none-any.whl

langwatch/__version__.py

@@ -1,3 +1,3 @@
 """Version information for LangWatch."""
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"

langwatch/telemetry/context.py

@@ -1,8 +1,9 @@
 import threading
-from typing import TYPE_CHECKING, List
+from typing import TYPE_CHECKING, Dict, List
 import contextvars
 import warnings
 from opentelemetry import trace as trace_api
+from opentelemetry import context
 
 from langwatch.utils.initialization import ensure_setup
 
@@ -44,7 +45,19 @@ def get_current_trace(
 
     trace = LangWatchTrace()
     if start_if_none:
-        return trace.__enter__()
+        otel_span = trace_api.get_current_span()
+        otel_span_id = otel_span.get_span_context().span_id
+        trace.__enter__()
+
+        # Keep the previous span in the context if we are starting a new trace not at root level
+        if otel_span_id != 0:
+            ctx = trace_api.set_span_in_context(otel_span)
+            context.attach(ctx)
+        otel_span = trace_api.get_current_span()
+
+        trace.__exit__(None, None, None)
+
+        return trace
     return trace
 
 
@@ -57,20 +70,20 @@ def get_current_span() -> "LangWatchSpan":
     """
     ensure_setup()
 
-    # First try getting from LangWatch context
-    span = stored_langwatch_span.get(None)
-    if span is not None:
-        return span
-
-    if _is_on_child_thread() and len(main_thread_langwatch_span) > 0:
-        return main_thread_langwatch_span[-1]
-
-    # Fall back to OpenTelemetry context
     otel_span = trace_api.get_current_span()
-    trace = get_current_trace()
+    otel_span_id = otel_span.get_span_context().span_id
+
+    # If on a child thread and there is no parent, try to find a parent from the main thread
+    if (
+        _is_on_child_thread()
+        and len(main_thread_langwatch_span) > 0
+        and otel_span_id == 0
+    ):
+        return main_thread_langwatch_span[-1]
 
     from langwatch.telemetry.span import LangWatchSpan
 
+    trace = get_current_trace()
     return LangWatchSpan.wrap_otel_span(otel_span, trace)
 
 
@@ -91,11 +104,8 @@ def _set_current_span(span: "LangWatchSpan"):
     if not _is_on_child_thread():
         main_thread_langwatch_span.append(span)
 
-    try:
-        return stored_langwatch_span.set(span)
-    except Exception as e:
-        warnings.warn(f"Failed to set LangWatch span context: {e}")
-        return None
+    # Dummy token, just for the main thread span list
+    return "token"
 
 
 def _reset_current_trace(token: contextvars.Token):
@@ -112,19 +122,12 @@ def _reset_current_trace(token: contextvars.Token):
             warnings.warn(f"Failed to reset LangWatch trace context: {e}")
 
 
-def _reset_current_span(token: contextvars.Token):
+def _reset_current_span(_token: str):
     global main_thread_langwatch_span
     if not _is_on_child_thread():
         if len(main_thread_langwatch_span) > 0:
             main_thread_langwatch_span.pop()
 
-    try:
-        stored_langwatch_span.reset(token)
-    except Exception as e:
-        # Only warn if it's not a context error
-        if "different Context" not in str(e):
-            warnings.warn(f"Failed to reset LangWatch span context: {e}")
-
 
 def _is_on_child_thread() -> bool:
     return threading.current_thread() != threading.main_thread()

{langwatch-0.2.17.dist-info → langwatch-0.2.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: langwatch
-Version: 0.2.17
+Version: 0.2.18
 Summary: LangWatch Python SDK, for monitoring your LLMs
 Author-email: Langwatch Engineers <engineering@langwatch.ai>
 License: MIT

{langwatch-0.2.17.dist-info → langwatch-0.2.18.dist-info}/RECORD

@@ -1,5 +1,5 @@
 langwatch/__init__.py,sha256=OX8vN2-VFNUqRo9mJC8LUjHGMKYSRTwmzUQj_sKAVXQ,4210
-langwatch/__version__.py,sha256=23SV1aVSTbQaJNFPAYc4VKEI8RFtQ98rcSc8wfwcOSw,65
+langwatch/__version__.py,sha256=HHZMUDcvD8rFyW1uyw1zA9mutRi3pSZ0g7D2KwclJ6A,65
 langwatch/attributes.py,sha256=nXdI_G85wQQCAdAcwjCiLYdEYj3wATmfgCmhlf6dVIk,3910
 langwatch/batch_evaluation.py,sha256=piez7TYqUZPb9NlIShTuTPmSzrZqX-vm2Grz_NGXe04,16078
 langwatch/client.py,sha256=WTNcYSik7kZ2kH-qGDnhbMTosc8e_Xhab_lZlfh5TC8,25559
@@ -396,7 +396,7 @@ langwatch/prompts/service.py,sha256=CiVuW1y8sYti05jaYSNk40miCg2Q0bA2FSC3iVoM5_o,
 langwatch/prompts/types.py,sha256=0SPb-jfcndvay53PMpuHvtCrIptT-h-eo-9EHM-grl4,654
 langwatch/prompts/decorators/prompt_service_tracing.py,sha256=ELrQ9bd3nPurbUXX2K_CN-2zWE00nqjXObs9Gkp4eVg,2309
 langwatch/prompts/decorators/prompt_tracing.py,sha256=Q3-RM8G-PHkBjVKntSg3c8H2o0P1bpO3UbR3uRgbke0,3182
-langwatch/telemetry/context.py,sha256=ixKvTBZADFuWglFCK95r8bF4-f-iq_WixzC4ydirCE8,3888
+langwatch/telemetry/context.py,sha256=q0hUG9PM3aifIr6ZRuuNNbsGtcAImu9Pv2XTKUp3CGc,4029
 langwatch/telemetry/sampling.py,sha256=XDf6ZoXiwpHaHDYd_dDszSqH8_9-CHFNsGAZWOW1VYk,1327
 langwatch/telemetry/span.py,sha256=g-RGWfQk4Q3b2TpipiHqjEV7rwmidaUHp54q51UxQ6s,32801
 langwatch/telemetry/tracing.py,sha256=oyCAqW-9sFFRYPWy9epZVN0aNvqToRY4_PGxQAtS-dI,27622
@@ -409,6 +409,6 @@ langwatch/utils/initialization.py,sha256=ReDpEtjenCoRfc02YuIBK8KVjAwXx3N8yf9dyPg
 langwatch/utils/module.py,sha256=KLBNOK3mA9gCSifCcQX_lOtU48BJQDWvFKtF6NMvwVA,688
 langwatch/utils/transformation.py,sha256=5XUnW7Oz8Ck9EMsKeKeoDOrIw3EXpLGMk_fMSeA0Zng,7216
 langwatch/utils/utils.py,sha256=ZCOSie4o9LdJ7odshNfCNjmgwgQ27ojc5ENqt1rXuSs,596
-langwatch-0.2.17.dist-info/METADATA,sha256=UEAOKn47G8KZbho-nwqNDzOx0kVe5ufp30WyE9YN0Nc,13124
-langwatch-0.2.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-langwatch-0.2.17.dist-info/RECORD,,
+langwatch-0.2.18.dist-info/METADATA,sha256=23XS5hHgnh3_4eEXv3v6rX7Yj6uxfBdfbjm5nLnvpD4,13124
+langwatch-0.2.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+langwatch-0.2.18.dist-info/RECORD,,