Merge branch 'main' into nimar/lfe-5387-message-placeholder-python

Author: nimarb

langfuse/_client/span_processor.py

@@ -63,9 +63,15 @@ def __init__(
             if blocked_instrumentation_scopes is not None
             else []
         )
-        flush_at = flush_at or int(os.environ.get(LANGFUSE_FLUSH_AT, 15))
-        flush_interval = flush_interval or float(
-            os.environ.get(LANGFUSE_FLUSH_INTERVAL, 0.5)
+
+        env_flush_at = os.environ.get(LANGFUSE_FLUSH_AT, None)
+        flush_at = flush_at or int(env_flush_at) if env_flush_at is not None else None
+
+        env_flush_interval = os.environ.get(LANGFUSE_FLUSH_INTERVAL, None)
+        flush_interval = (
+            flush_interval or float(env_flush_interval)
+            if env_flush_interval is not None
+            else None
         )
 
         basic_auth_header = "Basic " + base64.b64encode(

langfuse/langchain/CallbackHandler.py

@@ -63,6 +63,8 @@ def __init__(self, *, public_key: Optional[str] = None) -> None:
         self.prompt_to_parent_run_map: Dict[UUID, Any] = {}
         self.updated_completion_start_time_memo: Set[UUID] = set()
 
+        self.last_trace_id = None
+
     def on_llm_new_token(
         self,
         token: str,
@@ -187,6 +189,8 @@ def on_chain_start(
                     level=span_level,
                 )
 
+            self.last_trace_id = self.runs[run_id].trace_id
+
         except Exception as e:
             langfuse_logger.exception(e)
 
@@ -573,6 +577,8 @@ def __on_llm_action(
             else:
                 self.runs[run_id] = self.client.start_generation(**content)
 
+            self.last_trace_id = self.runs[run_id].trace_id
+
         except Exception as e:
             langfuse_logger.exception(e)
 

langfuse/openai.py

@@ -60,6 +60,7 @@ class OpenAiDefinition:
     type: str
     sync: bool
     min_version: Optional[str] = None
+    max_version: Optional[str] = None
 
 
 OPENAI_METHODS_V0 = [
@@ -116,6 +117,7 @@ class OpenAiDefinition:
         type="chat",
         sync=True,
         min_version="1.50.0",
+        max_version="1.92.0",
     ),
     OpenAiDefinition(
         module="openai.resources.beta.chat.completions",
@@ -124,6 +126,23 @@ class OpenAiDefinition:
         type="chat",
         sync=False,
         min_version="1.50.0",
+        max_version="1.92.0",
+    ),
+    OpenAiDefinition(
+        module="openai.resources.chat.completions",
+        object="Completions",
+        method="parse",
+        type="chat",
+        sync=True,
+        min_version="1.92.0",
+    ),
+    OpenAiDefinition(
+        module="openai.resources.chat.completions",
+        object="AsyncCompletions",
+        method="parse",
+        type="chat",
+        sync=False,
+        min_version="1.92.0",
     ),
     OpenAiDefinition(
         module="openai.resources.responses",
@@ -799,6 +818,11 @@ def register_tracing():
         ):
             continue
 
+        if resource.max_version is not None and Version(openai.__version__) >= Version(
+            resource.max_version
+        ):
+            continue
+
         wrap_function_wrapper(
             resource.module,
             f"{resource.object}.{resource.method}",

langfuse/version.py

@@ -1,3 +1,3 @@
 """@private"""
 
-__version__ = "3.0.6"
+__version__ = "3.0.8"