From 348c1a7d5f460e035d609a244f8fc5cf1f5e62e5 Mon Sep 17 00:00:00 2001 From: arloor Date: Wed, 17 Jul 2024 09:15:20 +0800 Subject: [PATCH 1/8] doc: fix Azure docs --- README.md | 4 ++-- README_CN.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 24967c16403..22146ba95d8 100644 --- a/README.md +++ b/README.md @@ -180,8 +180,7 @@ Specify OpenAI organization ID. ### `AZURE_URL` (optional) -> Example: https://{azure-resource-url}/openai/deployments/{deploy-name} -> if you config deployment name in `CUSTOM_MODELS`, you can remove `{deploy-name}` in `AZURE_URL` +> Example: https://{azure-resource-url}/openai Azure deploy url. @@ -276,6 +275,7 @@ User `-all` to disable all default models, `+all` to enable all default models. For Azure: use `modelName@azure=deploymentName` to customize model name and deployment name. > Example: `+gpt-3.5-turbo@azure=gpt35` will show option `gpt35(Azure)` in model list. +> If you only can use Azure model, `-all,+gpt-3.5-turbo@azure=gpt35` will `gpt35(Azure)` the only option in model list. For ByteDance: use `modelName@bytedance=deploymentName` to customize model name and deployment name. > Example: `+Doubao-lite-4k@bytedance=ep-xxxxx-xxx` will show option `Doubao-lite-4k(ByteDance)` in model list. diff --git a/README_CN.md b/README_CN.md index 5400bb276fa..9f19e85ae06 100644 --- a/README_CN.md +++ b/README_CN.md @@ -94,8 +94,7 @@ OpenAI 接口代理 URL，如果你手动配置了 openai 接口代理，请填 ### `AZURE_URL` （可选） -> 形如：https://{azure-resource-url}/openai/deployments/{deploy-name} -> 如果你已经在`CUSTOM_MODELS`中参考`displayName`的方式配置了{deploy-name}，那么可以从`AZURE_URL`中移除`{deploy-name}` +> 形如：https://{azure-resource-url}/openai Azure 部署地址。 @@ -186,7 +185,8 @@ ByteDance Api Url. 用来控制模型列表，使用 `+` 增加一个模型，使用 `-` 来隐藏一个模型，使用 `模型名=展示名` 来自定义模型的展示名，用英文逗号隔开。 在Azure的模式下，支持使用`modelName@azure=deploymentName`的方式配置模型名称和部署名称(deploy-name) -> 示例：`+gpt-3.5-turbo@azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项 +> 示例：`+gpt-3.5-turbo@azure=gpt35`这个配置会在模型列表显示一个`gpt35(Azure)`的选项。 +> 如果你只能使用Azure模式，那么设置 `-all,+gpt-3.5-turbo@azure=gpt35` 则可以让对话的默认使用 `gpt35(Azure)` 在ByteDance的模式下，支持使用`modelName@bytedance=deploymentName`的方式配置模型名称和部署名称(deploy-name) > 示例: `+Doubao-lite-4k@bytedance=ep-xxxxx-xxx`这个配置会在模型列表显示一个`Doubao-lite-4k(ByteDance)`的选项 From 8edc0989e2b502e9c653fc724d074c394d6c72c8 Mon Sep 17 00:00:00 2001 From: DDDDD12138 Date: Thu, 18 Jul 2024 01:51:56 +0800 Subject: [PATCH 2/8] chore: remove unused imports and correct typos --- .env.template | 4 ++-- app/config/server.ts | 2 +- app/store/chat.ts | 2 -- app/utils/hooks.ts | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.env.template b/.env.template index b2a0438d9d1..18986958ec1 100644 --- a/.env.template +++ b/.env.template @@ -10,12 +10,12 @@ PROXY_URL=http://localhost:7890 # (optional) # Default: Empty -# Googel Gemini Pro API key, set if you want to use Google Gemini Pro API. +# Google Gemini Pro API key, set if you want to use Google Gemini Pro API. GOOGLE_API_KEY= # (optional) # Default: https://generativelanguage.googleapis.com/ -# Googel Gemini Pro API url without pathname, set if you want to customize Google Gemini Pro API url. +# Google Gemini Pro API url without pathname, set if you want to customize Google Gemini Pro API url. GOOGLE_URL= # Override openai api request base url. (optional) diff --git a/app/config/server.ts b/app/config/server.ts index 23557788b08..d3ff9651d74 100644 --- a/app/config/server.ts +++ b/app/config/server.ts @@ -21,7 +21,7 @@ declare global { ENABLE_BALANCE_QUERY?: string; // allow user to query balance or not DISABLE_FAST_LINK?: string; // disallow parse settings from url or not CUSTOM_MODELS?: string; // to control custom models - DEFAULT_MODEL?: string; // to cnntrol default model in every new chat window + DEFAULT_MODEL?: string; // to control default model in every new chat window // azure only AZURE_URL?: string; // https://{azure-url}/openai/deployments/{deploy-name} diff --git a/app/store/chat.ts b/app/store/chat.ts index d14bd82d8f4..9372b8b2e8d 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -9,8 +9,6 @@ import { DEFAULT_MODELS, DEFAULT_SYSTEM_TEMPLATE, KnowledgeCutOffDate, - ServiceProvider, - ModelProvider, StoreKey, SUMMARIZE_MODEL, GEMINI_SUMMARIZE_MODEL, diff --git a/app/utils/hooks.ts b/app/utils/hooks.ts index f7f1385e07e..b3b7269274e 100644 --- a/app/utils/hooks.ts +++ b/app/utils/hooks.ts @@ -1,6 +1,6 @@ import { useMemo } from "react"; import { useAccessStore, useAppConfig } from "../store"; -import { collectModels, collectModelsWithDefaultModel } from "./model"; +import { collectModelsWithDefaultModel } from "./model"; export function useAllModels() { const accessStore = useAccessStore(); From 68b60e82baf1f657c0a2760583ce6b4149758656 Mon Sep 17 00:00:00 2001 From: LiuElric Date: Thu, 18 Jul 2024 17:09:32 +0800 Subject: [PATCH 3/8] Add ent cover --- docs/images/ent.svg | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 docs/images/ent.svg diff --git a/docs/images/ent.svg b/docs/images/ent.svg new file mode 100644 index 00000000000..749d66743e7 --- /dev/null +++ b/docs/images/ent.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From ed16c2c18d6a34a21f1b74bfa292640caa7d7049 Mon Sep 17 00:00:00 2001 From: LiuElric Date: Thu, 18 Jul 2024 17:20:47 +0800 Subject: [PATCH 4/8] Update README.md Add enterprise version description --- README.md | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 24967c16403..9cbe756d8a6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
-icon +icon

NextChat (ChatGPT Next Web)

@@ -14,9 +14,9 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4 [![MacOS][MacOS-image]][download-url] [![Linux][Linux-image]][download-url] -[Web App](https://app.nextchat.dev/) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Twitter](https://twitter.com/NextChatDev) +[Web App](https://app.nextchat.dev/) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Enterprise Edition](#enterprise-edition) / [Twitter](https://twitter.com/NextChatDev) -[网页版](https://app.nextchat.dev/) / [客户端](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [反馈](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) +[网页版](https://app.nextchat.dev/) / [客户端](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [企业版](#%E4%BC%81%E4%B8%9A%E7%89%88) /[反馈](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) [web-url]: https://app.nextchat.dev/ [download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases @@ -25,15 +25,37 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4 [MacOS-image]: https://img.shields.io/badge/-MacOS-black?logo=apple [Linux-image]: https://img.shields.io/badge/-Linux-333?logo=ubuntu -[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) +[Deploy on Zeabur](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [Deploy on Zeabur](https://zeabur.com/templates/ZBUEFA) [Open in Gitpod](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) -[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/ZBUEFA) +
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) +## Enterprise Edition -![cover](./docs/images/cover.png) +Meeting Your Company's Private Deployment and Customization Needs: +- **Brand Customization**: Tailored VI/UI to seamlessly align with your corporate brand image. +- **Resource Integration**: Unified configuration and management of dozens of AI resources by company administrators, ready for use by team members. +- **Permission Control**: Clearly defined member permissions, resource permissions, and knowledge base permissions, all controlled via a corporate-grade Admin Panel. +- **Knowledge Integration**: Combining your internal knowledge base with AI capabilities, making it more relevant to your company's specific business needs compared to general AI. +- **Security Auditing**: Automatic interception of sensitive inquiries, supporting the traceability of all historical conversation records, ensuring AI adheres to your company’s information security standards. +- **Private Deployment**: Enterprise-grade private deployment supporting various mainstream private cloud deployments, ensuring data security and privacy protection. +- **Continuous Updates**: Provision of continuous updates and upgrades for cutting-edge capabilities such as multimodal and intelligent agents, ensuring frequent innovation and sustained advancement. - +For enterprise inquiries, please contact: **business@nextchat.dev** + +## 企业版 + +满足您公司私有化部署和定制需求 +- **品牌定制**：企业量身定制 VI/UI，与企业品牌形象无缝契合 +- **资源集成**：由企业管理人员统一配置和管理数十种 AI 资源，团队成员开箱即用 +- **权限管理**：成员权限、资源权限、知识库权限层级分明，企业级 Admin Panel 统一控制 +- **知识接入**：企业内部知识库与 AI 能力相结合，比通用 AI 更贴近企业自身业务需求 +- **安全审计**：自动拦截敏感提问，支持追溯全部历史对话记录，让 AI 也能遵循企业信息安全规范 +- **私有部署**：企业级私有部署，支持各类主流私有云部署，确保数据安全和隐私保护 +- **持续更新**：提供多模态、智能体等前沿能力持续更新升级服务，常用常新、持续先进 + +企业版咨询: **business@nextchat.dev** + + ## Features From d8872d48b382fd5d60abf91252f93fe71e85bb21 Mon Sep 17 00:00:00 2001 From: LiuElric Date: Thu, 18 Jul 2024 17:30:56 +0800 Subject: [PATCH 5/8] Update README_CN.md Added Chinese introduction to enterprise edition --- README_CN.md | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/README_CN.md b/README_CN.md index 5400bb276fa..10cf33dd8b7 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,21 +1,30 @@
-预览 +预览

NextChat

一键免费部署你的私人 ChatGPT 网页应用，支持 GPT3, GPT4 & Gemini Pro 模型。 -[演示 Demo](https://chat-gpt-next-web.vercel.app/) / [反馈 Issues](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) / [加入 Discord](https://discord.gg/zrhvHCr79N) +[企业版](#%E4%BC%81%E4%B8%9A%E7%89%88) /[演示 Demo](https://chat-gpt-next-web.vercel.app/) / [反馈 Issues](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) / [加入 Discord](https://discord.gg/zrhvHCr79N) -[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FYidadaa%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=chatgpt-next-web&repository-name=ChatGPT-Next-Web) +[Deploy on Zeabur](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2FChatGPTNextWeb%2FChatGPT-Next-Web&env=OPENAI_API_KEY&env=CODE&project-name=nextchat&repository-name=NextChat) [Deploy on Zeabur](https://zeabur.com/templates/ZBUEFA) [Open in Gitpod](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) -[![Deploy on Zeabur](https://zeabur.com/button.svg)](https://zeabur.com/templates/ZBUEFA) +
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Yidadaa/ChatGPT-Next-Web) +## 企业版 -![主界面](./docs/images/cover.png) +满足您公司私有化部署和定制需求 +- **品牌定制**：企业量身定制 VI/UI，与企业品牌形象无缝契合 +- **资源集成**：由企业管理人员统一配置和管理数十种 AI 资源，团队成员开箱即用 +- **权限管理**：成员权限、资源权限、知识库权限层级分明，企业级 Admin Panel 统一控制 +- **知识接入**：企业内部知识库与 AI 能力相结合，比通用 AI 更贴近企业自身业务需求 +- **安全审计**：自动拦截敏感提问，支持追溯全部历史对话记录，让 AI 也能遵循企业信息安全规范 +- **私有部署**：企业级私有部署，支持各类主流私有云部署，确保数据安全和隐私保护 +- **持续更新**：提供多模态、智能体等前沿能力持续更新升级服务，常用常新、持续先进 - +企业版咨询: **business@nextchat.dev** + + ## 开始使用 @@ -25,6 +34,12 @@ 3. 部署完毕后，即可开始使用； 4. （可选）[绑定自定义域名](https://vercel.com/docs/concepts/projects/domains/add-a-domain)：Vercel 分配的域名 DNS 在某些区域被污染了，绑定自定义域名即可直连。 +
+ +![主界面](./docs/images/cover.png) + +
+ ## 保持更新 如果你按照上述步骤一键部署了自己的项目，可能会发现总是提示“存在更新”的问题，这是由于 Vercel 会默认为你创建一个新项目而不是 fork 本项目，这会导致无法正确地检测更新。 From d4a87c561a26887974c71d7032ee5190b9d13bc2 Mon Sep 17 00:00:00 2001 From: LiuElric Date: Thu, 18 Jul 2024 17:34:27 +0800 Subject: [PATCH 6/8] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 9cbe756d8a6..b11f15e9b56 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,12 @@ For enterprise inquiries, please contact: **business@nextchat.dev** - Automatically compresses chat history to support long conversations while also saving your tokens - I18n: English, 简体中文, 繁体中文, 日本語, Français, Español, Italiano, Türkçe, Deutsch, Tiếng Việt, Русский, Čeština, 한국어, Indonesia +
+ +![主界面](./docs/images/cover.png) + +
+ ## Roadmap - [x] System Prompt: pin a user defined prompt as system prompt [#138](https://github.com/Yidadaa/ChatGPT-Next-Web/issues/138) From f654629c6a61f9928d22dae5bfdeede2b362ab85 Mon Sep 17 00:00:00 2001 From: LiuElric Date: Thu, 18 Jul 2024 17:37:47 +0800 Subject: [PATCH 7/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b11f15e9b56..eccd2d253cc 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4 [Web App](https://app.nextchat.dev/) / [Desktop App](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [Discord](https://discord.gg/YCkeafCafC) / [Enterprise Edition](#enterprise-edition) / [Twitter](https://twitter.com/NextChatDev) -[网页版](https://app.nextchat.dev/) / [客户端](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [企业版](#%E4%BC%81%E4%B8%9A%E7%89%88) /[反馈](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) +[网页版](https://app.nextchat.dev/) / [客户端](https://github.com/Yidadaa/ChatGPT-Next-Web/releases) / [企业版](#%E4%BC%81%E4%B8%9A%E7%89%88) / [反馈](https://github.com/Yidadaa/ChatGPT-Next-Web/issues) [web-url]: https://app.nextchat.dev/ [download-url]: https://github.com/Yidadaa/ChatGPT-Next-Web/releases From fc8c7ef18d0d0d4749bfce9d188a17faaaaa2486 Mon Sep 17 00:00:00 2001 From: yaway Date: Thu, 18 Jul 2024 17:56:37 +0800 Subject: [PATCH 8/8] Update README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index eccd2d253cc..4aa09273074 100644 --- a/README.md +++ b/README.md @@ -31,20 +31,20 @@ One-Click to get a well-designed cross-platform ChatGPT web UI, with GPT3, GPT4 ## Enterprise Edition -Meeting Your Company's Private Deployment and Customization Needs: +Meeting Your Company's Privatization and Customization Deployment Requirements: - **Brand Customization**: Tailored VI/UI to seamlessly align with your corporate brand image. - **Resource Integration**: Unified configuration and management of dozens of AI resources by company administrators, ready for use by team members. - **Permission Control**: Clearly defined member permissions, resource permissions, and knowledge base permissions, all controlled via a corporate-grade Admin Panel. - **Knowledge Integration**: Combining your internal knowledge base with AI capabilities, making it more relevant to your company's specific business needs compared to general AI. -- **Security Auditing**: Automatic interception of sensitive inquiries, supporting the traceability of all historical conversation records, ensuring AI adheres to your company’s information security standards. -- **Private Deployment**: Enterprise-grade private deployment supporting various mainstream private cloud deployments, ensuring data security and privacy protection. -- **Continuous Updates**: Provision of continuous updates and upgrades for cutting-edge capabilities such as multimodal and intelligent agents, ensuring frequent innovation and sustained advancement. +- **Security Auditing**: Automatically intercept sensitive inquiries and trace all historical conversation records, ensuring AI adherence to corporate information security standards. +- **Private Deployment**: Enterprise-level private deployment supporting various mainstream private cloud solutions, ensuring data security and privacy protection. +- **Continuous Updates**: Ongoing updates and upgrades in cutting-edge capabilities like multimodal AI, ensuring consistent innovation and advancement. For enterprise inquiries, please contact: **business@nextchat.dev** ## 企业版 -满足您公司私有化部署和定制需求 +满足企业用户私有化部署和个性化定制需求： - **品牌定制**：企业量身定制 VI/UI，与企业品牌形象无缝契合 - **资源集成**：由企业管理人员统一配置和管理数十种 AI 资源，团队成员开箱即用 - **权限管理**：成员权限、资源权限、知识库权限层级分明，企业级 Admin Panel 统一控制