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/app/components/chat.tsx b/app/components/chat.tsx index cfe0cb1a7..f890c6dae 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() {
+ {/**/} +
+
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ ); +} 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 dd738647c..0d00c6324 100755 --- a/start.sh +++ b/start.sh @@ -10,7 +10,9 @@ yarn config delete sharp_binary_host yarn config delete sharp_libvips_binary_host #yarn cache clean -yarn install +#yarn install +npm i cnpm +cnpm i yarn run build mkdir -p "./node_modules/tiktoken"