backend/.gitignore

@@ -8,3 +8,5 @@ logs
 ChatGPT-Proxy-V4
 *.json
 data
+build
+dist

backend/alembic/versions/333722b0921e_add_source_id_for_baseconversation.py

@@ -0,0 +1,28 @@
+"""Add source_id for BaseConversation
+
+Revision ID: 333722b0921e
+Revises: 7d94b5503088
+Create Date: 2024-02-03 12:29:17.095124
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '333722b0921e'
+down_revision = '7d94b5503088'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('conversation', sa.Column('source_id', sa.String(length=256), nullable=True, comment='对话来源id'))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('conversation', 'source_id')
+    # ### end Alembic commands ###

backend/api/conf/base_config.py

@@ -57,7 +57,7 @@ def load(self):
             raise ConfigException(f"Cannot read config ({self._config_path}), error: {str(e)}")
 
     def save(self):
-        config_dict = jsonable_encoder(self._model.dict())
+        config_dict = jsonable_encoder(self._model.model_dump())
         # 复制 self._config_path 备份一份
         config_dir = os.path.dirname(self._config_path)
         if not os.path.exists(config_dir):

backend/api/conf/config.py

@@ -5,7 +5,7 @@
 from api.conf.base_config import BaseConfig
 from api.enums import OpenaiWebChatModels, OpenaiApiChatModels
 from api.enums.options import OpenaiWebFileUploadStrategyOption
-from utils.common import singleton_with_lock
+from utils.common import SingletonMeta
 
 _TYPE_CHECKING = False
 
@@ -47,7 +47,7 @@ class DataSetting(BaseModel):
     database_url: str = 'sqlite+aiosqlite:///data/database.db'
     mongodb_url: str = 'mongodb://cws:password@mongo:27017'
     mongodb_db_name: str = 'cws'
-    run_migration: bool = False
+    run_migration: bool = True
     max_file_upload_size: int = Field(100 * 1024 * 1024, ge=0)
 
     @field_validator("database_url")
@@ -68,6 +68,8 @@ class AuthSetting(BaseModel):
 class OpenaiWebChatGPTSetting(BaseModel):
     enabled: bool = True
     is_plus_account: bool = True
+    enable_team_subscription: bool = False
+    team_account_id: Optional[str] = None
     chatgpt_base_url: Optional[str] = None
     proxy: Optional[str] = None
     common_timeout: int = Field(20, ge=1,
@@ -79,6 +81,7 @@ class OpenaiWebChatGPTSetting(BaseModel):
     enabled_models: list[OpenaiWebChatModels] = ["gpt_3_5", "gpt_4", "gpt_4_plugins"]
     model_code_mapping: dict[OpenaiWebChatModels, str] = default_openai_web_model_code_mapping
     file_upload_strategy: OpenaiWebFileUploadStrategyOption = OpenaiWebFileUploadStrategyOption.browser_upload_only
+    max_completion_concurrency: int = Field(1, ge=1)
     disable_uploading: bool = False
 
     @field_validator("chatgpt_base_url")
@@ -134,8 +137,7 @@ class ConfigModel(BaseModel):
     log: LogSetting = LogSetting()
 
 
-@singleton_with_lock
-class Config(BaseConfig[ConfigModel]):
+class Config(BaseConfig[ConfigModel], metaclass=SingletonMeta):
     if _TYPE_CHECKING:
         openai_web: OpenaiWebChatGPTSetting = OpenaiWebChatGPTSetting()
         openai_api: OpenaiApiSetting = OpenaiApiSetting()

backend/api/conf/credentials.py

@@ -3,7 +3,7 @@
 from pydantic import BaseModel
 
 from api.conf.base_config import BaseConfig
-from utils.common import singleton_with_lock
+from utils.common import SingletonMeta
 
 _TYPE_CHECKING = False
 
@@ -15,8 +15,7 @@ class CredentialsModel(BaseModel):
     openai_api_key: Optional[str] = None
 
 
-@singleton_with_lock
-class Credentials(BaseConfig[CredentialsModel]):
+class Credentials(BaseConfig[CredentialsModel], metaclass=SingletonMeta):
     if _TYPE_CHECKING:
         openai_web_access_token: Optional[str]
         # chatgpt_account_username: Optional[str]

backend/api/database/custom_types/pydantic_type.py

@@ -3,7 +3,7 @@
 
 import sqlalchemy
 from fastapi.encoders import jsonable_encoder
-from pydantic import BaseModel, parse_obj_as
+from pydantic import BaseModel
 from sqlalchemy import Dialect
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql.type_api import _T

backend/api/middlewares/asgi_logger/middleware.py

@@ -115,9 +115,9 @@ def __init__(self, scope: HTTPScope, info: AccessInfo) -> None:
                 "b": self.get("{Content-Length}o", "-"),
                 "f": self["{Referer}i"],
                 "a": self["{User-Agent}i"],
-                "T": int(request_time),
-                "M": int(request_time * 1_000),
-                "D": int(request_time * 1_000_000),
+                "T": str(round(request_time)),
+                "M": str(round(request_time * 1_000)),
+                "D": str(round(request_time * 1_000_000)),
                 "L": f"{request_time:.6f}",
                 "p": f"<{os.getpid()}>",
             }

backend/api/models/db.py

@@ -72,6 +72,7 @@ class BaseConversation(Base):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
     source: Mapped[ChatSourceTypes] = mapped_column(Enum(ChatSourceTypes), comment="对话类型")
+    source_id: Mapped[Optional[str]] = mapped_column(String(256), comment="对话来源id")
     conversation_id: Mapped[uuid.UUID] = mapped_column(GUID, index=True, unique=True, comment="uuid")
     current_model: Mapped[Optional[str]] = mapped_column(default=None, use_existing_column=True)
     title: Mapped[Optional[str]] = mapped_column(comment="对话标题")

backend/api/models/doc/__init__.py

@@ -204,6 +204,9 @@ class OpenaiWebConversationHistoryMeta(BaseModel):
     source: Literal["openai_web"]
     moderation_results: Optional[list[Any]] = None
     plugin_ids: Optional[list[str]] = None
+    gizmo_id: Optional[str] = None
+    is_archived: Optional[bool] = None
+    conversation_template_id: Optional[str] = None
 
 
 class OpenaiApiConversationHistoryMeta(BaseModel):

backend/api/models/json.py

@@ -2,7 +2,6 @@
 from typing import Optional, Generic, TypeVar, get_args, Literal
 
 from pydantic import model_validator, BaseModel, Field, create_model, RootModel
-from pydantic.generics import GenericModel
 
 from api.enums import OpenaiWebChatModels, OpenaiApiChatModels
 

backend/api/response.py

@@ -32,12 +32,6 @@ class ResponseWrapper(BaseModel, Generic[T]):
     message: str = ""
     result: Optional[T | Any] = None
 
-    def to_dict(self):
-        return jsonable_encoder(self)
-
-    def to_json(self):
-        return json.dumps(self.to_dict(), ensure_ascii=False)
-
 
 class CustomJSONResponse(Response):
     media_type = "application/json"
@@ -55,7 +49,8 @@ def __init__(
     def render(self, content: typing.Any) -> bytes:
         if not isinstance(content, ResponseWrapper):
             content = ResponseWrapper(code=self.status_code, message=get_http_message(self.status_code), result=content)
-        return content.to_json().encode("utf-8")
+        result = json.dumps(jsonable_encoder(content), ensure_ascii=False)
+        return result.encode("utf-8")
 
 
 class PrettyJSONResponse(Response):

backend/api/routers/chat.py

@@ -10,7 +10,7 @@
 from fastapi.encoders import jsonable_encoder
 from fastapi_cache.decorator import cache
 from httpx import HTTPError
-from pydantic import ValidationError
+from pydantic import ValidationError, BaseModel
 from sqlalchemy import select, func, and_
 from starlette.websockets import WebSocket, WebSocketState
 from websockets.exceptions import ConnectionClosed
@@ -39,25 +39,39 @@
 config = Config()
 
 INSTALLED_PLUGINS_CACHE_FILE_PATH = os.path.join(config.data.data_dir, "installed_plugin_manifests.json")
-INSTALLED_PLUGINS_CACHE_EXPIRE = 3600 * 24
+INSTALLED_PLUGINS_TEAM_CACHE_FILE_PATH = os.path.join(config.data.data_dir, "installed_plugin_manifests_team.json")
+CACHE_EXPIRE_DURATION = 3600 * 24
 
-_installed_plugins: OpenaiChatPluginListResponse | None = None
-_installed_plugins_map: dict[str, OpenaiChatPlugin] | None = None
-_installed_plugins_last_update_time = None
 
+# TODO: 优化插件缓存处理，隔离不同来源的插件
 
-def _load_installed_plugins_from_cache():
-    global _installed_plugins, _installed_plugins_map, _installed_plugins_last_update_time
-    if os.path.exists(INSTALLED_PLUGINS_CACHE_FILE_PATH):
-        with open(INSTALLED_PLUGINS_CACHE_FILE_PATH, "r") as f:
-            data = json.load(f)
-            _installed_plugins = OpenaiChatPluginListResponse.model_validate(data["installed_plugins"])
-            _installed_plugins_map = {plugin.id: plugin for plugin in _installed_plugins.items}
-            _installed_plugins_last_update_time = data["installed_plugins_last_update_time"]
+class PluginsCache(BaseModel):
+    response: Optional[OpenaiChatPluginListResponse] = None
+    map: Optional[dict[str, OpenaiChatPlugin]] = None
+    last_update_time: Optional[float] = None
+
+
+_cache_by_use_team = {
+    False: PluginsCache(),
+    True: PluginsCache()
+}
 
 
-def _save_installed_plugins_to_cache(installed_plugins, installed_plugins_last_update_time):
-    with open(INSTALLED_PLUGINS_CACHE_FILE_PATH, "w") as f:
+def _load_installed_plugins_from_cache():
+    global _cache_by_use_team
+    for use_team in [False, True]:
+        _cache = _cache_by_use_team[use_team]
+        path = INSTALLED_PLUGINS_CACHE_FILE_PATH if not use_team else INSTALLED_PLUGINS_TEAM_CACHE_FILE_PATH
+        if os.path.exists(path):
+            with open(path, "r") as f:
+                data = json.load(f)
+                _cache.response = OpenaiChatPluginListResponse.model_validate(data["installed_plugins"])
+                _cache.map = {plugin.id: plugin for plugin in _cache.response.items}
+                _cache.last_update_time = data["installed_plugins_last_update_time"]
+
+
+def _save_installed_plugins_to_cache(installed_plugins, installed_plugins_last_update_time, dest_path: str):
+    with open(dest_path, "w") as f:
         json.dump(jsonable_encoder({
             "installed_plugins": installed_plugins,
             "installed_plugins_last_update_time": installed_plugins_last_update_time
@@ -67,34 +81,41 @@ def _save_installed_plugins_to_cache(installed_plugins, installed_plugins_last_u
 _load_installed_plugins_from_cache()
 
 
-async def _refresh_installed_plugins():
-    global _installed_plugins, _installed_plugins_map, _installed_plugins_last_update_time
-    if _installed_plugins is None or time.time() - _installed_plugins_last_update_time > INSTALLED_PLUGINS_CACHE_EXPIRE:
-        _installed_plugins = await openai_web_manager.get_installed_plugin_manifests()
-        _installed_plugins_map = {plugin.id: plugin for plugin in _installed_plugins.items}
-        _installed_plugins_last_update_time = time.time()
-        _save_installed_plugins_to_cache(_installed_plugins, _installed_plugins_last_update_time)
-    return _installed_plugins
+async def _refresh_installed_plugins(use_team: bool = False):
+    global _cache_by_use_team
+
+    _cache = _cache_by_use_team[use_team]
+    if _cache.response is None or time.time() - _cache.last_update_time > CACHE_EXPIRE_DURATION:
+        _cache.response = await openai_web_manager.get_installed_plugin_manifests(use_team=use_team)
+        _cache.map = {plugin.id: plugin for plugin in _cache.response.items}
+        _cache.last_update_time = time.time()
+        _save_installed_plugins_to_cache(_cache.response, _cache.last_update_time,
+                                         INSTALLED_PLUGINS_TEAM_CACHE_FILE_PATH if use_team else INSTALLED_PLUGINS_CACHE_FILE_PATH)
+
+    return _cache.response
 
 
 @router.get("/chat/openai-plugins", tags=["chat"], response_model=OpenaiChatPluginListResponse)
 @cache(expire=60 * 60 * 24)
 async def get_openai_web_chat_plugins(offset: int = 0, limit: int = 0, category: str = "", search: str = "",
-                                      _user: User = Depends(current_active_user)):
-    plugins = await openai_web_manager.get_plugin_manifests(offset, limit, category, search)
+                                      user: User = Depends(current_active_user)):
+    plugins = await openai_web_manager.get_plugin_manifests(offset, limit, category, search,
+                                                            user.setting.openai_web.use_team)
     return plugins
 
 
 @router.get("/chat/openai-plugins/installed", tags=["chat"], response_model=OpenaiChatPluginListResponse)
-async def get_installed_openai_web_chat_plugins(_user: User = Depends(current_active_user)):
+async def get_installed_openai_web_chat_plugins(user: User = Depends(current_active_user)):
     plugins = await _refresh_installed_plugins()
     return plugins
 
 
 @router.get("/chat/openai-plugins/installed/{plugin_id}", tags=["chat"], response_model=OpenaiChatPlugin)
-async def get_installed_openai_web_plugin(plugin_id: str, _user: User = Depends(current_active_user)):
-    await _refresh_installed_plugins()
-    global _installed_plugins_map
+async def get_installed_openai_web_plugin(plugin_id: str, user: User = Depends(current_active_user)):
+    use_team = user.setting.openai_web.use_team
+    await _refresh_installed_plugins(use_team)
+    global _cache_by_use_team
+    _installed_plugins_map = _cache_by_use_team[use_team].map
     if plugin_id in _installed_plugins_map:
         return _installed_plugins_map[plugin_id]
     else:
@@ -103,12 +124,13 @@ async def get_installed_openai_web_plugin(plugin_id: str, _user: User = Depends(
 
 @router.patch("/chat/openai-plugins/{plugin_id}/user-settings", tags=["chat"], response_model=OpenaiChatPlugin)
 async def update_chat_plugin_user_settings(plugin_id: str, settings: OpenaiChatPluginUserSettings,
+                                           use_team: Optional[bool] = config.openai_web.enable_team_subscription,
                                            _user: User = Depends(current_super_user)):
     if settings.is_authenticated is not None:
         raise InvalidParamsException("can not set is_authenticated")
-    result = await openai_web_manager.change_plugin_user_settings(plugin_id, settings)
+    result = await openai_web_manager.change_plugin_user_settings(plugin_id, settings, use_team)
     assert isinstance(result, OpenaiChatPlugin)
-    await _refresh_installed_plugins()
+    await _refresh_installed_plugins(use_team)
     return result
 
 
@@ -245,6 +267,8 @@ async def reply(response: AskResponse):
 
     params = await websocket.receive_json()
 
+    use_team = user.setting.openai_web.use_team and config.openai_web.enable_team_subscription
+
     try:
         ask_request = AskRequest.model_validate(params)
     except ValidationError as e:
@@ -269,6 +293,13 @@ async def reply(response: AskResponse):
         conversation_id = ask_request.conversation_id
         conversation = await _get_conversation_by_id(ask_request.conversation_id, user_db)
 
+        # 是否可用 team 对话
+        if conversation is not None and conversation.source_id is not None and use_team == False:
+            e = WebsocketException(1008, "errors.teamConversationNotAllowed")
+            await reply(AskResponse(type=AskResponseType.error, tip=e.tip, error_detail=e.error_detail))
+            await websocket.close(e.code, e.tip)
+            return
+
     request_start_time = datetime.now()
 
     websocket_code = 1001
@@ -303,7 +334,6 @@ async def reply(response: AskResponse):
     message = None
 
     try:
-        # rev: 更改状态为 asking
         if ask_request.source == ChatSourceTypes.openai_web:
             await change_user_chat_status(user.id, OpenaiWebChatStatus.asking)
 
@@ -323,10 +353,11 @@ async def reply(response: AskResponse):
             model = OpenaiApiChatModels(ask_request.model)
 
         # stream 传输
-        async for data in manager.complete(text_content=ask_request.text_content,
+        async for data in manager.complete(model=model,
+                                           text_content=ask_request.text_content,
+                                           use_team=use_team,
                                            conversation_id=ask_request.conversation_id,
                                            parent_message_id=ask_request.parent,
-                                           model=model,
                                            plugin_ids=ask_request.openai_web_plugin_ids if ask_request.new_conversation else None,
                                            attachments=ask_request.openai_web_attachments,
                                            multimodal_image_parts=ask_request.openai_web_multimodal_image_parts,
@@ -370,6 +401,7 @@ async def reply(response: AskResponse):
     except OpenaiException as e:
         logger.error(str(e))
         error_detail_map = {
+            400: "errors.openai.400",
             401: "errors.openai.401",
             403: "errors.openai.403",
             404: "errors.openai.404",
@@ -513,7 +545,11 @@ async def reply(response: AskResponse):
                 if ask_request.source == ChatSourceTypes.openai_web and ask_request.new_title is not None and \
                         ask_request.new_title.strip() != "":
                     try:
-                        await openai_web_manager.set_conversation_title(str(conversation_id), ask_request.new_title)
+                        source_id = None
+                        if use_team:
+                            source_id = config.openai_web.team_account_id
+                        await openai_web_manager.set_conversation_title(str(conversation_id), ask_request.new_title,
+                                                                        source_id=source_id)
                     except Exception as e:
                         logger.warning(f"set_conversation_title error {e.__class__.__name__}: {str(e)}")
 
@@ -528,6 +564,8 @@ async def reply(response: AskResponse):
                     create_time=current_time,
                     update_time=current_time
                 )
+                if use_team:
+                    new_conv.source_id = config.openai_web.team_account_id
                 conversation = BaseConversation(**new_conv.model_dump(exclude_unset=True))
                 session.add(conversation)