cleanup

Author: AbhiPrasad

py/src/braintrust/integrations/agno/tracing.py

@@ -2,7 +2,7 @@
 from inspect import isawaitable
 from typing import Any
 
-from braintrust.integrations.utils import _try_to_dict as _shared_try_to_dict
+from braintrust.integrations.utils import _try_to_dict
 from braintrust.logger import start_span
 from braintrust.span_types import SpanTypeAttribute
 from braintrust.util import is_numeric
@@ -25,18 +25,6 @@ def get_args_kwargs(args: list[str], kwargs: dict[str, Any], keys: list[str]):
     return {k: args[i] if args else kwargs.get(k) for i, k in enumerate(keys)}, omit(kwargs, keys)
 
 
-def _try_to_dict(obj: Any) -> Any:
-    """Convert object to dict, handling different object types like OpenAI wrapper."""
-    result = _shared_try_to_dict(obj)
-    # Agno also falls back to __dict__ copy
-    if result is obj and not isinstance(result, dict) and hasattr(obj, "__dict__"):
-        try:
-            return obj.__dict__.copy()
-        except Exception:
-            pass
-    return result
-
-
 def is_sync_iterator(result: Any) -> bool:
     return hasattr(result, "__iter__") and hasattr(result, "__next__")
 

py/src/braintrust/integrations/test_utils.py

@@ -35,6 +35,18 @@ def test_is_supported_metric_value_excludes_booleans():
     assert not _is_supported_metric_value("1")
 
 
+def test_try_to_dict_uses_pydantic_model_dump_for_basemodel_instances():
+    pydantic = pytest.importorskip("pydantic")
+
+    class Usage(pydantic.BaseModel):
+        tokens: int
+        cached_tokens: int
+
+    result = _try_to_dict(Usage(tokens=3, cached_tokens=1))
+
+    assert result == {"tokens": 3, "cached_tokens": 1}
+
+
 def test_try_to_dict_uses_to_dict_when_available():
     class ToDictOnly:
         __slots__ = ("_payload",)
@@ -50,6 +62,31 @@ def to_dict(self):
     assert result == {"tokens": 3}
 
 
+def test_try_to_dict_falls_back_from_model_dump_python_to_bare_model_dump():
+    class BareModelDumpOnly:
+        def model_dump(self, mode=None):
+            if mode == "python":
+                raise TypeError("mode not supported")
+            return {"tokens": 3}
+
+    result = _try_to_dict(BareModelDumpOnly())
+
+    assert result == {"tokens": 3}
+
+
+def test_try_to_dict_continues_past_non_dict_converter_results():
+    class MixedConverters:
+        def model_dump(self, mode=None):
+            return [mode]
+
+        def to_dict(self):
+            return {"tokens": 3}
+
+    result = _try_to_dict(MixedConverters())
+
+    assert result == {"tokens": 3}
+
+
 def test_try_to_dict_falls_back_to_vars_for_plain_objects():
     class PlainObject:
         def __init__(self):
@@ -130,6 +167,16 @@ def test_convert_data_url_to_attachment_preserves_invalid_base64():
     assert converted == data_url
 
 
+def test_convert_data_url_to_attachment_uses_file_prefix_for_non_image_mime_types():
+    data_url = "data:application/pdf;base64,aGVsbG8="
+
+    attachment = _convert_data_url_to_attachment(data_url)
+
+    assert isinstance(attachment, Attachment)
+    assert attachment.reference["content_type"] == "application/pdf"
+    assert attachment.reference["filename"] == "file.pdf"
+
+
 def test_convert_data_url_to_attachment_preserves_non_data_urls():
     value = "https://example.com/image.png"
 

py/src/braintrust/integrations/utils.py

@@ -36,6 +36,9 @@ def _try_to_dict(obj: Any) -> dict[str, Any] | Any:
       5. ``vars(obj)``                  (plain Python attribute bags)
       6. returns *obj* unchanged
 
+    Only dict-like conversion results are accepted; non-dict results are
+    ignored so later fallbacks still run.
+
     Pydantic serializer warnings (common with generic/discriminated-union
     models such as OpenAI's ``ParsedResponse[T]``) are suppressed.
     """
@@ -68,9 +71,11 @@ def _call_model_dump() -> Any:
 
     for converter in converters:
         try:
-            return converter()
+            result = converter()
         except Exception:
             continue
+        if isinstance(result, dict):
+            return result
 
     return obj