Merge pull request #125 from sijinhui/dev

Dev

.github/workflows/dockerToHub.yml

@@ -34,16 +34,16 @@ jobs:
           docker-compose build
           docker-compose push
           #yes | docker system prune --filter "until=168h"
-  download-repo:
+#  download-repo:
-    name: 下载仓库
+#    name: 下载仓库
-    needs: build
+#    needs: build
-    runs-on: self
+#    runs-on: self
-    steps:
+#    steps:
-      - name: Check out the repo
+#      - name: Check out the repo
-        uses: actions/checkout@v4
+#        uses: actions/checkout@v4
-        with:
+#        with:
-          clean: true
+#          clean: true
-          github-server-url: 'https://gh.sivpn.cn'
+#          github-server-url: 'https://gh.sivpn.cn'
 #  deploy-nm:
 #    name: 部署到内蒙服务器
 #    needs: download-repo
@@ -79,38 +79,38 @@ jobs:
 #            sleep 2
 #            #tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete
 
-  deploy-bk-uiyj:
+#  deploy-bk-uiyj:
-    name: 部署到十堰服务器
+#    name: 部署到十堰服务器
-    needs: download-repo
+#    needs: download-repo
-    runs-on: self
+#    runs-on: self
-    steps:
+#    steps:
-      - name: Set up SSH key
+#      - name: Set up SSH key
-        uses: webfactory/ssh-agent@v0.9.0
+#        uses: webfactory/ssh-agent@v0.9.0
-        with:
+#        with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
+#          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-      - name: Sync repository to uiyj
+#      - name: Sync repository to uiyj
-        run: |
+#        run: |
-          #sudo apt-get update && sudo apt-get install -y rsync
+#          #sudo apt-get update && sudo apt-get install -y rsync
-          ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.UIYJ_SSH_IP }} 'mkdir -p /data/ChatGPT-Next-Web'
+#          ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }} root@${{ secrets.UIYJ_SSH_IP }} 'mkdir -p /data/ChatGPT-Next-Web'
-          /usr/bin/rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/ChatGPT-Next-Web/
+#          /usr/bin/rsync -az -e 'ssh -o StrictHostKeyChecking=no -p${{ secrets.SSH_PORT }}' --delete $GITHUB_WORKSPACE/ root@${{ secrets.UIYJ_SSH_IP }}:/data/ChatGPT-Next-Web/
-      - name: deploy-to-uiyj
+#      - name: deploy-to-uiyj
-        uses: appleboy/ssh-action@master
+#        uses: appleboy/ssh-action@master
-        env:
+#        env:
-          SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量
+#          SERVER_WORKDIR: ${{ secrets.SERVER_WORKDIR }} #传递工作目录变量
-        with:
+#        with:
-          host: ${{ secrets.UIYJ_SSH_IP }} #服务器地址
+#          host: ${{ secrets.UIYJ_SSH_IP }} #服务器地址
-          username: root #用户名
+#          username: root #用户名
-          port: ${{ secrets.SSH_PORT }}
+#          port: ${{ secrets.SSH_PORT }}
-          key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！
+#          key: ${{ secrets.SSH_PRIVATE_KEY }} #私钥 安全问题一定都以变量的方式传递！！！
-          envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量
+#          envs: SERVER_WORKDIR,ALY_DOCKER_PASSWORD,ALY_DOCKER_USERNAME,DOCKER_ENV #使用工作目录变量
-          script: |
+#          script: |
-            cd $SERVER_WORKDIR #进入到工作目录
+#            cd $SERVER_WORKDIR #进入到工作目录
-            echo "${{ secrets.DOCKER_ENV }}" > .env
+#            echo "${{ secrets.DOCKER_ENV }}" > .env
-            echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
+#            echo ${{ secrets.ALY_DOCKER_PASSWORD }} | docker login registry.cn-hangzhou.aliyuncs.com -u ${{ secrets.ALY_DOCKER_USERNAME }} --password-stdin
-            docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
+#            docker network ls | grep -qw chatgpt-ns || docker network create chatgpt-ns
-            docker-compose pull && docker-compose up -d
+#            docker-compose pull && docker-compose up -d
-            #yes | docker image prune
+#            #yes | docker image prune
-            rm -rf /www/server/nginx/proxy_cache_dir/* || true
+#            rm -rf /www/server/nginx/proxy_cache_dir/* || true
-            rm -rf /www/server/nginx/proxy_temp_dir/* || true
+#            rm -rf /www/server/nginx/proxy_temp_dir/* || true
-            sleep 2
+#            sleep 2
-            tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete
+#            tccli cdn PurgePathCache --cli-unfold-argument --Paths '${{ secrets.WEB_URL }}' --FlushType delete

app/client/platforms/google.ts

@@ -1,4 +1,4 @@
-import { Google, REQUEST_TIMEOUT_MS } from "@/app/constant";
+import { Google, REQUEST_TIMEOUT_MS, ApiPath } from "@/app/constant";
 import { ChatOptions, getHeaders, LLMApi, LLMModel, LLMUsage } from "../api";
 import { useAccessStore, useAppConfig, useChatStore } from "@/app/store";
 import { getClientConfig } from "@/app/config/client";
@@ -110,7 +110,7 @@ export class GeminiProApi implements LLMApi {
 
     const accessStore = useAccessStore.getState();
 
-    let baseUrl = "";
+    let baseUrl: string = ApiPath.Google;
 
     if (accessStore.useCustomConfig) {
       baseUrl = accessStore.googleUrl;

app/client/platforms/openai.ts

@@ -173,6 +173,7 @@ export class ChatGPTApi implements LLMApi {
       } else {
         chatPath = this.path(OpenaiPath.ChatPath);
       }
+      // console.log('333333', chatPath)
       const chatPayload = {
         method: "POST",
         body: JSON.stringify(requestPayload),

app/store/chat.ts

@@ -706,7 +706,9 @@ export const useChatStore = createPersistStore(
           set(() => ({}));
           extAttr?.setAutoScroll(true);
         } else {
-          const api: ClientApi = getClientApi(modelConfig.providerName);
+          const api: ClientApi = getClientApi(modelConfig.providerName)
+          // console.log('-------', modelConfig, '-----', api)
+
           // make request
           api.llm.chat({
             messages: sendMessages,