Merge branch 'main' into kt/update-anthropic-funcion-calls

log10/load.py

@@ -591,7 +591,11 @@ def wrapper(*args, **kwargs):
                     while result_queue.empty():
                         pass
                     result = result_queue.get()
-                    completionID = result["completionID"]
+
+                    if result is None:
+                        return output
+
+                    completionID = result.get("completionID")
                     last_completion_response_var.set(result)
 
             with timed_block("result call duration (sync)"):

tests/conftest.py

@@ -22,6 +22,8 @@ def pytest_addoption(parser):
 
     parser.addoption("--magentic_model", action="store", help="Model name for Magentic tests")
 
+    parser.addoption("--magentic_vision_model", action="store", help="Model name for Magentic vision tests")
+
 
 @pytest.fixture
 def openai_model(request):
@@ -63,6 +65,11 @@ def magentic_model(request):
     return request.config.getoption("--magentic_model")
 
 
+@pytest.fixture
+def magentic_vision_model(request):
+    return request.config.getoption("--magentic_vision_model")
+
+
 @pytest.fixture
 def session():
     with log10_session() as session:

tests/pytest.ini

@@ -8,6 +8,7 @@ addopts =
     --mistralai_model=mistral-tiny
     --lamini_model=meta-llama/Llama-2-7b-chat-hf
     --magentic_model=gpt-3.5-turbo
+    --magentic_vision_model=gpt-4o
 
 markers = 
     completion: mark a test as a completion test

tests/test_magentic.py

@@ -2,7 +2,17 @@
 
 import openai
 import pytest
-from magentic import AsyncParallelFunctionCall, AsyncStreamedStr, FunctionCall, OpenaiChatModel, StreamedStr, prompt
+from magentic import (
+    AsyncParallelFunctionCall,
+    AsyncStreamedStr,
+    FunctionCall,
+    OpenaiChatModel,
+    StreamedStr,
+    SystemMessage,
+    chatprompt,
+    prompt,
+)
+from magentic.vision import UserImageMessage
 from pydantic import BaseModel
 
 from log10._httpx_utils import finalize
@@ -171,3 +181,18 @@ async def _generate_title_and_description(query: str, widget_data: str) -> Widge
 
     await finalize()
     _LogAssertion(completion_id=session.last_completion_id(), function_args=function_args).assert_tool_calls_response()
+
+
+@pytest.mark.vision
+def test_large_image_upload(magentic_vision_model):
+    with open("./tests/large_image.png", "rb") as f:
+        image_bytes = f.read()
+
+    @chatprompt(
+        SystemMessage("What's in the following screenshot?"),
+        UserImageMessage(image_bytes),
+        model=OpenaiChatModel(model=magentic_vision_model),
+    )
+    def _llm() -> str: ...
+
+    _llm()