From 34277a394073cf025612d66d5743f4763522f125 Mon Sep 17 00:00:00 2001 From: zhayujie Date: Sun, 28 May 2023 19:08:23 +0800 Subject: [PATCH 1/2] feat: add app market --- bot/bot_factory.py | 5 +++ bot/linkai/link_ai_bot.py | 70 ++++++++++++++++++++++++++++++++ bridge/bridge.py | 2 + channel/wechat/wechat_channel.py | 1 - common/const.py | 1 + config.py | 3 ++ 6 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 bot/linkai/link_ai_bot.py diff --git a/bot/bot_factory.py b/bot/bot_factory.py index 77797e7..2e9cb2d 100644 --- a/bot/bot_factory.py +++ b/bot/bot_factory.py @@ -33,4 +33,9 @@ def create_bot(bot_type): from bot.chatgpt.chat_gpt_bot import AzureChatGPTBot return AzureChatGPTBot() + + elif bot_type == const.LINKAI: + from bot.linkai.link_ai_bot import LinkAIBot + return LinkAIBot() + raise RuntimeError diff --git a/bot/linkai/link_ai_bot.py b/bot/linkai/link_ai_bot.py new file mode 100644 index 0000000..9dd18b1 --- /dev/null +++ b/bot/linkai/link_ai_bot.py @@ -0,0 +1,70 @@ +from bot.bot import Bot +from bridge.context import ContextType +from bridge.reply import Reply, ReplyType +from common.log import logger +from bridge.context import Context +from bot.chatgpt.chat_gpt_session import ChatGPTSession +from bot.session_manager import SessionManager +from config import conf +import requests +import time + +class LinkAIBot(Bot): + + # authentication failed + AUTH_FAILED_CODE = 401 + + def __init__(self): + self.base_url = "https://api.link-ai.chat/v1" + + def reply(self, query, context: Context = None) -> Reply: + return self._chat(query, context) + + def _chat(self, query, context, retry_count=0): + if retry_count >= 2: + # exit from retry 2 times + logger.warn("[LINKAI] failed after maximum number of retry times") + return Reply(ReplyType.ERROR, "请再问我一次吧") + + try: + session_id = context["session_id"] + self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo") + session = self.sessions.session_query(query, session_id) + + # remove system message + if session.messages[0].get("role") == "system": + session.messages.pop(0) + + # load config + app_code = conf().get("app_code") + app_market_api_key = conf().get("app_market_api_key") + logger.info(f"[LINKAI] query={query}, app_code={app_code}") + + body = { + "appCode": app_code, + "messages": session.messages + } + headers = {"Authorization": "Bearer " + app_market_api_key} + + # do http request + res = requests.post(url=self.base_url + "/chat/completion", json=body, headers=headers).json() + + if not res or not res["success"]: + if res.get("code") == self.AUTH_FAILED_CODE: + logger.exception(f"[LINKAI] please check your app_market_api_key, res={res}") + return Reply(ReplyType.ERROR, "请再问我一次吧") + else: + # retry + time.sleep(2) + logger.warn(f"[LINKAI] do retry, times={retry_count}") + return self._chat(query, context, retry_count + 1) + # execute success + reply_content = res["data"]["content"] + logger.info(f"[LINKAI] reply={reply_content}") + return Reply(ReplyType.TEXT, reply_content) + except Exception as e: + logger.exception(e) + # retry + time.sleep(2) + logger.warn(f"[LINKAI] do retry, times={retry_count}") + return self._chat(query, context, retry_count + 1) diff --git a/bridge/bridge.py b/bridge/bridge.py index 78fe234..4de71fe 100644 --- a/bridge/bridge.py +++ b/bridge/bridge.py @@ -23,6 +23,8 @@ class Bridge(object): self.btype["chat"] = const.OPEN_AI if conf().get("use_azure_chatgpt", False): self.btype["chat"] = const.CHATGPTONAZURE + if conf().get("app_market_api_key") and conf().get("app_code"): + self.btype["chat"] = const.LINKAI self.bots = {} def get_bot(self, typename): diff --git a/channel/wechat/wechat_channel.py b/channel/wechat/wechat_channel.py index c888157..69f56f3 100644 --- a/channel/wechat/wechat_channel.py +++ b/channel/wechat/wechat_channel.py @@ -23,7 +23,6 @@ from common.time_check import time_checker from config import conf, get_appdata_dir from lib import itchat from lib.itchat.content import * -from plugins import * @itchat.msg_register([TEXT, VOICE, PICTURE, NOTE]) diff --git a/common/const.py b/common/const.py index b60d445..481741d 100644 --- a/common/const.py +++ b/common/const.py @@ -3,5 +3,6 @@ OPEN_AI = "openAI" CHATGPT = "chatGPT" BAIDU = "baidu" CHATGPTONAZURE = "chatGPTOnAzure" +LINKAI = "linkai" VERSION = "1.3.0" diff --git a/config.py b/config.py index ae1cfd7..97f5feb 100644 --- a/config.py +++ b/config.py @@ -99,6 +99,9 @@ available_setting = { "appdata_dir": "", # 数据目录 # 插件配置 "plugin_trigger_prefix": "$", # 规范插件提供聊天相关指令的前缀，建议不要和管理员指令前缀"#"冲突 + # 应用市场配置 + "app_market_api_key": "", + "app_code": "" } From 50e44dbb2aa9d3f9a80dcbf4faddf26da3fc9f57 Mon Sep 17 00:00:00 2001 From: zhayujie Date: Sun, 28 May 2023 22:12:36 +0800 Subject: [PATCH 2/2] fix: session save --- bot/linkai/link_ai_bot.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bot/linkai/link_ai_bot.py b/bot/linkai/link_ai_bot.py index 9dd18b1..e7b9703 100644 --- a/bot/linkai/link_ai_bot.py +++ b/bot/linkai/link_ai_bot.py @@ -16,6 +16,7 @@ class LinkAIBot(Bot): def __init__(self): self.base_url = "https://api.link-ai.chat/v1" + self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo") def reply(self, query, context: Context = None) -> Reply: return self._chat(query, context) @@ -28,7 +29,7 @@ class LinkAIBot(Bot): try: session_id = context["session_id"] - self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo") + session = self.sessions.session_query(query, session_id) # remove system message @@ -61,6 +62,7 @@ class LinkAIBot(Bot): # execute success reply_content = res["data"]["content"] logger.info(f"[LINKAI] reply={reply_content}") + self.sessions.session_reply(reply_content, session_id) return Reply(ReplyType.TEXT, reply_content) except Exception as e: logger.exception(e)