Update Anthropic assistants

docs/examples/gallery_streaming.py

@@ -28,7 +28,6 @@
 #
 #     - [Anthropic](https://www.anthropic.com/)
 #       - [ragna.assistants.Claude][]
-#       - [ragna.assistants.ClaudeInstant][]
 #     - [Cohere](https://cohere.com/)
 #       - [ragna.assistants.Command][]
 #       - [ragna.assistants.CommandLight][]

docs/tutorials/gallery_python_api.py

@@ -76,7 +76,6 @@
 #
 #     - [Anthropic](https://www.anthropic.com/)
 #       - [ragna.assistants.Claude][]
-#       - [ragna.assistants.ClaudeInstant][]
 #     - [Cohere](https://cohere.com/)
 #       - [ragna.assistants.Command][]
 #       - [ragna.assistants.CommandLight][]

ragna/assistants/__init__.py

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

ragna/assistants/_anthropic.py

@@ -18,26 +18,27 @@ 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
         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"
+            "Use the following documents to answer the prompt. "
+            "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:"
+        return instruction
 
     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 +47,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,29 +63,15 @@ 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["completion"])
-
-
-class ClaudeInstant(AnthropicApiAssistant):
-    """[Claude Instant](https://docs.anthropic.com/claude/reference/selecting-a-model)
-
-    !!! info "Required environment variables"
-
-        - `ANTHROPIC_API_KEY`
-
-    !!! info "Required packages"
-
-        - `httpx_sse`
-    """
-
-    _MODEL = "claude-instant-1"
+                yield cast(str, data["delta"].pop("text"))
 
 
 class Claude(AnthropicApiAssistant):
@@ -93,4 +86,4 @@ class Claude(AnthropicApiAssistant):
         - `httpx_sse`
     """
 
-    _MODEL = "claude-2"
+    _MODEL = "claude-3-opus-20240229"