feat: fix anthropic reasking (#560)

examples/groq/groq_example2.py

@@ -1,6 +1,5 @@
 import os
-from pydantic import BaseModel, Field
-from typing import List
+from pydantic import BaseModel
 from groq import Groq
 import instructor
 

instructor/__init__.py

@@ -1,3 +1,5 @@
+import importlib
+
 from .mode import Mode
 from .process_response import handle_response_model
 from .distil import FinetuneFormat, Instructions
@@ -44,18 +46,13 @@
     "handle_response_model",
 ]
 
-try:
-    import anthropic
+
+if importlib.util.find_spec("anthropic") is not None:
     from .client_anthropic import from_anthropic
 
-    __all__.append("from_anthropic")
-except ImportError:
-    pass
+    __all__ += ["from_anthropic"]
 
-try:
-    import groq
+if importlib.util.find_spec("groq") is not None:
     from .client_groq import from_groq
 
-    __all__.append("from_groq")
-except ImportError:
-    pass
+    __all__ += ["from_groq"]

instructor/client_anthropic.py

@@ -25,10 +25,13 @@ def from_anthropic(
     mode: instructor.Mode = instructor.Mode.ANTHROPIC_JSON,
     **kwargs,
 ) -> instructor.Instructor | instructor.AsyncInstructor:
-    assert mode in {
-        instructor.Mode.ANTHROPIC_JSON,
-        instructor.Mode.ANTHROPIC_TOOLS,
-    }, "Mode be one of {instructor.Mode.ANTHROPIC_JSON, instructor.Mode.ANTHROPIC_TOOLS}"
+    assert (
+        mode
+        in {
+            instructor.Mode.ANTHROPIC_JSON,
+            instructor.Mode.ANTHROPIC_TOOLS,
+        }
+    ), "Mode be one of {instructor.Mode.ANTHROPIC_JSON, instructor.Mode.ANTHROPIC_TOOLS}"
 
     assert isinstance(
         client, (anthropic.Anthropic, anthropic.AsyncAnthropic)

instructor/function_calls.py

@@ -128,12 +128,15 @@ def parse_anthropic_tools(
     @classmethod
     def parse_anthropic_json(
         cls: Type[BaseModel],
-        completion: ChatCompletion,
+        completion,
         validation_context: Optional[Dict[str, Any]] = None,
         strict: Optional[bool] = None,
     ) -> BaseModel:
-        assert hasattr(completion, "content")
-        text = completion.content[0].text  # type: ignore
+        from anthropic.types import Message
+
+        assert isinstance(completion, Message)
+
+        text = completion.content[0].text
         extra_text = extract_json_from_codeblock(text)
         return cls.model_validate_json(
             extra_text, context=validation_context, strict=strict

instructor/process_response.py

@@ -7,7 +7,7 @@
 from instructor.dsl.partial import PartialBase
 from instructor.dsl.simple_type import AdapterBase, ModelAdapter, is_simple_type
 from instructor.function_calls import OpenAISchema, openai_schema
-
+from instructor.utils import merge_consecutive_messages
 from openai.types.chat import ChatCompletion
 from pydantic import BaseModel
 
@@ -333,6 +333,11 @@ def handle_response_model(
                 for message in new_kwargs.get("messages", [])
                 if message["role"] != "system"
             ]
+
+            # the messages array must be alternating roles of user and assistant, we must merge
+            # consecutive user messages into a single message
+            new_kwargs["messages"] = merge_consecutive_messages(new_kwargs["messages"])
+
         else:
             raise ValueError(f"Invalid patch mode: {mode}")
 

instructor/retry.py

@@ -4,7 +4,11 @@
 from openai.types.chat import ChatCompletion
 from instructor.mode import Mode
 from instructor.process_response import process_response, process_response_async
-from instructor.utils import dump_message, update_total_usage
+from instructor.utils import (
+    dump_message,
+    update_total_usage,
+    merge_consecutive_messages,
+)
 
 from openai.types.completion_usage import CompletionUsage
 from pydantic import ValidationError
@@ -26,9 +30,18 @@
 def reask_messages(response: ChatCompletion, mode: Mode, exception: Exception):
     if mode == Mode.ANTHROPIC_TOOLS:
         # TODO: we need to include the original response
+        yield {
+            "role": "assistant",
+            "content": f"Validation Errors found:\n{exception}\nRecall the function correctly, fix the errors",
+        }
+        return
+    if mode == Mode.ANTHROPIC_JSON:
+        from anthropic.types import Message
+
+        assert isinstance(response, Message)
         yield {
             "role": "user",
-            "content": f"Validation Error found:\n{exception}\nRecall the function correctly, fix the errors",
+            "content": f"""Validation Errors found:\n{exception}\nRecall the function correctly, fix the errors found in the following attempt:\n{response.content[0].text}""",
         }
         return
 
@@ -94,6 +107,7 @@ def retry_sync(
                 except (ValidationError, JSONDecodeError) as e:
                     logger.debug(f"Error response: {response}")
                     kwargs["messages"].extend(reask_messages(response, mode, e))
+                    kwargs["messages"] = merge_consecutive_messages(kwargs["messages"])
                     raise e
     except RetryError as e:
         logger.exception(f"Failed after retries: {e.last_attempt.exception}")

instructor/utils.py

@@ -120,3 +120,15 @@ def is_async(func: Callable) -> bool:
         func = func.__wrapped__
         is_coroutine = is_coroutine or inspect.iscoroutinefunction(func)
     return is_coroutine
+
+
+def merge_consecutive_messages(messages: list[dict]) -> list[dict]:
+    # merge all consecutive user messages into a single message
+    new_messages = []
+    for message in messages:
+        if len(new_messages) > 0 and message["role"] == new_messages[-1]["role"]:
+            new_messages[-1]["content"] += f"\n\n{message['content']}"
+        else:
+            new_messages.append(message)
+
+    return new_messages

tests/llm/test_anthropic/evals/test_simple.py

@@ -1,11 +1,11 @@
 import anthropic
 import instructor
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 from typing import List, Literal
 from enum import Enum
 
-create = instructor.patch(
-    create=anthropic.Anthropic().messages.create, mode=instructor.Mode.ANTHROPIC_JSON
+client = instructor.from_anthropic(
+    anthropic.Anthropic(), mode=instructor.Mode.ANTHROPIC_JSON
 )
 
 
@@ -14,10 +14,15 @@ class User(BaseModel):
         name: str
         age: int
 
-    resp = create(
+        @field_validator("name")
+        def name_is_uppercase(cls, v: str):
+            assert v.isupper(), "Name must be uppercase"
+            return v
+
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
-        max_retries=0,
+        max_retries=2,
         messages=[
             {
                 "role": "user",
@@ -28,7 +33,7 @@ class User(BaseModel):
     )  # type: ignore
 
     assert isinstance(resp, User)
-    assert resp.name == "John"
+    assert resp.name == "JOHN"  # due to validation
     assert resp.age == 18
 
 
@@ -42,7 +47,7 @@ class User(BaseModel):
         age: int
         address: Address
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
         max_retries=0,
@@ -70,7 +75,7 @@ class User(BaseModel):
         age: int
         family: List[str]
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
         max_retries=0,
@@ -98,7 +103,7 @@ class User(BaseModel):
         name: str
         role: Role
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
         max_retries=0,
@@ -120,10 +125,10 @@ class User(BaseModel):
         name: str
         role: Literal["admin", "user"]
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
-        max_retries=0,
+        max_retries=2,
         messages=[
             {
                 "role": "user",
@@ -147,7 +152,7 @@ class User(BaseModel):
         age: int
         properties: List[Properties]
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
         max_retries=0,
@@ -170,7 +175,7 @@ class User(BaseModel):
         name: str
         age: int
 
-    resp = create(
+    resp = client.messages.create(
         model="claude-3-haiku-20240307",
         max_tokens=1024,
         max_retries=0,

tests/test_utils.py

@@ -4,6 +4,7 @@
     extract_json_from_codeblock,
     extract_json_from_stream,
     extract_json_from_stream_async,
+    merge_consecutive_messages,
 )
 
 
@@ -125,3 +126,35 @@ async def batch_strings_async(chunks, n=2):
         "key": "value",
         "another_key": [{"key": {"key": "value"}}, {"key": "value"}],
     }
+
+
+def test_merge_consecutive_messages():
+    messages = [
+        {"role": "user", "content": "Hello"},
+        {"role": "user", "content": "How are you"},
+        {"role": "assistant", "content": "Hello"},
+        {"role": "assistant", "content": "I am good"},
+    ]
+    result = merge_consecutive_messages(messages)
+    assert result == [
+        {"role": "user", "content": "Hello\n\nHow are you"},
+        {"role": "assistant", "content": "Hello\n\nI am good"},
+    ]
+
+
+def test_merge_consecutive_messages_empty():
+    messages = []
+    result = merge_consecutive_messages(messages)
+    assert result == []
+
+
+def test_merge_consecutive_messages_single():
+    messages = [
+        {"role": "user", "content": "Hello"},
+        {"role": "assistant", "content": "Hello"},
+    ]
+    result = merge_consecutive_messages(messages)
+    assert result == [
+        {"role": "user", "content": "Hello"},
+        {"role": "assistant", "content": "Hello"},
+    ]