From 53b2deb72caa35dd6ba9b19c06c41f538f0da6e7 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:38:58 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=99=A8?=
=?UTF-8?q?=E4=BA=BA=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?=
=?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 934a944..352296d 100644
--- a/README.md
+++ b/README.md
@@ -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] **丰富插件：** 支持个性化插件扩展，已实现多角色切换、文字冒险、敏感词过滤、聊天记录总结等插件
@@ -27,6 +27,7 @@ Demo made by [Visionn](https://www.wangpc.cc/)
# 更新日志
+>**2023.09.01：** 接入讯飞星火，Claude机器人
>**2023.08.08：** 接入百度文心一言模型，通过 [插件](https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins/linkai) 支持 Midjourney 绘图
@@ -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 `
@@ -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)中列出。**
## 运行
From 22210747d074df3d8fd8e4d8a85943c4da009364 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:40:09 +0800
Subject: [PATCH 2/9] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 352296d..5a95a57 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
最新版本支持的功能如下：
- [x] **多端部署：** 有多种部署方式可选择且功能完备，目前已支持个人微信，微信公众号和企业微信应用等部署方式
-- [x] **基础对话：** 私聊及群聊的消息智能回复，支持多轮会话上下文记忆，支持 GPT-3, GPT-3.5, GPT-4, Claude, 文心一言, 讯飞星火
+- [x] **基础对话：** 私聊及群聊的消息智能回复，支持多轮会话上下文记忆，支持 GPT-3, GPT-3.5, GPT-4, claude, 文心一言, 讯飞星火
- [x] **语音识别：** 可识别语音消息，通过文字或语音回复，支持 azure, baidu, google, openai等多种语音模型
- [x] **图片生成：** 支持图片生成 和 图生图（如照片修复），可选择 Dell-E, stable diffusion, replicate, midjourney模型
- [x] **丰富插件：** 支持个性化插件扩展，已实现多角色切换、文字冒险、敏感词过滤、聊天记录总结等插件
@@ -27,7 +27,7 @@ Demo made by [Visionn](https://www.wangpc.cc/)
# 更新日志
->**2023.09.01：** 接入讯飞星火，Claude机器人
+>**2023.09.01：** 接入讯飞星火，claude机器人
>**2023.08.08：** 接入百度文心一言模型，通过 [插件](https://github.com/zhayujie/chatgpt-on-wechat/tree/master/plugins/linkai) 支持 Midjourney 绘图
From 9a1e10deff67008323d4f103de38e63856253258 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:30:31 +0800
Subject: [PATCH 3/9] Create claude_ai_session
---
bot/claude/claude_ai_session | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 bot/claude/claude_ai_session
diff --git a/bot/claude/claude_ai_session b/bot/claude/claude_ai_session
new file mode 100644
index 0000000..ede9e51
--- /dev/null
+++ b/bot/claude/claude_ai_session
@@ -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()
From 503c6c9b7eab71f5cceec0d34d5497dd755fdab0 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:31:30 +0800
Subject: [PATCH 4/9] Update claude_ai_bot.py
---
bot/claude/claude_ai_bot.py | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/bot/claude/claude_ai_bot.py b/bot/claude/claude_ai_bot.py
index 24ff11f..9d97624 100644
--- a/bot/claude/claude_ai_bot.py
+++ b/bot/claude/claude_ai_bot.py
@@ -4,7 +4,7 @@ import json
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
@@ -16,9 +16,10 @@ from config import conf
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,
@@ -27,8 +28,6 @@ class ClaudeAIBot(Bot, OpenAIImage):
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()
@@ -40,8 +39,9 @@ class ClaudeAIBot(Bot, OpenAIImage):
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"
@@ -99,10 +99,16 @@ class ClaudeAIBot(Bot, OpenAIImage):
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',
@@ -118,7 +124,7 @@ class ClaudeAIBot(Bot, OpenAIImage):
'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()
@@ -138,6 +144,8 @@ class ClaudeAIBot(Bot, OpenAIImage):
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":
@@ -154,7 +162,7 @@ class ClaudeAIBot(Bot, OpenAIImage):
"model": "claude-2"
},
"organization_uuid": f"{self.org_uuid}",
- "conversation_uuid": f"{self.con_uuid}",
+ "conversation_uuid": f"{con_uuid}",
"text": f"{query}",
"attachments": []
})
@@ -190,13 +198,14 @@ class ClaudeAIBot(Bot, OpenAIImage):
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
@@ -210,4 +219,4 @@ class ClaudeAIBot(Bot, OpenAIImage):
# retry
time.sleep(2)
logger.warn(f"[CLAUDE] do retry, times={retry_count}")
- return self._chat(query, context, retry_count + 1)
\ No newline at end of file
+ return self._chat(query, context, retry_count + 1)
From 97a26d4a46ed3c42774daaaf275346096c96d69a Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:53:21 +0800
Subject: [PATCH 5/9] Update README.md
---
README.md | 1 -
1 file changed, 1 deletion(-)
diff --git a/README.md b/README.md
index 5a95a57..d11714a 100644
--- a/README.md
+++ b/README.md
@@ -185,7 +185,6 @@ pip3 install azure-cognitiveservices-speech
**6.Claude配置 (可选 model 为 claude 时生效)**
+ `claude_api_cookie`: claude官网聊天界面复制完整 cookie 字符串。
-+ `claude_uuid`: 可以指定对话id，默认新建对话实体。
**7.xunfei配置 (可选 model 为 xunfei 时生效)**
From 559194ffb22d381951af1b078a78c039906f59c8 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:54:03 +0800
Subject: [PATCH 6/9] Update config.py
---
config.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/config.py b/config.py
index 276eb22..622e159 100644
--- a/config.py
+++ b/config.py
@@ -124,8 +124,7 @@ available_setting = {
# wework的通用配置
"wework_smart": True # 配置wework是否使用已登录的企业微信，False为多开
#claude 配置
- "claude_api_cookie":"",
- "claude_uuid":""
+ "claude_api_cookie":""
}
From 081003df471d01c5bea38481e56e3b4476bf299d Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 17:55:09 +0800
Subject: [PATCH 7/9] Update config.py
---
config.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/config.py b/config.py
index 622e159..276eb22 100644
--- a/config.py
+++ b/config.py
@@ -124,7 +124,8 @@ available_setting = {
# wework的通用配置
"wework_smart": True # 配置wework是否使用已登录的企业微信，False为多开
#claude 配置
- "claude_api_cookie":""
+ "claude_api_cookie":"",
+ "claude_uuid":""
}
From 6ba0baabb0c2024379b7d114843a8a22d84d1b51 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:04:39 +0800
Subject: [PATCH 8/9] Update claude_ai_bot.py
---
bot/claude/claude_ai_bot.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/bot/claude/claude_ai_bot.py b/bot/claude/claude_ai_bot.py
index 9d97624..d273f2c 100644
--- a/bot/claude/claude_ai_bot.py
+++ b/bot/claude/claude_ai_bot.py
@@ -42,7 +42,6 @@ class ClaudeAIBot(Bot, OpenAIImage):
con_uuid = self.generate_uuid()
self.create_new_chat(con_uuid)
-
def get_organization_id(self):
url = "https://claude.ai/api/organizations"
headers = {
@@ -78,7 +77,6 @@ class ClaudeAIBot(Bot, OpenAIImage):
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',
@@ -97,7 +95,6 @@ class ClaudeAIBot(Bot, OpenAIImage):
uuid = res[0]['uuid']
except:
print(response.text)
-
return uuid
def conversation_share_check(self,session_id):
@@ -145,7 +142,6 @@ class ClaudeAIBot(Bot, OpenAIImage):
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":
From 4167f13bacea20d63868d0fb63585334e3b20533 Mon Sep 17 00:00:00 2001
From: resphina <69687075+resphinas@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:12:48 +0800
Subject: [PATCH 9/9] Update README.md
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index d11714a..5a95a57 100644
--- a/README.md
+++ b/README.md
@@ -185,6 +185,7 @@ pip3 install azure-cognitiveservices-speech
**6.Claude配置 (可选 model 为 claude 时生效)**
+ `claude_api_cookie`: claude官网聊天界面复制完整 cookie 字符串。
++ `claude_uuid`: 可以指定对话id，默认新建对话实体。
**7.xunfei配置 (可选 model 为 xunfei 时生效)**