From b04aab460214ead8ee4f0b8618836b59b2d0a9dc Mon Sep 17 00:00:00 2001 From: Yaner <1468275133@qq.com> Date: Wed, 11 Sep 2024 10:20:42 +0800 Subject: [PATCH 1/5] Update OpenAI models --- server/utils/helpers/customModels.js | 113 +++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/server/utils/helpers/customModels.js b/server/utils/helpers/customModels.js index 27afa150f5a..590f15ea021 100644 --- a/server/utils/helpers/customModels.js +++ b/server/utils/helpers/customModels.js @@ -113,6 +113,119 @@ async function openAiModels(apiKey = null) { owned_by: "openai-internal", organization: "OpenAi", }, + { + name: "gpt-4-1106-preview", + id: "gpt-4-1106-preview", + object: "model", + created: 1698957206, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4-0125-preview", + id: "gpt-4-0125-preview", + object: "model", + created: 1706037612, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4-turbo-2024-04-09", + id: "gpt-4-turbo-2024-04-09", + object: "model", + created: 1712601677, + owned_by: "system", + organization: "OpenAi", + + }, + { + name: "gpt-4-turbo-preview", + id: "gpt-4-turbo-preview", + object: "model", + created: 1706037777, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-3.5-turbo-0125", + id: "gpt-3.5-turbo-0125", + object: "model", + created: 1706048358, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4o-mini", + id: "gpt-4o-mini", + object: "model", + created: 1721172741, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4o-mini-2024-07-18", + id: "gpt-4o-mini-2024-07-18", + object: "model", + created: 1721172717, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-3.5-turbo-1106", + id: "gpt-3.5-turbo-1106", + object: "model", + created: 1698959748, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "chatgpt-4o-latest", + id: "chatgpt-4o-latest", + object: "model", + created: 1723515131, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-3.5-turbo-instruct-0914", + id: "gpt-3.5-turbo-instruct-0914", + object: "model", + created: 1694122472, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4-0613", + id: "gpt-4-0613", + object: "model", + created: 1686588896, + owned_by: "openai", + organization: "OpenAi", + }, + { + name: "gpt-3.5-turbo-instruct", + id: "gpt-3.5-turbo-instruct", + object: "model", + created: 1692901427, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4o-2024-08-06", + id: "gpt-4o-2024-08-06", + object: "model", + created: 1722814719, + owned_by: "system", + organization: "OpenAi", + }, + { + name: "gpt-4o-2024-05-13", + id: "gpt-4o-2024-05-13", + object: "model", + created: 1715368132, + owned_by: "system", + organization: "OpenAi", + } ]; }); From 61b00761258bdd25d2420f8b783784f376af0c34 Mon Sep 17 00:00:00 2001 From: Yaner <1468275133@qq.com> Date: Wed, 11 Sep 2024 10:26:24 +0800 Subject: [PATCH 2/5] Sort OpenAI models by created timestamp in ascending order --- server/utils/helpers/customModels.js | 241 +++++++++++++-------------- 1 file changed, 120 insertions(+), 121 deletions(-) diff --git a/server/utils/helpers/customModels.js b/server/utils/helpers/customModels.js index 590f15ea021..c2224ea1fef 100644 --- a/server/utils/helpers/customModels.js +++ b/server/utils/helpers/customModels.js @@ -66,165 +66,164 @@ async function openAiModels(apiKey = null) { console.error(`OpenAI:listModels`, e.message); return [ { - name: "gpt-3.5-turbo", - id: "gpt-3.5-turbo", - object: "model", - created: 1677610602, - owned_by: "openai", - organization: "OpenAi", + "name": "gpt-3.5-turbo", + "id": "gpt-3.5-turbo", + "object": "model", + "created": 1677610602, + "owned_by": "openai", + "organization": "OpenAi" }, { - name: "gpt-4o", - id: "gpt-4o", - object: "model", - created: 1677610602, - owned_by: "openai", - organization: "OpenAi", + "name": "gpt-4o", + "id": "gpt-4o", + "object": "model", + "created": 1677610602, + "owned_by": "openai", + "organization": "OpenAi" }, { - name: "gpt-4", - id: "gpt-4", - object: "model", - created: 1687882411, - owned_by: "openai", - organization: "OpenAi", + "name": "gpt-3.5-turbo-16k", + "id": "gpt-3.5-turbo-16k", + "object": "model", + "created": 1683758102, + "owned_by": "openai-internal", + "organization": "OpenAi" }, { - name: "gpt-4-turbo", - id: "gpt-4-turbo", - object: "model", - created: 1712361441, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4-0613", + "id": "gpt-4-0613", + "object": "model", + "created": 1686588896, + "owned_by": "openai", + "organization": "OpenAi" }, { - name: "gpt-4-32k", - id: "gpt-4-32k", - object: "model", - created: 1687979321, - owned_by: "openai", - organization: "OpenAi", + "name": "gpt-4", + "id": "gpt-4", + "object": "model", + "created": 1687882411, + "owned_by": "openai", + "organization": "OpenAi" }, { - name: "gpt-3.5-turbo-16k", - id: "gpt-3.5-turbo-16k", - object: "model", - created: 1683758102, - owned_by: "openai-internal", - organization: "OpenAi", + "name": "gpt-4-32k", + "id": "gpt-4-32k", + "object": "model", + "created": 1687979321, + "owned_by": "openai", + "organization": "OpenAi" }, { - name: "gpt-4-1106-preview", - id: "gpt-4-1106-preview", - object: "model", - created: 1698957206, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-3.5-turbo-instruct", + "id": "gpt-3.5-turbo-instruct", + "object": "model", + "created": 1692901427, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4-0125-preview", - id: "gpt-4-0125-preview", - object: "model", - created: 1706037612, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-3.5-turbo-instruct-0914", + "id": "gpt-3.5-turbo-instruct-0914", + "object": "model", + "created": 1694122472, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4-turbo-2024-04-09", - id: "gpt-4-turbo-2024-04-09", - object: "model", - created: 1712601677, - owned_by: "system", - organization: "OpenAi", - + "name": "gpt-4-1106-preview", + "id": "gpt-4-1106-preview", + "object": "model", + "created": 1698957206, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4-turbo-preview", - id: "gpt-4-turbo-preview", - object: "model", - created: 1706037777, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-3.5-turbo-1106", + "id": "gpt-3.5-turbo-1106", + "object": "model", + "created": 1698959748, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-3.5-turbo-0125", - id: "gpt-3.5-turbo-0125", - object: "model", - created: 1706048358, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4-0125-preview", + "id": "gpt-4-0125-preview", + "object": "model", + "created": 1706037612, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4o-mini", - id: "gpt-4o-mini", - object: "model", - created: 1721172741, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4-turbo-preview", + "id": "gpt-4-turbo-preview", + "object": "model", + "created": 1706037777, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4o-mini-2024-07-18", - id: "gpt-4o-mini-2024-07-18", - object: "model", - created: 1721172717, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-3.5-turbo-0125", + "id": "gpt-3.5-turbo-0125", + "object": "model", + "created": 1706048358, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-3.5-turbo-1106", - id: "gpt-3.5-turbo-1106", - object: "model", - created: 1698959748, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4-turbo", + "id": "gpt-4-turbo", + "object": "model", + "created": 1712361441, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "chatgpt-4o-latest", - id: "chatgpt-4o-latest", - object: "model", - created: 1723515131, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4-turbo-2024-04-09", + "id": "gpt-4-turbo-2024-04-09", + "object": "model", + "created": 1712601677, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-3.5-turbo-instruct-0914", - id: "gpt-3.5-turbo-instruct-0914", - object: "model", - created: 1694122472, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4o-2024-05-13", + "id": "gpt-4o-2024-05-13", + "object": "model", + "created": 1715368132, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4-0613", - id: "gpt-4-0613", - object: "model", - created: 1686588896, - owned_by: "openai", - organization: "OpenAi", + "name": "gpt-4o-mini-2024-07-18", + "id": "gpt-4o-mini-2024-07-18", + "object": "model", + "created": 1721172717, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-3.5-turbo-instruct", - id: "gpt-3.5-turbo-instruct", - object: "model", - created: 1692901427, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4o-mini", + "id": "gpt-4o-mini", + "object": "model", + "created": 1721172741, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4o-2024-08-06", - id: "gpt-4o-2024-08-06", - object: "model", - created: 1722814719, - owned_by: "system", - organization: "OpenAi", + "name": "gpt-4o-2024-08-06", + "id": "gpt-4o-2024-08-06", + "object": "model", + "created": 1722814719, + "owned_by": "system", + "organization": "OpenAi" }, { - name: "gpt-4o-2024-05-13", - id: "gpt-4o-2024-05-13", - object: "model", - created: 1715368132, - owned_by: "system", - organization: "OpenAi", + "name": "chatgpt-4o-latest", + "id": "chatgpt-4o-latest", + "object": "model", + "created": 1723515131, + "owned_by": "system", + "organization": "OpenAi" } ]; }); From 8338b5ad21accebc8546cebf1c3449998f216dbc Mon Sep 17 00:00:00 2001 From: Yaner <1468275133@qq.com> Date: Wed, 11 Sep 2024 10:35:41 +0800 Subject: [PATCH 3/5] Update OpenAI models price --- .../utils/agents/aibitat/providers/openai.js | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/server/utils/agents/aibitat/providers/openai.js b/server/utils/agents/aibitat/providers/openai.js index 2866a7592b4..f5a96e2f8e5 100644 --- a/server/utils/agents/aibitat/providers/openai.js +++ b/server/utils/agents/aibitat/providers/openai.js @@ -3,16 +3,28 @@ const Provider = require("./ai-provider.js"); const { RetryError } = require("../error.js"); /** - * The agent provider for the OpenAI API. + * The agent provider for the OpenAI API. * By default, the model is set to 'gpt-3.5-turbo'. */ class OpenAIProvider extends Provider { model; static COST_PER_TOKEN = { + "gpt-3.5-turbo": { + input: 0.0015, + output: 0.002, + }, + "gpt-3.5-turbo-16k": { + input: 0.003, + output: 0.004, + }, "gpt-4": { input: 0.03, output: 0.06, }, + "gpt-4-turbo": { + input: 0.01, + output: 0.03, + }, "gpt-4o": { input: 0.005, output: 0.015, @@ -21,14 +33,10 @@ class OpenAIProvider extends Provider { input: 0.06, output: 0.12, }, - "gpt-3.5-turbo": { - input: 0.0015, - output: 0.002, - }, - "gpt-3.5-turbo-16k": { - input: 0.003, - output: 0.004, - }, + "gpt-4o-mini": { + input: 0.00015, + output: 0.0006, + } }; constructor(config = {}) { From 4fea2f4dde26e8aba052801f004d065683e99d77 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Wed, 11 Sep 2024 13:06:50 -0700 Subject: [PATCH 4/5] uncheck fallback listing (even if old) closes #2261 --- server/utils/helpers/customModels.js | 184 ++++++--------------------- 1 file changed, 36 insertions(+), 148 deletions(-) diff --git a/server/utils/helpers/customModels.js b/server/utils/helpers/customModels.js index c2224ea1fef..27afa150f5a 100644 --- a/server/utils/helpers/customModels.js +++ b/server/utils/helpers/customModels.js @@ -66,165 +66,53 @@ async function openAiModels(apiKey = null) { console.error(`OpenAI:listModels`, e.message); return [ { - "name": "gpt-3.5-turbo", - "id": "gpt-3.5-turbo", - "object": "model", - "created": 1677610602, - "owned_by": "openai", - "organization": "OpenAi" + name: "gpt-3.5-turbo", + id: "gpt-3.5-turbo", + object: "model", + created: 1677610602, + owned_by: "openai", + organization: "OpenAi", }, { - "name": "gpt-4o", - "id": "gpt-4o", - "object": "model", - "created": 1677610602, - "owned_by": "openai", - "organization": "OpenAi" + name: "gpt-4o", + id: "gpt-4o", + object: "model", + created: 1677610602, + owned_by: "openai", + organization: "OpenAi", }, { - "name": "gpt-3.5-turbo-16k", - "id": "gpt-3.5-turbo-16k", - "object": "model", - "created": 1683758102, - "owned_by": "openai-internal", - "organization": "OpenAi" + name: "gpt-4", + id: "gpt-4", + object: "model", + created: 1687882411, + owned_by: "openai", + organization: "OpenAi", }, { - "name": "gpt-4-0613", - "id": "gpt-4-0613", - "object": "model", - "created": 1686588896, - "owned_by": "openai", - "organization": "OpenAi" + name: "gpt-4-turbo", + id: "gpt-4-turbo", + object: "model", + created: 1712361441, + owned_by: "system", + organization: "OpenAi", }, { - "name": "gpt-4", - "id": "gpt-4", - "object": "model", - "created": 1687882411, - "owned_by": "openai", - "organization": "OpenAi" + name: "gpt-4-32k", + id: "gpt-4-32k", + object: "model", + created: 1687979321, + owned_by: "openai", + organization: "OpenAi", }, { - "name": "gpt-4-32k", - "id": "gpt-4-32k", - "object": "model", - "created": 1687979321, - "owned_by": "openai", - "organization": "OpenAi" + name: "gpt-3.5-turbo-16k", + id: "gpt-3.5-turbo-16k", + object: "model", + created: 1683758102, + owned_by: "openai-internal", + organization: "OpenAi", }, - { - "name": "gpt-3.5-turbo-instruct", - "id": "gpt-3.5-turbo-instruct", - "object": "model", - "created": 1692901427, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-3.5-turbo-instruct-0914", - "id": "gpt-3.5-turbo-instruct-0914", - "object": "model", - "created": 1694122472, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4-1106-preview", - "id": "gpt-4-1106-preview", - "object": "model", - "created": 1698957206, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-3.5-turbo-1106", - "id": "gpt-3.5-turbo-1106", - "object": "model", - "created": 1698959748, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4-0125-preview", - "id": "gpt-4-0125-preview", - "object": "model", - "created": 1706037612, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4-turbo-preview", - "id": "gpt-4-turbo-preview", - "object": "model", - "created": 1706037777, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-3.5-turbo-0125", - "id": "gpt-3.5-turbo-0125", - "object": "model", - "created": 1706048358, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4-turbo", - "id": "gpt-4-turbo", - "object": "model", - "created": 1712361441, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4-turbo-2024-04-09", - "id": "gpt-4-turbo-2024-04-09", - "object": "model", - "created": 1712601677, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4o-2024-05-13", - "id": "gpt-4o-2024-05-13", - "object": "model", - "created": 1715368132, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4o-mini-2024-07-18", - "id": "gpt-4o-mini-2024-07-18", - "object": "model", - "created": 1721172717, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4o-mini", - "id": "gpt-4o-mini", - "object": "model", - "created": 1721172741, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "gpt-4o-2024-08-06", - "id": "gpt-4o-2024-08-06", - "object": "model", - "created": 1722814719, - "owned_by": "system", - "organization": "OpenAi" - }, - { - "name": "chatgpt-4o-latest", - "id": "chatgpt-4o-latest", - "object": "model", - "created": 1723515131, - "owned_by": "system", - "organization": "OpenAi" - } ]; }); From ed332e33c1c3071625945c72f2e1c4ade50da964 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Wed, 11 Sep 2024 13:07:47 -0700 Subject: [PATCH 5/5] linting --- server/utils/agents/aibitat/providers/openai.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/utils/agents/aibitat/providers/openai.js b/server/utils/agents/aibitat/providers/openai.js index f5a96e2f8e5..04e3af03298 100644 --- a/server/utils/agents/aibitat/providers/openai.js +++ b/server/utils/agents/aibitat/providers/openai.js @@ -3,7 +3,7 @@ const Provider = require("./ai-provider.js"); const { RetryError } = require("../error.js"); /** - * The agent provider for the OpenAI API. + * The agent provider for the OpenAI API. * By default, the model is set to 'gpt-3.5-turbo'. */ class OpenAIProvider extends Provider { @@ -36,7 +36,7 @@ class OpenAIProvider extends Provider { "gpt-4o-mini": { input: 0.00015, output: 0.0006, - } + }, }; constructor(config = {}) {