diff --git a/langfuse/_task_manager/media_manager.py b/langfuse/_task_manager/media_manager.py index bc72776a7..4a2ef9ff4 100644 --- a/langfuse/_task_manager/media_manager.py +++ b/langfuse/_task_manager/media_manager.py @@ -252,6 +252,19 @@ def _process_data_recursively(data: Any, level: int) -> Any: finally: seen.discard(id(data)) + if isinstance(data, tuple): + if id(data) in seen: + return data + + seen.add(id(data)) + + try: + return tuple( + _process_data_recursively(item, level + 1) for item in data + ) + finally: + seen.discard(id(data)) + if isinstance(data, dict): if id(data) in seen: return data diff --git a/langfuse/media.py b/langfuse/media.py index 6410079ab..2136419f3 100644 --- a/langfuse/media.py +++ b/langfuse/media.py @@ -414,10 +414,19 @@ def traverse(obj: Any, depth: int) -> Any: return result - # Handle arrays + # Handle arrays and tuples if isinstance(obj, list): return [traverse(item, depth + 1) for item in obj] + if isinstance(obj, tuple): + traversed_items = tuple(traverse(item, depth + 1) for item in obj) + if hasattr(obj, "_fields"): + try: + return type(obj)(*traversed_items) + except TypeError: + return obj + return traversed_items if type(obj) is tuple else obj + # Handle dictionaries if isinstance(obj, dict): return {key: traverse(value, depth + 1) for key, value in obj.items()} diff --git a/tests/unit/test_media.py b/tests/unit/test_media.py index f222df576..f9e5e9fcf 100644 --- a/tests/unit/test_media.py +++ b/tests/unit/test_media.py @@ -1,5 +1,6 @@ import base64 from types import SimpleNamespace +from typing import NamedTuple from unittest.mock import Mock import pytest @@ -14,6 +15,11 @@ ) +class MediaResponse(NamedTuple): + text: str + image: str + + def test_init_with_base64_data_uri(): media = LangfuseMedia(base64_data_uri=SAMPLE_BASE64_DATA_URI) assert media._source == "base64_data_uri" @@ -264,6 +270,67 @@ def test_resolve_media_references_uses_configured_httpx_client(): ) +def test_resolve_media_references_in_tuple(): + reference_string = "@@@langfuseMedia:type=image/jpeg|id=test-id|source=bytes@@@" + media_api = Mock() + media_api.get.return_value = SimpleNamespace( + url="https://example.com/test.jpg", content_type="image/jpeg" + ) + + response = Mock() + response.content = b"image-bytes" + response.raise_for_status.return_value = None + + httpx_client = Mock() + httpx_client.get.return_value = response + + mock_langfuse_client = SimpleNamespace( + api=SimpleNamespace(media=media_api), + _resources=SimpleNamespace(httpx_client=httpx_client), + ) + + resolved = LangfuseMedia.resolve_media_references( + obj=("response text", reference_string), + langfuse_client=mock_langfuse_client, + resolve_with="base64_data_uri", + ) + + assert resolved == ( + "response text", + "data:image/jpeg;base64,aW1hZ2UtYnl0ZXM=", + ) + + +def test_resolve_media_references_preserves_named_tuple_fields(): + reference_string = "@@@langfuseMedia:type=image/jpeg|id=test-id|source=bytes@@@" + media_api = Mock() + media_api.get.return_value = SimpleNamespace( + url="https://example.com/test.jpg", content_type="image/jpeg" + ) + + response = Mock() + response.content = b"image-bytes" + response.raise_for_status.return_value = None + + httpx_client = Mock() + httpx_client.get.return_value = response + + mock_langfuse_client = SimpleNamespace( + api=SimpleNamespace(media=media_api), + _resources=SimpleNamespace(httpx_client=httpx_client), + ) + + resolved = LangfuseMedia.resolve_media_references( + obj=MediaResponse("response text", reference_string), + langfuse_client=mock_langfuse_client, + resolve_with="base64_data_uri", + ) + + assert isinstance(resolved, MediaResponse) + assert resolved.text == "response text" + assert resolved.image == "data:image/jpeg;base64,aW1hZ2UtYnl0ZXM=" + + def test_init_with_urlsafe_base64_data_uri(): original_bytes = b"\xfb\xff" urlsafe_base64 = base64.urlsafe_b64encode(original_bytes).decode() diff --git a/tests/unit/test_media_manager.py b/tests/unit/test_media_manager.py index 2ac4fd7b3..f4ee3716a 100644 --- a/tests/unit/test_media_manager.py +++ b/tests/unit/test_media_manager.py @@ -213,6 +213,26 @@ def test_find_and_process_media_sse_in_nested_structure_passes_through(): assert queue.empty() +def test_find_and_process_media_in_tuple_queues_upload(): + queue = Queue() + manager = MediaManager( + api_client=SimpleNamespace(media=Mock()), + httpx_client=Mock(), + media_upload_queue=queue, + ) + media = LangfuseMedia(content_bytes=b"sample-image", content_type="image/jpeg") + + result = manager._find_and_process_media( + data=("response text", media), + trace_id="trace-id", + observation_id="observation-id", + field="output", + ) + + assert result == ("response text", media) + assert queue.qsize() == 1 + + def test_find_and_process_media_gemini_inline_data_is_processed(): queue = Queue() manager = MediaManager(