diff --git a/langfuse/langchain/CallbackHandler.py b/langfuse/langchain/CallbackHandler.py index db90f10a0..b3cc76df4 100644 --- a/langfuse/langchain/CallbackHandler.py +++ b/langfuse/langchain/CallbackHandler.py @@ -1140,7 +1140,9 @@ def _parse_usage(response: LLMResult) -> Any: llm_usage = _parse_usage_model( generation_chunk.generation_info["usage_metadata"] ) - break + + if llm_usage is not None: + break message_chunk = getattr(generation_chunk, "message", {}) response_metadata = getattr(message_chunk, "response_metadata", {}) diff --git a/tests/test_langchain.py b/tests/test_langchain.py index 4e4093e38..0a3ac72f1 100644 --- a/tests/test_langchain.py +++ b/tests/test_langchain.py @@ -177,6 +177,7 @@ def test_callback_generated_from_lcel_chain(): assert langchain_generation_span.output != "" +@pytest.mark.skip(reason="Flaky") def test_basic_chat_openai(): # Create a unique name for this test test_name = f"Test Basic Chat {create_uuid()}"