merge conflict

Author: zzstoatzz

tests/ai/fns/test_fn.py

@@ -312,7 +312,7 @@ async def test_fn_with_instructions_and_context(self):
         @marvin.fn(instructions="Only return tropical fruits")
         def get_fruit_details(name: str) -> dict[str, str]:
             """Returns details about the fruit"""
-            return {"hint if unknown": "describe a coconut"}
+            return {"hint if unknown": "its a coconut"}
 
         result = get_fruit_details("unknown")
         await assert_llm_equal(result, "a dictionary describing a coconut")

tests/ai/fns/test_run.py

@@ -1,12 +1,8 @@
-<<<<<<< HEAD
-from pydantic_ai import ImageUrl
-from pydantic_ai.models.test import TestModel
-=======
 from pathlib import Path
 
 import pytest
 from pydantic_ai import BinaryContent, ImageUrl
->>>>>>> d450e4b0 (move to simpler bytes ser)
+from pydantic_ai.models.test import TestModel
 
 import marvin
 
@@ -72,10 +68,12 @@ async def test_run_stream(self, test_model: TestModel):
             "actor-end-turn",
             "orchestrator-end",
         ]
+
+
 class TestRunWithAudio:
     @pytest.fixture
     def youre_funny_audio_data(self) -> BinaryContent:
-        data = Path(__file__).parent.parent.parent / "data" / "youre-funny-2.wav"
+        data = Path(__file__).parent.parent.parent / "data" / "youre-funny.wav"
         return BinaryContent(data=data.read_bytes(), media_type="audio/wav")
 
     @pytest.mark.usefixtures("gpt_4o_audio_preview")