diff --git a/.github/workflows/dockerToHub.yml b/.github/workflows/dockerToHub.yml index ffeadb40e..07fc4cf23 100644 --- a/.github/workflows/dockerToHub.yml +++ b/.github/workflows/dockerToHub.yml @@ -72,7 +72,7 @@ jobs: rm -rf /www/server/nginx/proxy_cache_dir/* rm -rf /www/server/nginx/proxy_temp_dir/* 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 - name: Sync repository to ty run: | yes | docker image prune @@ -98,7 +98,7 @@ jobs: rm -rf /www/server/nginx/proxy_cache_dir/* rm -rf /www/server/nginx/proxy_temp_dir/* 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 - name: Sync repository to tx run: | yes | docker image prune diff --git a/app/constant.ts b/app/constant.ts index 08774c616..d81126efb 100644 --- a/app/constant.ts +++ b/app/constant.ts @@ -131,6 +131,7 @@ export const GEMINI_SUMMARIZE_MODEL = "gemini-pro"; export const KnowledgeCutOffDate: Record = { default: "2021-09", + "gpt-4-turbo": "2023-12", "gpt-4-turbo-preview": "2023-12", "gpt-4-1106-preview": "2023-04", "gpt-4-0125-preview": "2023-12", @@ -160,6 +161,24 @@ export const DEFAULT_MODELS = [ providerType: "openai", }, }, + { + name: "gpt-4-turbo", + available: true, + provider: { + id: "openai", + providerName: "OpenAI", + providerType: "openai", + }, + }, + { + name: "gpt-4-turbo-2024-04-09", + available: true, + provider: { + id: "openai", + providerName: "OpenAI", + providerType: "openai", + }, + }, // { // name: "gpt-4", // describe: "GPT-4,聪明,贵,慢", diff --git a/app/utils.ts b/app/utils.ts index 2745f5ca2..5e910e2c6 100644 --- a/app/utils.ts +++ b/app/utils.ts @@ -290,8 +290,11 @@ export function getMessageImages(message: RequestMessage): string[] { } export function isVisionModel(model: string) { - // Note: This is a better way using the TypeScript feature instead of `&&` or `||` (ts v5.5.0-dev.20240314 I've been using) const visionKeywords = ["vision", "claude-3"]; + const isGpt4Turbo = + model.includes("gpt-4-turbo") && !model.includes("preview"); - return visionKeywords.some((keyword) => model.includes(keyword)); + return ( + visionKeywords.some((keyword) => model.includes(keyword)) || isGpt4Turbo + ); }