diff --git a/tests/e2e/llm_translation/realtime/test_realtime_pipecat_audio_e2e.py b/tests/e2e/llm_translation/realtime/test_realtime_pipecat_audio_e2e.py index 0e4dad7af1a..76bdd49cca1 100644 --- a/tests/e2e/llm_translation/realtime/test_realtime_pipecat_audio_e2e.py +++ b/tests/e2e/llm_translation/realtime/test_realtime_pipecat_audio_e2e.py @@ -341,7 +341,7 @@ async def _run_audio_input_pipeline( "When asked about the weather, always call the get_weather tool. " "Never guess temperatures." ), - session_properties=SERVER_VAD_SETTINGS, + session_properties=SERVER_VAD_SETTINGS.model_copy(update={"tools": WEATHER_TOOL}), ), ) diff --git a/tests/e2e/logging/logging_client.py b/tests/e2e/logging/logging_client.py index 3903d1a8363..9b6f6631e1f 100644 --- a/tests/e2e/logging/logging_client.py +++ b/tests/e2e/logging/logging_client.py @@ -164,19 +164,18 @@ class LangfuseObservationList(BaseModel): data: list[LangfuseObservation] = [] -class LangfuseOtelMetadata(BaseModel): - """Langfuse stores every OTel span attribute under metadata.attributes.""" - - model_config = ConfigDict(extra="ignore") - - attributes: dict[str, str] = {} +_FLATTENED_ATTRIBUTE_PREFIX: Final = "attributes." -def otel_attributes(obs: LangfuseObservation) -> dict[str, str]: - try: - return LangfuseOtelMetadata.model_validate(obs.metadata).attributes - except ValidationError: - return {} +def otel_attributes(obs: LangfuseObservation) -> dict[str, JsonValue]: + metadata: Final = obs.metadata if isinstance(obs.metadata, dict) else {} + nested: Final = metadata.get("attributes") + flattened: Final = { + key.removeprefix(_FLATTENED_ATTRIBUTE_PREFIX): value + for key, value in metadata.items() + if key.startswith(_FLATTENED_ATTRIBUTE_PREFIX) + } + return (nested if isinstance(nested, dict) else {}) | flattened def is_otel_v2_generation(obs: LangfuseObservation, *, key_alias: str) -> bool: diff --git a/tests/e2e_harness/logging/test_logging_client.py b/tests/e2e_harness/logging/test_logging_client.py index c396a6c68e5..89f4e6855e8 100644 --- a/tests/e2e_harness/logging/test_logging_client.py +++ b/tests/e2e_harness/logging/test_logging_client.py @@ -38,6 +38,23 @@ def test_observation_preserves_v2_content_usage_and_cost(encoded: bool, cost: fl assert not is_otel_v2_generation(observation, key_alias="another-key") +def test_otel_v2_generation_matches_metadata_flattened_by_the_v2_observations_api() -> None: + observation: Final = LangfuseObservation.model_validate( + { + "id": "observation", + "metadata": { + "scope.name": "litellm", + "attributes.langfuse.observation.type": "generation", + "attributes.litellm.metadata.user_api_key_alias": "test-key-alias", + "attributes.gen_ai.usage.input_tokens": 17, + }, + } + ) + + assert is_otel_v2_generation(observation, key_alias="test-key-alias") + assert not is_otel_v2_generation(observation, key_alias="another-key") + + def test_observation_preserves_plain_text_and_legacy_cost() -> None: cost: Final = 0.000031 observation: Final = LangfuseObservation.model_validate(