From 963d34be6f0dcfd8ea818e179a60398c55f18e6a Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 13 Apr 2024 19:30:15 +0800 Subject: [PATCH 1/6] opti --- start.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/start.sh b/start.sh index dd738647c..fa4c01e70 100755 --- a/start.sh +++ b/start.sh @@ -10,6 +10,9 @@ yarn config delete sharp_binary_host yarn config delete sharp_libvips_binary_host #yarn cache clean +# sharp +yarn add sharp + yarn install yarn run build From 1ad4fd9f38786b7bb475a9a14c58b9f2da8a2635 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 13 Apr 2024 19:45:07 +0800 Subject: [PATCH 2/6] opti --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index fa4c01e70..6bfd086b8 100755 --- a/start.sh +++ b/start.sh @@ -11,7 +11,7 @@ yarn config delete sharp_libvips_binary_host #yarn cache clean # sharp -yarn add sharp +yarn global add sharp yarn install yarn run build From 6406ffe9a33260a49c5df0061091918e8b152878 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 13 Apr 2024 20:09:08 +0800 Subject: [PATCH 3/6] optimize --- .github/workflows/dockerToHub-dev.yml | 8 ++++---- .github/workflows/dockerToHub.yml | 4 ++-- package.json | 1 + start.sh | 7 +++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dockerToHub-dev.yml b/.github/workflows/dockerToHub-dev.yml index bfbc8021a..053e289b1 100644 --- a/.github/workflows/dockerToHub-dev.yml +++ b/.github/workflows/dockerToHub-dev.yml @@ -72,8 +72,8 @@ jobs: docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns docker-compose pull && docker-compose up -d yes | docker image prune - rm -rf /www/server/nginx/proxy_cache_dir/* - rm -rf /www/server/nginx/proxy_temp_dir/* + rm -rf /www/server/nginx/proxy_cache_dir/* || true + rm -rf /www/server/nginx/proxy_temp_dir/* || true - name: Sync repository to xy-nm @@ -103,7 +103,7 @@ jobs: docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns docker-compose pull && docker-compose up -d yes | docker image prune - rm -rf /www/server/nginx/proxy_cache_dir/* - rm -rf /www/server/nginx/proxy_temp_dir/* + rm -rf /www/server/nginx/proxy_cache_dir/* || true + rm -rf /www/server/nginx/proxy_temp_dir/* || true diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml index 69c473933..fdb730139 100644 --- a/.github/workflows/dockerToHub.yml +++ b/.github/workflows/dockerToHub.yml @@ -73,8 +73,8 @@ jobs: docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns docker-compose pull && docker-compose up -d yes | docker image prune - rm -rf /www/server/nginx/proxy_cache_dir/* - rm -rf /www/server/nginx/proxy_temp_dir/* + rm -rf /www/server/nginx/proxy_cache_dir/* || true + rm -rf /www/server/nginx/proxy_temp_dir/* || true sleep 2 #tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete deploy-ty: diff --git a/package.json b/package.json index d6140e629..4baeb9bf1 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "remark-gfm": "^4.0.0", "remark-math": "^6.0.0", "sass": "^1.70.0", + "sharp": "^0.33.3", "spark-md5": "^3.0.2", "tailwind-merge": "^2.2.1", "tiktoken": "^1.0.13", diff --git a/start.sh b/start.sh index 6bfd086b8..272a992a8 100755 --- a/start.sh +++ b/start.sh @@ -10,10 +10,9 @@ yarn config delete sharp_binary_host yarn config delete sharp_libvips_binary_host #yarn cache clean -# sharp -yarn global add sharp - -yarn install +#yarn install +npm i -g cnpm +cnpm i yarn run build mkdir -p "./node_modules/tiktoken" From e16d5410d803c975a615e292490255f9cf39c7e0 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Sat, 13 Apr 2024 20:10:24 +0800 Subject: [PATCH 4/6] optimize --- start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/start.sh b/start.sh index 272a992a8..0d00c6324 100755 --- a/start.sh +++ b/start.sh @@ -11,7 +11,7 @@ yarn config delete sharp_libvips_binary_host #yarn cache clean #yarn install -npm i -g cnpm +npm i cnpm cnpm i yarn run build From 1579d1003a2920716f5b950e737fe47d6529a8d6 Mon Sep 17 00:00:00 2001 From: sijinhui Date: Tue, 16 Apr 2024 13:20:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/chat.tsx | 5 +- app/components/exporter.module.scss | 2 +- app/components/gpt-prompts.module.scss | 8 ++ app/components/gpt-prompts.tsx | 162 +++++++++++++++++++++++++ 4 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 app/components/gpt-prompts.module.scss create mode 100644 app/components/gpt-prompts.tsx diff --git a/app/components/chat.tsx b/app/components/chat.tsx index cfe0cb1a7..46caadf6b 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -102,8 +102,8 @@ import Image from "next/image"; import { useAllModels } from "../utils/hooks"; import { MultimodalContent } from "../client/api"; import { getTokenLength } from "@/lib/utils"; -import VoiceInput from "@/app/components/voice-input"; - +import VoiceInput from "./voice-input"; +import GptPrompts from "./gpt-prompts"; // const VoiceInput = dynamic( // () => import('@/app/components/voice-input'), { ssr: false }); @@ -1636,6 +1636,7 @@ function _Chat() {
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ ); +} From 9afa9057c8cc7b26d142da12de8916908779fc3d Mon Sep 17 00:00:00 2001 From: sijinhui Date: Tue, 16 Apr 2024 13:48:30 +0800 Subject: [PATCH 6/6] add mask --- app/components/chat.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 46caadf6b..f890c6dae 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -103,7 +103,7 @@ import { useAllModels } from "../utils/hooks"; import { MultimodalContent } from "../client/api"; import { getTokenLength } from "@/lib/utils"; import VoiceInput from "./voice-input"; -import GptPrompts from "./gpt-prompts"; +// import GptPrompts from "./gpt-prompts"; // const VoiceInput = dynamic( // () => import('@/app/components/voice-input'), { ssr: false }); @@ -1636,7 +1636,7 @@ function _Chat() {
- + {/**/}