Merge pull request #732 from RockChinQ/feat/claude-3

Feat: 接入 claude 3 系列模型

pkg/core/bootutils/deps.py

@@ -3,6 +3,7 @@ import pip
 required_deps = {
     "requests": "requests",
     "openai": "openai",
+    "anthropic": "anthropic",
     "colorlog": "colorlog",
     "mirai": "yiri-mirai-rc",
     "aiocqhttp": "aiocqhttp",

pkg/provider/modelmgr/apis/anthropicmsgs.py

@@ -0,0 +1,82 @@
+from __future__ import annotations
+
+import typing
+import traceback
+
+import anthropic
+
+from .. import api, entities, errors
+
+from .. import api, entities, errors
+from ....core import entities as core_entities
+from ... import entities as llm_entities
+from ...tools import entities as tools_entities
+
+
+@api.requester_class("anthropic-messages")
+class AnthropicMessages(api.LLMAPIRequester):
+    """Anthropic Messages API 请求器"""
+
+    client: anthropic.AsyncAnthropic
+
+    async def initialize(self):
+        self.client = anthropic.AsyncAnthropic(
+            api_key="",
+            base_url=self.ap.provider_cfg.data['requester']['anthropic-messages']['base-url'],
+            timeout=self.ap.provider_cfg.data['requester']['anthropic-messages']['timeout'],
+            proxies=self.ap.proxy_mgr.get_forward_proxies()
+        )
+
+    async def request(
+        self,
+        query: core_entities.Query,
+    ) -> typing.AsyncGenerator[llm_entities.Message, None]:
+        self.client.api_key = query.use_model.token_mgr.get_token()
+
+        args = self.ap.provider_cfg.data['requester']['anthropic-messages']['args'].copy()
+        args["model"] = query.use_model.name if query.use_model.model_name is None else query.use_model.model_name
+
+        req_messages = [  # req_messages 仅用于类内，外部同步由 query.messages 进行
+            m.dict(exclude_none=True) for m in query.prompt.messages
+        ] + [m.dict(exclude_none=True) for m in query.messages]
+
+        # 删除所有 role=system & content='' 的消息
+        req_messages = [
+            m for m in req_messages if not (m["role"] == "system" and m["content"].strip() == "")
+        ]
+
+        # 检查是否有 role=system 的消息，若有，改为 role=user，并在后面加一个 role=assistant 的消息
+        system_role_index = []
+        for i, m in enumerate(req_messages):
+            if m["role"] == "system":
+                system_role_index.append(i)
+                m["role"] = "user"
+
+        if system_role_index:
+            for i in system_role_index[::-1]:
+                req_messages.insert(i + 1, {"role": "assistant", "content": "Okay, I'll follow."})
+
+        # 忽略掉空消息，用户可能发送空消息，而上层未过滤
+        req_messages = [
+            m for m in req_messages if m["content"].strip() != ""
+        ]
+
+        args["messages"] = req_messages
+
+        try:
+
+            resp = await self.client.messages.create(**args)
+
+            yield llm_entities.Message(
+                content=resp.content[0].text,
+                role=resp.role
+            )
+        except anthropic.AuthenticationError as e:
+            raise errors.RequesterError(f'api-key 无效: {e.message}')
+        except anthropic.BadRequestError as e:
+            raise errors.RequesterError(str(e.message))
+        except anthropic.NotFoundError as e:
+            if 'model: ' in str(e):
+                raise errors.RequesterError(f'模型无效: {e.message}')
+            else:
+                raise errors.RequesterError(f'请求地址无效: {e.message}')

pkg/provider/modelmgr/apis/chatcmpl.py

@@ -9,8 +9,6 @@ import openai
 import openai.types.chat.chat_completion as chat_completion
 import httpx
 
-from pkg.provider.entities import Message
-
 from .. import api, entities, errors
 from ....core import entities as core_entities
 from ... import entities as llm_entities
@@ -127,7 +125,7 @@ class OpenAIChatCompletions(api.LLMAPIRequester):
 
             req_messages.append(msg.dict(exclude_none=True))
 
-    async def request(self, query: core_entities.Query) -> AsyncGenerator[Message, None]:
+    async def request(self, query: core_entities.Query) -> AsyncGenerator[llm_entities.Message, None]:
         try:
             async for msg in self._request(query):
                 yield msg

pkg/provider/modelmgr/errors.py

@@ -2,4 +2,4 @@ class RequesterError(Exception):
     """Base class for all Requester errors."""
 
     def __init__(self, message: str):
-        super().__init__("模型请求失败: "+message)
+        super().__init__("模型请求失败: "+message)

pkg/provider/modelmgr/modelmgr.py

@@ -6,7 +6,7 @@ from . import entities
 from ...core import app
 
 from . import token, api
-from .apis import chatcmpl
+from .apis import chatcmpl, anthropicmsgs
 
 FETCH_MODEL_LIST_URL = "https://api.qchatgpt.rockchin.top/api/v2/fetch/model_list"
 

requirements.txt

@@ -1,5 +1,6 @@
 requests
 openai>1.0.0
+anthropic
 colorlog~=6.6.0
 yiri-mirai-rc
 aiocqhttp

templates/metadata/llm-models.json

@@ -29,6 +29,21 @@
         {
             "model_name": "gemini-pro",
             "name": "OneAPI/gemini-pro"
+        },
+        {
+            "name": "claude-3-opus-20240229",
+            "requester": "anthropic-messages",
+            "token_mgr": "anthropic"
+        },
+        {
+            "name": "claude-3-sonnet-20240229",
+            "requester": "anthropic-messages",
+            "token_mgr": "anthropic"
+        },
+        {
+            "name": "claude-3-haiku-20240307",
+            "requester": "anthropic-messages",
+            "token_mgr": "anthropic"
         }
     ]
 }

templates/provider.json

@@ -3,6 +3,9 @@
     "keys": {
         "openai": [
             "sk-1234567890"
+        ],
+        "anthropic": [
+            "sk-1234567890"
         ]
     },
     "requester": {
@@ -10,6 +13,13 @@
             "base-url": "https://api.openai.com/v1",
             "args": {},
             "timeout": 120
+        },
+        "anthropic-messages": {
+            "base-url": "https://api.anthropic.com/v1",
+            "args": {
+                "max_tokens": 1024
+            },
+            "timeout": 120
         }
     },
     "model": "gpt-3.5-turbo",