From da11034aec951e019e35b2fa8a35f0df5e87cebe Mon Sep 17 00:00:00 2001 From: Soulter <905617992@qq.com> Date: Fri, 29 Sep 2023 10:06:41 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=9C=A8cmd=5Fconfig?= =?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/qqbot/core.py | 3 ++- model/provider/provider_rev_chatgpt.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cores/qqbot/core.py b/cores/qqbot/core.py index 90b190d8e..e9fe70fdc 100644 --- a/cores/qqbot/core.py +++ b/cores/qqbot/core.py @@ -121,6 +121,7 @@ cc.init_attributes(["gocq_react_friend"], True) cc.init_attributes(["gocq_react_group_increase"], True) cc.init_attributes(["gocq_qqchan_admin"], "") cc.init_attributes(["other_admins"], []) +cc.init_attributes(["CHATGPT_BASE_URL"], "") # cc.init_attributes(["qq_forward_mode"], False) # QQ机器人 @@ -234,7 +235,7 @@ def initBot(cfg, prov): if cfg['rev_ChatGPT']['enable']: if 'account' in cfg['rev_ChatGPT']: from model.provider.provider_rev_chatgpt import ProviderRevChatGPT - llm_instance[REV_CHATGPT] = ProviderRevChatGPT(cfg['rev_ChatGPT']) + llm_instance[REV_CHATGPT] = ProviderRevChatGPT(cfg['rev_ChatGPT'], base_url=cc.get("CHATGPT_BASE_URL", None)) llm_command_instance[REV_CHATGPT] = CommandRevChatGPT(llm_instance[REV_CHATGPT], _global_object) chosen_provider = REV_CHATGPT else: diff --git a/model/provider/provider_rev_chatgpt.py b/model/provider/provider_rev_chatgpt.py index 41bed27b9..6635ffa39 100644 --- a/model/provider/provider_rev_chatgpt.py +++ b/model/provider/provider_rev_chatgpt.py @@ -7,7 +7,9 @@ import time class ProviderRevChatGPT(Provider): - def __init__(self, config): + def __init__(self, config, base_url = None): + if base_url == "": + base_url = None self.rev_chatgpt: list[dict] = [] self.cc = cc.CmdConfig() for i in range(0, len(config['account'])): @@ -28,7 +30,7 @@ class ProviderRevChatGPT(Provider): rev_account_config['PUID'] = self.cc.get("rev_chatgpt_PUID") if len(self.cc.get("rev_chatgpt_unverified_plugin_domains")) > 0: rev_account_config['unverified_plugin_domains'] = self.cc.get("rev_chatgpt_unverified_plugin_domains") - cb = Chatbot(config=rev_account_config) + cb = Chatbot(config=rev_account_config, base_url=base_url) # cb.captcha_solver = self.__captcha_solver # 后八位c g_id = rev_account_config['access_token'][-8:]