Skip to content

Commit

Permalink
Merge pull request #1388 from resphinas/claude_bot
Browse files Browse the repository at this point in the history
实现claude对接配置中的 共享上下文开关
  • Loading branch information
zhayujie authored Sep 1, 2023
2 parents 054f927 + 4167f13 commit ffbc508
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 17 deletions.
25 changes: 23 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
最新版本支持的功能如下:

- [x] **多端部署:** 有多种部署方式可选择且功能完备,目前已支持个人微信,微信公众号和企业微信应用等部署方式
- [x] **基础对话:** 私聊及群聊的消息智能回复,支持多轮会话上下文记忆,支持 GPT-3, GPT-3.5, GPT-4, 文心一言, 讯飞星火
- [x] **基础对话:** 私聊及群聊的消息智能回复,支持多轮会话上下文记忆,支持 GPT-3, GPT-3.5, GPT-4, claude, 文心一言, 讯飞星火
- [x] **语音识别:** 可识别语音消息,通过文字或语音回复,支持 azure, baidu, google, openai等多种语音模型
- [x] **图片生成:** 支持图片生成 和 图生图(如照片修复),可选择 Dell-E, stable diffusion, replicate, midjourney模型
- [x] **丰富插件:** 支持个性化插件扩展,已实现多角色切换、文字冒险、敏感词过滤、聊天记录总结等插件
Expand All @@ -27,6 +27,7 @@ Demo made by [Visionn](https://www.wangpc.cc/)
<img width="240" src="./docs/images/contact.jpg">

# 更新日志
>**2023.09.01:** 接入讯飞星火,claude机器人
>**2023.08.08:** 接入百度文心一言模型,通过 [插件](https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins/linkai) 支持 Midjourney 绘图
Expand Down Expand Up @@ -157,7 +158,7 @@ pip3 install azure-cognitiveservices-speech

**4.其他配置**

+ `model`: 模型名称,目前支持 `gpt-3.5-turbo`, `text-davinci-003`, `gpt-4`, `gpt-4-32k`, `wenxin` (其中gpt-4 api暂未完全开放,申请通过后可使用)
+ `model`: 模型名称,目前支持 `gpt-3.5-turbo`, `text-davinci-003`, `gpt-4`, `gpt-4-32k`, `wenxin` , `claude` , `xunfei`(其中gpt-4 api暂未完全开放,申请通过后可使用)
+ `temperature`,`frequency_penalty`,`presence_penalty`: Chat API接口参数,详情参考[OpenAI官方文档。](https://platform.openai.com/docs/api-reference/chat)
+ `proxy`:由于目前 `openai` 接口国内无法访问,需配置代理客户端的地址,详情参考 [#351](https://github.com/zhayujie/chatgpt-on-wechat/issues/351)
+ 对于图像生成,在满足个人或群组触发条件外,还需要额外的关键词前缀来触发,对应配置 `image_create_prefix `
Expand All @@ -175,6 +176,26 @@ pip3 install azure-cognitiveservices-speech
+ `linkai_api_key`: LinkAI Api Key,可在 [控制台](https://chat.link-ai.tech/console/interface) 创建
+ `linkai_app_code`: LinkAI 应用code,选填

**6.wenxin配置 (可选 model 为 wenxin 时生效)**

+ `baidu_wenxin_api_key`: 文心一言官网api key。
+ `baidu_wenxin_secret_key`: 文心一言官网secret key。


**6.Claude配置 (可选 model 为 claude 时生效)**

+ `claude_api_cookie`: claude官网聊天界面复制完整 cookie 字符串。
+ `claude_uuid`: 可以指定对话id,默认新建对话实体。


**7.xunfei配置 (可选 model 为 xunfei 时生效)**

+ `xunfei_app_id`: 讯飞星火app id。
+ `xunfei_api_key`: 讯飞星火 api key。
+ `xunfei_api_secret`: 讯飞星火 secret。



**本说明文档可能会未及时更新,当前所有可选的配置项均在该[`config.py`](https://github.com/zhayujie/chatgpt-on-wechat/blob/master/config.py)中列出。**

## 运行
Expand Down
35 changes: 20 additions & 15 deletions bot/claude/claude_ai_bot.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import uuid
from curl_cffi import requests
from bot.bot import Bot
from bot.chatgpt.chat_gpt_session import ChatGPTSession
from bot.claude.claude_ai_session import ClaudeAiSession
from bot.openai.open_ai_image import OpenAIImage
from bot.session_manager import SessionManager
from bridge.context import Context, ContextType
Expand All @@ -16,9 +16,10 @@
class ClaudeAIBot(Bot, OpenAIImage):
def __init__(self):
super().__init__()
self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo")
self.sessions = SessionManager(ClaudeAiSession, model=conf().get("model") or "gpt-3.5-turbo")
self.claude_api_cookie = conf().get("claude_api_cookie")
self.proxy = conf().get("proxy")
self.con_uuid_dic = {}
if self.proxy:
self.proxies = {
"http": self.proxy,
Expand All @@ -27,8 +28,6 @@ def __init__(self):
else:
self.proxies = None
self.org_uuid = self.get_organization_id()
self.con_uuid = None
self.get_uuid()

def generate_uuid(self):
random_uuid = uuid.uuid4()
Expand All @@ -40,8 +39,8 @@ def get_uuid(self):
if conf().get("claude_uuid") != None:
self.con_uuid = conf().get("claude_uuid")
else:
self.con_uuid = self.generate_uuid()
self.create_new_chat()
con_uuid = self.generate_uuid()
self.create_new_chat(con_uuid)

def get_organization_id(self):
url = "https://claude.ai/api/organizations"
Expand Down Expand Up @@ -78,7 +77,6 @@ def reply(self, query, context: Context = None) -> Reply:

def get_organization_id(self):
url = "https://claude.ai/api/organizations"

headers = {
'User-Agent':
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0',
Expand All @@ -97,12 +95,17 @@ def get_organization_id(self):
uuid = res[0]['uuid']
except:
print(response.text)

return uuid

def create_new_chat(self):

def conversation_share_check(self,session_id):
if session_id not in self.con_uuid_dic:
self.con_uuid_dic[session_id] = self.generate_uuid()
self.create_new_chat(self.con_uuid_dic[session_id])
return self.con_uuid_dic[session_id]

def create_new_chat(self, con_uuid):
url = f"https://claude.ai/api/organizations/{self.org_uuid}/chat_conversations"
payload = json.dumps({"uuid": self.con_uuid, "name": ""})
payload = json.dumps({"uuid": con_uuid, "name": ""})
headers = {
'User-Agent':
'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/115.0',
Expand All @@ -118,7 +121,7 @@ def create_new_chat(self):
'Sec-Fetch-Site': 'same-origin',
'TE': 'trailers'
}
response = requests.post( url, headers=headers, data=payload,impersonate="chrome110", proxies= self.proxies)
response = requests.post(url, headers=headers, data=payload,impersonate="chrome110", proxies= self.proxies)
# Returns JSON of the newly created conversation information
return response.json()

Expand All @@ -138,6 +141,7 @@ def _chat(self, query, context, retry_count=0) -> Reply:
try:
session_id = context["session_id"]
session = self.sessions.session_query(query, session_id)
con_uuid = self.conversation_share_check(session_id)
model = conf().get("model") or "gpt-3.5-turbo"
# remove system message
if session.messages[0].get("role") == "system":
Expand All @@ -154,7 +158,7 @@ def _chat(self, query, context, retry_count=0) -> Reply:
"model": "claude-2"
},
"organization_uuid": f"{self.org_uuid}",
"conversation_uuid": f"{self.con_uuid}",
"conversation_uuid": f"{con_uuid}",
"text": f"{query}",
"attachments": []
})
Expand Down Expand Up @@ -190,13 +194,14 @@ def _chat(self, query, context, retry_count=0) -> Reply:

reply_content = ''.join(completions)
logger.info(f"[CLAUDE] reply={reply_content}, total_tokens=invisible")

self.sessions.session_reply(reply_content, session_id, 100)
return Reply(ReplyType.TEXT, reply_content)
else:
response = res.json()
error = response.get("error")
logger.error(f"[CLAUDE] chat failed, status_code={res.status_code}, "
f"msg={error.get('message')}, type={error.get('type')}, detail: {res.text}, uuid: {self.con_uuid}")
f"msg={error.get('message')}, type={error.get('type')}, detail: {res.text}, uuid: {con_uuid}")

if res.status_code >= 500:
# server error, need retry
Expand All @@ -210,4 +215,4 @@ def _chat(self, query, context, retry_count=0) -> Reply:
# retry
time.sleep(2)
logger.warn(f"[CLAUDE] do retry, times={retry_count}")
return self._chat(query, context, retry_count + 1)
return self._chat(query, context, retry_count + 1)
9 changes: 9 additions & 0 deletions bot/claude/claude_ai_session
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from bot.session_manager import Session


class ClaudeAiSession(Session):
def __init__(self, session_id, system_prompt=None, model="claude"):
super().__init__(session_id, system_prompt)
self.model = model
# claude逆向不支持role prompt
# self.reset()

0 comments on commit ffbc508

Please sign in to comment.