Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Hk-Gosuto committed Oct 13, 2023
2 parents e95242a + 06e043d commit 3454ea3
Show file tree
Hide file tree
Showing 17 changed files with 164 additions and 4 deletions.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,6 @@ Cloudflare R2 Bucket 名称,使用 `DALL-E` 插件时需要配置。
> ⚠️ 注意:docker 版本在大多数时间都会落后最新的版本 1 到 2 天,所以部署后会持续出现“存在更新”的提示,属于正常现象。
```shell
docker pull gosuto/chatgpt-next-web-langchain

docker run -d -p 3000:3000 \
-e OPENAI_API_KEY="sk-xxxx" \
-e CODE="页面访问密码" \
Expand All @@ -231,6 +229,11 @@ docker run -d -p 3000:3000 \

如果你需要指定其他环境变量,请自行在上述命令中增加 `-e 环境变量=环境变量值` 来指定。

## 同步聊天记录(UpStash)

| [简体中文](./docs/synchronise-chat-logs-cn.md) | [English](./docs/synchronise-chat-logs-en.md) | [Italiano](./docs/synchronise-chat-logs-es.md) | [日本語](./docs/synchronise-chat-logs-ja.md) | [한국어](./docs/synchronise-chat-logs-ko.md)


## 贡献者

<a href="https://github.com/Hk-Gosuto/ChatGPT-Next-Web-LangChain/graphs/contributors">
Expand Down
1 change: 1 addition & 0 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s

⚠️ 注意:如果你安装过程中遇到了问题,请使用 docker 部署。


## 鸣谢

### 捐赠者
Expand Down
1 change: 1 addition & 0 deletions README_KO.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ bash <(curl -s https://raw.githubusercontent.com/Yidadaa/ChatGPT-Next-Web/main/s

⚠️ 주의: 설치 중 문제가 발생한 경우, docker로 배포하세요.


## 감사의 말

### 기부자
Expand Down
2 changes: 1 addition & 1 deletion app/constant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const FETCH_COMMIT_URL = `https://api.github.com/repos/${OWNER}/${REPO}/c
export const FETCH_TAG_URL = `https://api.github.com/repos/${OWNER}/${REPO}/tags?per_page=1`;
export const RUNTIME_CONFIG_DOM = "danger-runtime-config";

export const DEFAULT_CORS_HOST = "https://nb.nextweb.fun";
export const DEFAULT_CORS_HOST = "https://ab.nextweb.fun";
export const DEFAULT_API_HOST = `${DEFAULT_CORS_HOST}/api/proxy`;

export enum Path {
Expand Down
2 changes: 1 addition & 1 deletion app/masks/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const EN_MASKS: BuiltinMask[] = [
id: "prompt-improve-0",
role: "user",
content:
'Read all of the instructions below and once you understand them say "Shall we begin:"\n \nI want you to become my Prompt Creator. Your goal is to help me craft the best possible prompt for my needs. The prompt will be used by you, ChatGPT. You will follow the following process:\nYour first response will be to ask me what the prompt should be about. I will provide my answer, but we will need to improve it through continual iterations by going through the next steps.\n \nBased on my input, you will generate 3 sections.\n \nRevised Prompt (provide your rewritten prompt. it should be clear, concise, and easily understood by you)\nSuggestions (provide 3 suggestions on what details to include in the prompt to improve it)\nQuestions (ask the 3 most relevant questions pertaining to what additional information is needed from me to improve the prompt)\n \nAt the end of these sections give me a reminder of my options which are:\n \nOption 1: Read the output and provide more info or answer one or more of the questions\nOption 2: Type "Use this prompt" and I will submit this as a query for you\nOption 3: Type "Restart" to restart this process from the beginning\nOption 4: Type "Quit" to end this script and go back to a regular ChatGPT session\n \nIf I type "Option 2", "2" or "Use this prompt" then we have finsihed and you should use the Revised Prompt as a prompt to generate my request\nIf I type "option 3", "3" or "Restart" then forget the latest Revised Prompt and restart this process\nIf I type "Option 4", "4" or "Quit" then finish this process and revert back to your general mode of operation\n\n\nWe will continue this iterative process with me providing additional information to you and you updating the prompt in the Revised Prompt section until it is complete.',
'Read all of the instructions below and once you understand them say "Shall we begin:"\n \nI want you to become my Prompt Creator. Your goal is to help me craft the best possible prompt for my needs. The prompt will be used by you, ChatGPT. You will follow the following process:\nYour first response will be to ask me what the prompt should be about. I will provide my answer, but we will need to improve it through continual iterations by going through the next steps.\n \nBased on my input, you will generate 3 sections.\n \nRevised Prompt (provide your rewritten prompt. it should be clear, concise, and easily understood by you)\nSuggestions (provide 3 suggestions on what details to include in the prompt to improve it)\nQuestions (ask the 3 most relevant questions pertaining to what additional information is needed from me to improve the prompt)\n \nAt the end of these sections give me a reminder of my options which are:\n \nOption 1: Read the output and provide more info or answer one or more of the questions\nOption 2: Type "Use this prompt" and I will submit this as a query for you\nOption 3: Type "Restart" to restart this process from the beginning\nOption 4: Type "Quit" to end this script and go back to a regular ChatGPT session\n \nIf I type "Option 2", "2" or "Use this prompt" then we have finished and you should use the Revised Prompt as a prompt to generate my request\nIf I type "option 3", "3" or "Restart" then forget the latest Revised Prompt and restart this process\nIf I type "Option 4", "4" or "Quit" then finish this process and revert back to your general mode of operation\n\n\nWe will continue this iterative process with me providing additional information to you and you updating the prompt in the Revised Prompt section until it is complete.',
date: "",
},
{
Expand Down
Binary file added docs/images/upstash-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/upstash-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions docs/synchronise-chat-logs-cn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# 同步聊天记录(upStash)
## 准备工作
- GitHub账号
- 拥有自己搭建过的ChatGPT-Next-Web的服务器
- [UpStash](https://upstash.com)

## 开始教程
1. 注册UpStash账号
2. 创建数据库

![注册登录](./images/upstash-1.png)

![创建数据库](./images/upstash-2.png)

![选择服务器](./images/upstash-3.png)

3. 找到REST API,分别复制UPSTASH_REDIS_REST_URL和UPSTASH_REDIS_REST_TOKEN(⚠切记⚠:不要泄露Token!)

![复制](./images/upstash-4.png)

4. UPSTASH_REDIS_REST_URL和UPSTASH_REDIS_REST_TOKEN复制到你的同步配置,点击**检查可用性**

![同步1](./images/upstash-5.png)

如果没什么问题,那就成功了

![同步可用性完成的样子](./images/upstash-6.png)

5. Success!

![好耶~](./images/upstash-7.png)
31 changes: 31 additions & 0 deletions docs/synchronise-chat-logs-en.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Synchronize Chat Logs with UpStash
## Prerequisites
- GitHub account
- Your own ChatGPT-Next-Web server set up
- [UpStash](https://upstash.com)

## Getting Started
1. Register for an UpStash account.
2. Create a database.

![Register and Login](./images/upstash-1.png)

![Create Database](./images/upstash-2.png)

![Select Server](./images/upstash-3.png)

3. Find the REST API and copy UPSTASH_REDIS_REST_URL and UPSTASH_REDIS_REST_TOKEN (⚠Important⚠: Do not share your token!)

![Copy](./images/upstash-4.png)

4. Copy UPSTASH_REDIS_REST_URL and UPSTASH_REDIS_REST_TOKEN into your synchronization configuration, then click **Check Availability**.

![Synchronize 1](./images/upstash-5.png)

If everything is in order, you've successfully completed this step.

![Sync Availability Check Completed](./images/upstash-6.png)

5. Success!

![Great job~!](./images/upstash-7.png)
31 changes: 31 additions & 0 deletions docs/synchronise-chat-logs-es.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Sincronizzare i Log delle Chat con UpStash
## Prerequisiti
- Account GitHub
- Server ChatGPT-Next-Web di propria configurazione
- [UpStash](https://upstash.com)

## Per iniziare
1. Registrarsi per un account UpStash.
2. Creare un database.

![Registrarsi ed Accedere](./images/upstash-1.png)

![Creare un Database](./images/upstash-2.png)

![Selezionare il Server](./images/upstash-3.png)

3. Trovare l'API REST e copiare UPSTASH_REDIS_REST_URL e UPSTASH_REDIS_REST_TOKEN (⚠Importante⚠: Non condividere il token!)

![Copia](./images/upstash-4.png)

4. Copiare UPSTASH_REDIS_REST_URL e UPSTASH_REDIS_REST_TOKEN nella configurazione di sincronizzazione, quindi fare clic su **Verifica la Disponibilità**.

![Sincronizzazione 1](./images/upstash-5.png)

Se tutto è in ordine, hai completato con successo questa fase.

![Verifica la Disponibilità della Sincronizzazione Completata](./images/upstash-6.png)

5. Successo!

![Ottimo lavoro~!](./images/upstash-7.png)
31 changes: 31 additions & 0 deletions docs/synchronise-chat-logs-ja.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# UpStashを使用してチャットログを同期する
## 事前準備
- GitHubアカウント
- 自分自身でChatGPT-Next-Webのサーバーをセットアップしていること
- [UpStash](https://upstash.com)

## 始める
1. UpStashアカウントを登録します。
2. データベースを作成します。

![登録とログイン](./images/upstash-1.png)

![データベースの作成](./images/upstash-2.png)

![サーバーの選択](./images/upstash-3.png)

3. REST APIを見つけ、UPSTASH_REDIS_REST_URLとUPSTASH_REDIS_REST_TOKENをコピーします(⚠重要⚠:トークンを共有しないでください!)

![コピー](./images/upstash-4.png)

4. UPSTASH_REDIS_REST_URLとUPSTASH_REDIS_REST_TOKENを同期設定にコピーし、次に「可用性を確認」をクリックします。

![同期1](./images/upstash-5.png)

すべてが正常であれば、このステップは成功です。

![同期可用性チェックが完了しました](./images/upstash-6.png)

5. 成功!

![お疲れ様でした~](./images/upstash-7.png)
31 changes: 31 additions & 0 deletions docs/synchronise-chat-logs-ko.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# UpStash를 사용하여 채팅 기록 동기화
## 사전 준비물
- GitHub 계정
- 자체 ChatGPT-Next-Web 서버 설정
- [UpStash](https://upstash.com)

## 시작하기
1. UpStash 계정 등록
2. 데이터베이스 생성

![등록 및 로그인](./images/upstash-1.png)

![데이터베이스 생성](./images/upstash-2.png)

![서버 선택](./images/upstash-3.png)

3. REST API를 찾아 UPSTASH_REDIS_REST_URL 및 UPSTASH_REDIS_REST_TOKEN을 복사합니다 (⚠주의⚠: 토큰을 공유하지 마십시오!)

![복사](./images/upstash-4.png)

4. UPSTASH_REDIS_REST_URL 및 UPSTASH_REDIS_REST_TOKEN을 동기화 구성에 복사한 다음 **가용성 확인**을 클릭합니다.

![동기화 1](./images/upstash-5.png)

모든 것이 정상인 경우,이 단계를 성공적으로 완료했습니다.

![동기화 가용성 확인 완료](./images/upstash-6.png)

5. 성공!

![잘 했어요~!](./images/upstash-7.png)

0 comments on commit 3454ea3

Please sign in to comment.