From f7a6127f582a16036d56f0647aec6d99ea30ee9c Mon Sep 17 00:00:00 2001 From: okxlin Date: Wed, 19 Jun 2024 01:23:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96chatgpt-on-wechat?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/chatgpt-on-wechat/1.6.6/.env.sample | 6 ++++-- apps/chatgpt-on-wechat/1.6.6/data.yml | 25 ++++++++++++++++++----- apps/chatgpt-on-wechat/README.md | 2 ++ apps/chatgpt-on-wechat/latest/.env.sample | 6 ++++-- apps/chatgpt-on-wechat/latest/data.yml | 25 ++++++++++++++++++----- 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/apps/chatgpt-on-wechat/1.6.6/.env.sample b/apps/chatgpt-on-wechat/1.6.6/.env.sample index c5cfde7b..a0fe0c13 100644 --- a/apps/chatgpt-on-wechat/1.6.6/.env.sample +++ b/apps/chatgpt-on-wechat/1.6.6/.env.sample @@ -16,7 +16,7 @@ BAIDU_TRANSLATE_APP_KEY="" BAIDU_WENXIN_API_KEY="" BAIDU_WENXIN_MODEL="eb-instant" BAIDU_WENXIN_SECRET_KEY="" -CHANNEL_TYPE="" +CHANNEL_TYPE="wx" CHARACTER_DESC="你是ChatGPT, 一个由OpenAI训练的大型语言模型, 你旨在回答并解决人们的任何问题，并且可以使用多种语言与人交流。" CHAT_START_TIME="00:00" CHAT_STOP_TIME="24:00" @@ -28,6 +28,7 @@ CLEAR_MEMORY_COMMANDS="#清除记忆" CONCURRENCY_IN_SESSION=1 CONTAINER_NAME="chatgpt-on-wechat" CONVERSATION_MAX_TOKENS=1000 +CPUS=0 DALLE3_IMAGE_QUALITY="hd" DALLE3_IMAGE_STYLE="vivid" DASHSCOPE_API_KEY="" @@ -63,6 +64,7 @@ LINKAI_API_KEY="" LINKAI_APP_CODE="" MAX_MEDIA_SEND_COUNT=3 MEDIA_SEND_INTERVAL=1 +MEMORY_LIMIT=0 MODEL="gpt-3.5-turbo" MOONSHOT_API_KEY="" MOONSHOT_BASE_URL="https://api.moonshot.cn/v1/chat/completions" @@ -81,7 +83,7 @@ RATE_LIMIT_CHATGPT=20 RATE_LIMIT_DALLE=50 REQUEST_TIMEOUT=30 SINGLE_CHAT_PREFIX='["bot", "@bot"]' -SINGLE_CHAT_REPLY_PREFIX="[bot] " +SINGLE_CHAT_REPLY_PREFIX='[bot] ' SINGLE_CHAT_REPLY_SUFFIX="" SPEECH_RECOGNITION="true" SUBSCRIBE_MSG="" diff --git a/apps/chatgpt-on-wechat/1.6.6/data.yml b/apps/chatgpt-on-wechat/1.6.6/data.yml index 78cbb467..ff734def 100644 --- a/apps/chatgpt-on-wechat/1.6.6/data.yml +++ b/apps/chatgpt-on-wechat/1.6.6/data.yml @@ -66,7 +66,7 @@ additionalProperties: envKey: SINGLE_CHAT_REPLY_PREFIX labelEn: Single Chat Reply Prefix labelZh: 私聊回复前缀 - required: true + required: false type: text - default: "" edit: true @@ -80,7 +80,7 @@ additionalProperties: envKey: GROUP_CHAT_PREFIX labelEn: Group Chat Prefix labelZh: 群聊前缀 - required: true + required: false type: text - default: "" edit: true @@ -814,13 +814,28 @@ additionalProperties: labelZh: 清除记忆指令 required: false type: text - - default: "" + - default: "wx" edit: true envKey: CHANNEL_TYPE labelEn: Channel Type labelZh: 通道类型 - required: false - type: text + required: true + type: select + values: + - label: "wx" + value: "wx" + - label: "wxy" + value: "wxy" + - label: "terminal" + value: "terminal" + - label: "wechatmp" + value: "wechatmp" + - label: "wechatmp_service" + value: "wechatmp_service" + - label: "wechatcom_app" + value: "wechatcom_app" + - label: "dingtalk" + value: "dingtalk" - default: "" edit: true envKey: SUBSCRIBE_MSG diff --git a/apps/chatgpt-on-wechat/README.md b/apps/chatgpt-on-wechat/README.md index 07d75bae..c7a1d44b 100644 --- a/apps/chatgpt-on-wechat/README.md +++ b/apps/chatgpt-on-wechat/README.md @@ -20,9 +20,11 @@ chatgpt-on-wechat（简称CoW）项目是基于大模型的智能对话机器人 ``` GROUP_CHAT_IN_ONE_SESSION='["ChatGPT测试群"]' +GROUP_CHAT_PREFIX='["@bot"]' GROUP_NAME_WHITE_LIST='["ChatGPT测试群", "ChatGPT测试群2"]' IMAGE_CREATE_PREFIX='["画", "看", "找"]' SINGLE_CHAT_PREFIX='["bot", "@bot"]' +SINGLE_CHAT_REPLY_PREFIX='[bot] ' ``` 文件路径，按需修改 diff --git a/apps/chatgpt-on-wechat/latest/.env.sample b/apps/chatgpt-on-wechat/latest/.env.sample index c5cfde7b..a0fe0c13 100644 --- a/apps/chatgpt-on-wechat/latest/.env.sample +++ b/apps/chatgpt-on-wechat/latest/.env.sample @@ -16,7 +16,7 @@ BAIDU_TRANSLATE_APP_KEY="" BAIDU_WENXIN_API_KEY="" BAIDU_WENXIN_MODEL="eb-instant" BAIDU_WENXIN_SECRET_KEY="" -CHANNEL_TYPE="" +CHANNEL_TYPE="wx" CHARACTER_DESC="你是ChatGPT, 一个由OpenAI训练的大型语言模型, 你旨在回答并解决人们的任何问题，并且可以使用多种语言与人交流。" CHAT_START_TIME="00:00" CHAT_STOP_TIME="24:00" @@ -28,6 +28,7 @@ CLEAR_MEMORY_COMMANDS="#清除记忆" CONCURRENCY_IN_SESSION=1 CONTAINER_NAME="chatgpt-on-wechat" CONVERSATION_MAX_TOKENS=1000 +CPUS=0 DALLE3_IMAGE_QUALITY="hd" DALLE3_IMAGE_STYLE="vivid" DASHSCOPE_API_KEY="" @@ -63,6 +64,7 @@ LINKAI_API_KEY="" LINKAI_APP_CODE="" MAX_MEDIA_SEND_COUNT=3 MEDIA_SEND_INTERVAL=1 +MEMORY_LIMIT=0 MODEL="gpt-3.5-turbo" MOONSHOT_API_KEY="" MOONSHOT_BASE_URL="https://api.moonshot.cn/v1/chat/completions" @@ -81,7 +83,7 @@ RATE_LIMIT_CHATGPT=20 RATE_LIMIT_DALLE=50 REQUEST_TIMEOUT=30 SINGLE_CHAT_PREFIX='["bot", "@bot"]' -SINGLE_CHAT_REPLY_PREFIX="[bot] " +SINGLE_CHAT_REPLY_PREFIX='[bot] ' SINGLE_CHAT_REPLY_SUFFIX="" SPEECH_RECOGNITION="true" SUBSCRIBE_MSG="" diff --git a/apps/chatgpt-on-wechat/latest/data.yml b/apps/chatgpt-on-wechat/latest/data.yml index 78cbb467..ff734def 100644 --- a/apps/chatgpt-on-wechat/latest/data.yml +++ b/apps/chatgpt-on-wechat/latest/data.yml @@ -66,7 +66,7 @@ additionalProperties: envKey: SINGLE_CHAT_REPLY_PREFIX labelEn: Single Chat Reply Prefix labelZh: 私聊回复前缀 - required: true + required: false type: text - default: "" edit: true @@ -80,7 +80,7 @@ additionalProperties: envKey: GROUP_CHAT_PREFIX labelEn: Group Chat Prefix labelZh: 群聊前缀 - required: true + required: false type: text - default: "" edit: true @@ -814,13 +814,28 @@ additionalProperties: labelZh: 清除记忆指令 required: false type: text - - default: "" + - default: "wx" edit: true envKey: CHANNEL_TYPE labelEn: Channel Type labelZh: 通道类型 - required: false - type: text + required: true + type: select + values: + - label: "wx" + value: "wx" + - label: "wxy" + value: "wxy" + - label: "terminal" + value: "terminal" + - label: "wechatmp" + value: "wechatmp" + - label: "wechatmp_service" + value: "wechatmp_service" + - label: "wechatcom_app" + value: "wechatcom_app" + - label: "dingtalk" + value: "dingtalk" - default: "" edit: true envKey: SUBSCRIBE_MSG