feat: support proxy; remove revChatGPT

Author: moeakwak

backend/api/conf/config.py

@@ -53,6 +53,7 @@ class AuthSetting(BaseModel):
 class OpenaiWebChatGPTSetting(BaseModel):
     is_plus_account: bool = False
     chatgpt_base_url: Optional[str] = None
+    proxy: Optional[str] = None
     common_timeout: int = Field(10, ge=1)   # connect, read, write
     ask_timeout: int = Field(600, ge=1)
 
@@ -65,6 +66,7 @@ def chatgpt_base_url_end_with_slash(cls, v):
 
 class OpenaiApiSetting(BaseModel):
     openai_base_url: str = 'https://api.openai.com/v1/'
+    proxy: Optional[str] = None
     connect_timeout: int = Field(10, ge=1)
     read_timeout: int = Field(20, ge=1)
 

backend/api/conf/credentials.py

@@ -9,7 +9,7 @@
 
 
 class CredentialsModel(BaseModel):
-    chatgpt_access_token: Optional[str] = None
+    openai_web_access_token: Optional[str] = None
     # chatgpt_account_username: Optional[str] = None
     # chatgpt_account_password: Optional[str] = None
     openai_api_key: Optional[str] = None
@@ -18,7 +18,7 @@ class CredentialsModel(BaseModel):
 @singleton_with_lock
 class Credentials(BaseConfig[CredentialsModel]):
     if _TYPE_CHECKING:
-        revchatgpt_access_token: Optional[str]
+        openai_web_access_token: Optional[str]
         # chatgpt_account_username: Optional[str]
         # chatgpt_account_password: Optional[str]
         openai_api_key: Optional[str]

backend/api/routers/chat.py

@@ -268,7 +268,6 @@ async def reply(response: AskResponse):
         # rev: 更改状态为 asking
         if ask_request.source == ChatSourceTypes.openai_web:
             await change_user_chat_status(user.id, OpenaiWebChatStatus.asking)
-            openai_web_manager.reset_chat()
 
         await reply(AskResponse(
             type=AskResponseType.waiting,
@@ -370,7 +369,6 @@ async def reply(response: AskResponse):
         if ask_request.source == ChatSourceTypes.openai_web:
             openai_web_manager.semaphore.release()
             await change_user_chat_status(user.id, OpenaiWebChatStatus.idling)
-        openai_web_manager.reset_chat()
 
     ask_stop_time = time.time()
     queueing_time = 0

backend/api/routers/system.py

@@ -18,6 +18,7 @@
 from api.models.doc import RequestLogDocument, AskLogDocument
 from api.schemas import LogFilterOptions, SystemInfo, UserCreate, UserSettingSchema, OpenaiWebSourceSettingSchema, \
     OpenaiApiSourceSettingSchema, RequestLogAggregation, AskLogAggregation
+from api.sources import OpenaiWebChatManager, OpenaiApiChatManager
 from api.users import current_super_user, get_user_manager_context
 from utils.logger import get_logger
 
@@ -253,6 +254,10 @@ async def get_config(_user: User = Depends(current_super_user)):
 async def update_config(config_model: ConfigModel, _user: User = Depends(current_super_user)):
     config.update(config_model)
     config.save()
+    openai_web_manager = OpenaiWebChatManager()
+    openai_api_manager = OpenaiApiChatManager()
+    openai_web_manager.reset_session()
+    openai_api_manager.reset_session()
     return config.model()
 
 
@@ -266,6 +271,8 @@ async def get_credentials(_user: User = Depends(current_super_user)):
 async def update_credentials(credentials_model: CredentialsModel, _user: User = Depends(current_super_user)):
     credentials.update(credentials_model)
     credentials.save()
+    openai_web_manager = OpenaiWebChatManager()
+    openai_web_manager.reset_session()
     return credentials.model()
 
 

backend/api/sources/openai_api.py

@@ -46,14 +46,29 @@ async def _check_response(response: httpx.Response) -> None:
         raise error from ex
 
 
+def make_session() -> httpx.AsyncClient:
+    if config.openai_api.proxy is not None:
+        proxies = {
+            "http://": config.openai_api.proxy,
+            "https://": config.openai_api.proxy,
+        }
+        session = httpx.AsyncClient(proxies=proxies, timeout=None)
+    else:
+        session = httpx.AsyncClient(timeout=None)
+    return session
+
+
 @singleton_with_lock
 class OpenaiApiChatManager:
     """
     OpenAI API Manager
     """
 
     def __init__(self):
-        self.client = httpx.AsyncClient(timeout=None)  # TODO: support proxies
+        self.session = make_session()
+
+    def reset_session(self):
+        self.session = make_session()
 
     async def ask(self, content: str, conversation_id: uuid.UUID = None,
                   parent_id: uuid.UUID = None, model: OpenaiApiChatModels = None,
@@ -126,7 +141,7 @@ async def ask(self, content: str, conversation_id: uuid.UUID = None,
 
         timeout = httpx.Timeout(config.openai_api.read_timeout, connect=config.openai_api.connect_timeout)
 
-        async with self.client.stream(
+        async with self.session.stream(
                 method="POST",
                 url=f"{base_url}chat/completions",
                 json=data,

backend/api/sources/openai_web.py

@@ -4,10 +4,8 @@
 from typing import AsyncGenerator
 
 import httpx
-import revChatGPT
 from fastapi.encoders import jsonable_encoder
 from pydantic import parse_obj_as, ValidationError
-from revChatGPT.V1 import AsyncChatbot
 
 from api.conf import Config, Credentials
 from api.enums import OpenaiWebChatModels, ChatSourceTypes
@@ -128,32 +126,55 @@ async def _check_response(response: httpx.Response) -> None:
         raise error from ex
 
 
+def make_session() -> httpx.AsyncClient:
+    if config.openai_web.proxy is not None:
+        proxies = {
+            "http://": config.openai_web.proxy,
+            "https://": config.openai_web.proxy,
+        }
+        session = httpx.AsyncClient(proxies=proxies)
+    else:
+        session = httpx.AsyncClient()
+    session.headers.clear()
+    session.headers.update(
+        {
+            "Accept": "text/event-stream",
+            "Authorization": f"Bearer {credentials.openai_web_access_token}",
+            "Content-Type": "application/json",
+            "X-Openai-Assistant-App-Id": "",
+            "Connection": "close",
+            "Accept-Language": "en-US,en;q=0.9",
+            "Referer": "https://chat.openai.com/chat",
+        },
+    )
+    return session
+
+
 @singleton_with_lock
 class OpenaiWebChatManager:
     """
     TODO: 解除 revChatGPT 依赖
     """
 
     def __init__(self):
-        self.chatbot = AsyncChatbot({
-            "access_token": credentials.chatgpt_access_token,
-            "paid": config.openai_web.is_plus_account,
-            "model": "text-davinci-002-render-sha",  # default model
-        }, base_url=config.openai_web.chatgpt_base_url)
+        self.session = make_session()
         self.semaphore = asyncio.Semaphore(1)
 
     def is_busy(self):
         return self.semaphore.locked()
 
+    def reset_session(self):
+        self.session = make_session()
+
     async def get_conversations(self, timeout=None):
         all_conversations = []
         offset = 0
         limit = 80
         while True:
-            url = f"{self.chatbot.base_url}conversations?offset={offset}&limit={limit}"
+            url = f"{config.openai_web.chatgpt_base_url}conversations?offset={offset}&limit={limit}"
             if timeout is None:
                 timeout = httpx.Timeout(config.openai_web.common_timeout)
-            response = await self.chatbot.session.get(url, timeout=timeout)
+            response = await self.session.get(url, timeout=timeout)
             await _check_response(response)
             data = json.loads(response.text)
             conversations = data["items"]
@@ -165,9 +186,8 @@ async def get_conversations(self, timeout=None):
         return all_conversations
 
     async def get_conversation_history(self, conversation_id: uuid.UUID | str) -> OpenaiWebConversationHistoryDocument:
-        # result = await self.chatbot.get_msg_history(conversation_id)
-        url = f"{self.chatbot.base_url}conversation/{conversation_id}"
-        response = await self.chatbot.session.get(url, timeout=None)
+        url = f"{config.openai_web.chatgpt_base_url}conversation/{conversation_id}"
+        response = await self.session.get(url, timeout=None)
         response.encoding = 'utf-8'
         await _check_response(response)
         result = json.loads(response.text)
@@ -198,7 +218,10 @@ async def get_conversation_history(self, conversation_id: uuid.UUID | str) -> Op
         return doc
 
     async def clear_conversations(self):
-        await self.chatbot.clear_conversations()
+        # await self.chatbot.clear_conversations()
+        url = f"{config.openai_web.chatgpt_base_url}conversations"
+        response = await self.session.patch(url, data={"is_visible": False})
+        await _check_response(response)
 
     async def ask(self, content: str, conversation_id: uuid.UUID = None, parent_id: uuid.UUID = None,
                   model: OpenaiWebChatModels = None, plugin_ids: list[str] = None, **_kwargs):
@@ -238,9 +261,9 @@ async def ask(self, content: str, conversation_id: uuid.UUID = None, parent_id:
 
         timeout = httpx.Timeout(Config().openai_web.common_timeout, read=Config().openai_web.ask_timeout)
 
-        async with self.chatbot.session.stream(
+        async with self.session.stream(
                 method="POST",
-                url=f"{self.chatbot.base_url}conversation",
+                url=f"{config.openai_web.chatgpt_base_url}conversation",
                 data=json.dumps(data),
                 timeout=timeout,
         ) as response:
@@ -267,18 +290,23 @@ async def ask(self, content: str, conversation_id: uuid.UUID = None, parent_id:
                 yield line
 
     async def delete_conversation(self, conversation_id: str):
-        await self.chatbot.delete_conversation(conversation_id)
+        # await self.chatbot.delete_conversation(conversation_id)
+        url = f"{config.openai_web.chatgpt_base_url}conversation/{conversation_id}"
+        response = await self.session.patch(url, data='{"is_visible": false}')
+        await _check_response(response)
 
     async def set_conversation_title(self, conversation_id: str, title: str):
-        """Hack change_title to set title in utf-8"""
-        await self.chatbot.change_title(conversation_id, title)
+        url = f"{config.openai_web.chatgpt_base_url}conversation/{conversation_id}"
+        response = await self.session.patch(url, data=f'{{"title": "{title}"}}')
+        await _check_response(response)
 
     async def generate_conversation_title(self, conversation_id: str, message_id: str):
-        """Hack gen_title to get title"""
-        await self.chatbot.gen_title(conversation_id, message_id)
-
-    def reset_chat(self):
-        self.chatbot.reset_chat()
+        url = f"{config.openai_web.chatgpt_base_url}conversation/gen_title/{conversation_id}"
+        response = await self.session.post(
+            url,
+            data=json.dumps({"message_id": message_id, "model": "text-davinci-002-render"}),
+        )
+        await _check_response(response)
 
     async def get_plugin_manifests(self, statuses="approved", is_installed=None, offset=0, limit=250):
         if not config.openai_web.is_plus_account:
@@ -290,8 +318,8 @@ async def get_plugin_manifests(self, statuses="approved", is_installed=None, off
         }
         if is_installed is not None:
             params["is_installed"] = is_installed
-        response = await self.chatbot.session.get(
-            url=f"{self.chatbot.base_url}aip/p",
+        response = await self.session.get(
+            url=f"{config.openai_web.chatgpt_base_url}aip/p",
             params=params,
             timeout=config.openai_web.ask_timeout
         )
@@ -301,8 +329,8 @@ async def get_plugin_manifests(self, statuses="approved", is_installed=None, off
     async def change_plugin_user_settings(self, plugin_id: str, setting: OpenaiChatPluginUserSettings):
         if not config.openai_web.is_plus_account:
             raise InvalidParamsException("errors.notPlusChatgptAccount")
-        response = await self.chatbot.session.patch(
-            url=f"{self.chatbot.base_url}aip/p/{plugin_id}/user-settings",
+        response = await self.session.patch(
+            url=f"{config.openai_web.chatgpt_base_url}aip/p/{plugin_id}/user-settings",
             json=setting.dict(exclude_unset=True, exclude_none=True),
         )
         await _check_response(response)

frontend/src/types/json/config_schema.json

@@ -7,6 +7,7 @@
       "default": {
         "is_plus_account": false,
         "chatgpt_base_url": null,
+        "proxy": null,
         "common_timeout": 10,
         "ask_timeout": 600
       },
@@ -20,6 +21,7 @@
       "title": "Openai Api",
       "default": {
         "openai_base_url": "https://api.openai.com/v1/",
+        "proxy": null,
         "connect_timeout": 10,
         "read_timeout": 20
       },
@@ -131,6 +133,10 @@
           "title": "Chatgpt Base Url",
           "type": "string"
         },
+        "proxy": {
+          "title": "Proxy",
+          "type": "string"
+        },
         "common_timeout": {
           "title": "Common Timeout",
           "default": 10,
@@ -154,6 +160,10 @@
           "default": "https://api.openai.com/v1/",
           "type": "string"
         },
+        "proxy": {
+          "title": "Proxy",
+          "type": "string"
+        },
         "connect_timeout": {
           "title": "Connect Timeout",
           "default": 10,

frontend/src/types/json/credentials_schema.json

@@ -2,8 +2,8 @@
   "title": "CredentialsModel",
   "type": "object",
   "properties": {
-    "chatgpt_access_token": {
-      "title": "Chatgpt Access Token",
+    "openai_web_access_token": {
+      "title": "Openai Web Access Token",
       "type": "string"
     },
     "openai_api_key": {

frontend/src/types/json/openapi.json

@@ -2338,6 +2338,10 @@
                 "title": "Chatgpt Base Url",
                 "type": "string"
               },
+              "proxy": {
+                "title": "Proxy",
+                "type": "string"
+              },
               "common_timeout": {
                 "title": "Common Timeout",
                 "minimum": 1,
@@ -2371,6 +2375,10 @@
                 "type": "string",
                 "default": "https://api.openai.com/v1/"
               },
+              "proxy": {
+                "title": "Proxy",
+                "type": "string"
+              },
               "connect_timeout": {
                 "title": "Connect Timeout",
                 "minimum": 1,
@@ -2633,8 +2641,8 @@
     "title": "CredentialsModel",
     "type": "object",
     "properties": {
-      "chatgpt_access_token": {
-        "title": "Chatgpt Access Token",
+      "openai_web_access_token": {
+        "title": "Openai Web Access Token",
         "type": "string"
       },
       "openai_api_key": {
@@ -3744,6 +3752,10 @@
         "type": "string",
         "default": "https://api.openai.com/v1/"
       },
+      "proxy": {
+        "title": "Proxy",
+        "type": "string"
+      },
       "connect_timeout": {
         "title": "Connect Timeout",
         "minimum": 1,
@@ -4141,6 +4153,10 @@
         "title": "Chatgpt Base Url",
         "type": "string"
       },
+      "proxy": {
+        "title": "Proxy",
+        "type": "string"
+      },
       "common_timeout": {
         "title": "Common Timeout",
         "minimum": 1,