Update Anthropic assistants

docs/examples/gallery_streaming.py

@@ -27,8 +27,9 @@
 #     Of the assistants that Ragna has built in, the following ones support streaming:
 #
 #     - [Anthropic](https://www.anthropic.com/)
-#       - [ragna.assistants.Claude][]
-#       - [ragna.assistants.ClaudeInstant][]
+#       - [ragna.assistants.ClaudeOpus][]
+#       - [ragna.assistants.ClaudeSonnet][]
+#       - [ragna.assistants.ClaudeHaiku][]
 #     - [Cohere](https://cohere.com/)
 #       - [ragna.assistants.Command][]
 #       - [ragna.assistants.CommandLight][]

docs/tutorials/gallery_python_api.py

@@ -75,8 +75,9 @@
 #     Ragna has builtin support for the following assistants:
 #
 #     - [Anthropic](https://www.anthropic.com/)
-#       - [ragna.assistants.Claude][]
-#       - [ragna.assistants.ClaudeInstant][]
+#       - [ragna.assistants.ClaudeOpus][]
+#       - [ragna.assistants.ClaudeSonnet][]
+#       - [ragna.assistants.ClaudeHaiku][]
 #     - [Cohere](https://cohere.com/)
 #       - [ragna.assistants.Command][]
 #       - [ragna.assistants.CommandLight][]

ragna/assistants/__init__.py

@@ -1,6 +1,7 @@
 __all__ = [
-    "Claude",
-    "ClaudeInstant",
+    "ClaudeHaiku",
+    "ClaudeOpus",
+    "ClaudeSonnet",
     "Command",
     "CommandLight",
     "GeminiPro",
@@ -14,7 +15,7 @@
 ]
 
 from ._ai21labs import Jurassic2Ultra
-from ._anthropic import Claude, ClaudeInstant
+from ._anthropic import ClaudeHaiku, ClaudeOpus, ClaudeSonnet
 from ._cohere import Command, CommandLight
 from ._demo import RagnaDemoAssistant
 from ._google import GeminiPro, GeminiUltra

ragna/assistants/_anthropic.py

@@ -1,5 +1,6 @@
 import json
 from typing import AsyncIterator, cast
+from xml.etree import ElementTree
 
 from ragna.core import PackageRequirement, RagnaException, Requirement, Source
 
@@ -18,26 +19,38 @@ def _extra_requirements(cls) -> list[Requirement]:
     def display_name(cls) -> str:
         return f"Anthropic/{cls._MODEL}"
 
-    def _instructize_prompt(self, prompt: str, sources: list[Source]) -> str:
-        # See https://docs.anthropic.com/claude/docs/introduction-to-prompt-design#human--assistant-formatting
+    def _instructize_system_prompt(self, sources: list[Source]) -> str:
+        # See https://docs.anthropic.com/claude/docs/system-prompts
+        # See https://docs.anthropic.com/claude/docs/long-context-window-tips#tips-for-document-qa
         instruction = (
-            "\n\nHuman: "
-            "Use the following pieces of context to answer the question at the end. "
-            "If you don't know the answer, just say so. Don't try to make up an answer.\n"
+            "I'm going to give you a document."
+            "Read the document carefully, because I'm going to ask you a question about it."
+            "If you don't know the answer, just say so. Don't try to make up an answer."
+            "Only use the included documents below to generate the answer.\n"
         )
-        instruction += "\n\n".join(source.content for source in sources)
-        return f"{instruction}\n\nQuestion: {prompt}\n\nAssistant:"
+        # See https://docs.anthropic.com/claude/docs/long-context-window-tips#structuring-long-documents
+        documents = ElementTree.Element("documents")
+        for idx, source in enumerate(sources, start=1):
+            doc_elmnt = ElementTree.SubElement(
+                documents,
+                "document",
+                attrib={"index": str(idx)},
+            )
+            ElementTree.SubElement(doc_elmnt, "id").text = source.id
+            ElementTree.SubElement(doc_elmnt, "document_content").text = source.content
+        return instruction + ElementTree.tostring(documents, encoding="unicode")
 
     async def _call_api(
         self, prompt: str, sources: list[Source], *, max_new_tokens: int
     ) -> AsyncIterator[str]:
         import httpx_sse
 
+        # See https://docs.anthropic.com/claude/reference/messages_post
         # See https://docs.anthropic.com/claude/reference/streaming
         async with httpx_sse.aconnect_sse(
             self._client,
             "POST",
-            "https://api.anthropic.com/v1/complete",
+            "https://api.anthropic.com/v1/messages",
             headers={
                 "accept": "application/json",
                 "anthropic-version": "2023-06-01",
@@ -46,8 +59,14 @@ async def _call_api(
             },
             json={
                 "model": self._MODEL,
-                "prompt": self._instructize_prompt(prompt, sources),
-                "max_tokens_to_sample": max_new_tokens,
+                "system": self._instructize_system_prompt(sources),
+                "messages": [
+                    {
+                        "role": "user",
+                        "content": prompt,
+                    }
+                ],
+                "max_tokens": max_new_tokens,
                 "temperature": 0.0,
                 "stream": True,
             },
@@ -56,18 +75,34 @@ async def _call_api(
 
             async for sse in event_source.aiter_sse():
                 data = json.loads(sse.data)
-                if data["type"] != "completion":
-                    continue
-                elif "error" in data:
+                # See https://docs.anthropic.com/claude/reference/messages-streaming#raw-http-stream-response
+                if "error" in data:
                     raise RagnaException(data["error"].pop("message"), **data["error"])
-                elif data["stop_reason"] is not None:
+                elif data["type"] == "message_stop":
                     break
+                elif data["type"] != "content_block_delta":
+                    continue
+
+                yield cast(str, data["delta"].pop("text"))
+
+
+class ClaudeOpus(AnthropicApiAssistant):
+    """[Claude 3 Opus](https://docs.anthropic.com/claude/docs/models-overview)
+
+    !!! info "Required environment variables"
+
+        - `ANTHROPIC_API_KEY`
+
+    !!! info "Required packages"
+
+        - `httpx_sse`
+    """
 
-                yield cast(str, data["completion"])
+    _MODEL = "claude-3-opus-20240229"
 
 
-class ClaudeInstant(AnthropicApiAssistant):
-    """[Claude Instant](https://docs.anthropic.com/claude/reference/selecting-a-model)
+class ClaudeSonnet(AnthropicApiAssistant):
+    """[Claude 3 Sonnet](https://docs.anthropic.com/claude/docs/models-overview)
 
     !!! info "Required environment variables"
 
@@ -78,11 +113,11 @@ class ClaudeInstant(AnthropicApiAssistant):
         - `httpx_sse`
     """
 
-    _MODEL = "claude-instant-1"
+    _MODEL = "claude-3-sonnet-20240229"
 
 
-class Claude(AnthropicApiAssistant):
-    """[Claude](https://docs.anthropic.com/claude/reference/selecting-a-model)
+class ClaudeHaiku(AnthropicApiAssistant):
+    """[Claude 3 Haiku](https://docs.anthropic.com/claude/docs/models-overview)
 
     !!! info "Required environment variables"
 
@@ -93,4 +128,4 @@ class Claude(AnthropicApiAssistant):
         - `httpx_sse`
     """
 
-    _MODEL = "claude-2"
+    _MODEL = "claude-3-haiku-20240307"