From bbcd285bf5b2fa078e35dfad92e0cae4338b5432 Mon Sep 17 00:00:00 2001 From: Matt Gideon <117586514+Haibersut@users.noreply.github.com> Date: Wed, 12 Jul 2023 12:30:08 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9B=B4=E6=96=B0edgeGPT=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=92=8C=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= =?UTF-8?q?=20(#1041)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4124979c605f39be6006efaf44e6a43cbe65de9a. --- adapter/ms/bing.py | 4 ++-- conversation.py | 2 +- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/adapter/ms/bing.py b/adapter/ms/bing.py index eb8a4c5c..cafa5b53 100644 --- a/adapter/ms/bing.py +++ b/adapter/ms/bing.py @@ -9,14 +9,14 @@ from constants import config from adapter.botservice import BotAdapter -from EdgeGPT.EdgeGPT import Chatbot as EdgeChatbot, ConversationStyle, NotAllowedToAccess +from EdgeGPT import Chatbot as EdgeChatbot, ConversationStyle, NotAllowedToAccess from contextlib import suppress from constants import botManager from drawing import DrawingAPI from exceptions import BotOperationNotSupportedException from loguru import logger -from EdgeGPT.ImageGen import ImageGenAsync +from ImageGen import ImageGenAsync from graia.ariadne.message.element import Image as GraiaImage image_pattern = r"!\[.*\]\((.*)\)" diff --git a/conversation.py b/conversation.py index 2f1bdebb..515c5508 100644 --- a/conversation.py +++ b/conversation.py @@ -5,7 +5,7 @@ from typing import List, Dict, Optional import httpx -from EdgeGPT.EdgeGPT import ConversationStyle +from EdgeGPT import ConversationStyle from graia.amnesia.message import MessageChain from graia.ariadne.message.element import Image as GraiaImage, Element from loguru import logger diff --git a/requirements.txt b/requirements.txt index 13922dba..190f1697 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ pygments~=2.15.1 imgkit~=1.2.3 qrcode~=7.4.2 openai~=0.27.8 -EdgeGPT==0.12.1 +EdgeGPT==0.8.2 aiohttp~=3.8.4 OpenAIAuth urllib3~=1.26.15