adds proper GPT4o model family for separate cost/quota tracking

.env.example

@@ -40,11 +40,11 @@ NODE_ENV=production
 
 # Which model types users are allowed to access.
 # The following model families are recognized:
-# turbo | gpt4 | gpt4-32k | gpt4-turbo | dall-e | claude | claude-opus | gemini-pro | mistral-tiny | mistral-small | mistral-medium | mistral-large | aws-claude | aws-claude-opus | azure-turbo | azure-gpt4 | azure-gpt4-32k | azure-gpt4-turbo | azure-dall-e
+# turbo | gpt4 | gpt4-32k | gpt4-turbo | gpt4o | dall-e | claude | claude-opus | gemini-pro | mistral-tiny | mistral-small | mistral-medium | mistral-large | aws-claude | aws-claude-opus | azure-turbo | azure-gpt4 | azure-gpt4-32k | azure-gpt4-turbo | azure-gpt4o | azure-dall-e
 # By default, all models are allowed except for 'dall-e' / 'azure-dall-e'.
 # To allow DALL-E image generation, uncomment the line below and add 'dall-e' or
 # 'azure-dall-e' to the list of allowed model families.
-# ALLOWED_MODEL_FAMILIES=turbo,gpt4,gpt4-32k,gpt4-turbo,claude,claude-opus,gemini-pro,mistral-tiny,mistral-small,mistral-medium,mistral-large,aws-claude,aws-claude-opus,azure-turbo,azure-gpt4,azure-gpt4-32k,azure-gpt4-turbo
+# ALLOWED_MODEL_FAMILIES=turbo,gpt4,gpt4-32k,gpt4-turbo,gpt4o,claude,claude-opus,gemini-pro,mistral-tiny,mistral-small,mistral-medium,mistral-large,aws-claude,aws-claude-opus,azure-turbo,azure-gpt4,azure-gpt4-32k,azure-gpt4-turbo,azure-gpt4o
 
 # URLs from which requests will be blocked.
 # BLOCKED_ORIGINS=reddit.com,9gag.com

src/config.ts

@@ -306,6 +306,7 @@ export const config: Config = {
     "gpt4",
     "gpt4-32k",
     "gpt4-turbo",
+    "gpt4o",
     "claude",
     "claude-opus",
     "gemini-pro",
@@ -317,8 +318,9 @@ export const config: Config = {
     "aws-claude-opus",
     "azure-turbo",
     "azure-gpt4",
-    "azure-gpt4-turbo",
     "azure-gpt4-32k",
+    "azure-gpt4-turbo",
+    "azure-gpt4o"
   ]),
   rejectPhrases: parseCsv(getEnvWithDefault("REJECT_PHRASES", "")),
   rejectMessage: getEnvWithDefault(

src/info-page.ts

@@ -16,6 +16,7 @@ const MODEL_FAMILY_FRIENDLY_NAME: { [f in ModelFamily]: string } = {
   gpt4: "GPT-4",
   "gpt4-32k": "GPT-4 32k",
   "gpt4-turbo": "GPT-4 Turbo",
+  "gpt4o": "GPT-4o",
   "dall-e": "DALL-E",
   claude: "Claude (Sonnet)",
   "claude-opus": "Claude (Opus)",
@@ -30,6 +31,7 @@ const MODEL_FAMILY_FRIENDLY_NAME: { [f in ModelFamily]: string } = {
   "azure-gpt4": "Azure GPT-4",
   "azure-gpt4-32k": "Azure GPT-4 32k",
   "azure-gpt4-turbo": "Azure GPT-4 Turbo",
+  "azure-gpt4o": "Azure GPT-4o",
   "azure-dall-e": "Azure DALL-E",
 };
 

src/shared/key-management/azure/provider.ts

@@ -72,6 +72,7 @@ export class AzureOpenAIKeyProvider implements KeyProvider<AzureOpenAIKey> {
         "azure-gpt4Tokens": 0,
         "azure-gpt4-32kTokens": 0,
         "azure-gpt4-turboTokens": 0,
+        "azure-gpt4oTokens": 0,
         "azure-dall-eTokens": 0,
       };
       this.keys.push(newKey);

src/shared/key-management/openai/provider.ts

@@ -96,6 +96,7 @@ export class OpenAIKeyProvider implements KeyProvider<OpenAIKey> {
           "turbo" as const,
           "gpt4" as const,
           "gpt4-turbo" as const,
+          "gpt4o" as const,
         ],
         isTrial: false,
         isDisabled: false,
@@ -116,6 +117,7 @@ export class OpenAIKeyProvider implements KeyProvider<OpenAIKey> {
         gpt4Tokens: 0,
         "gpt4-32kTokens": 0,
         "gpt4-turboTokens": 0,
+        gpt4oTokens: 0,
         "dall-eTokens": 0,
         gpt4Rpm: 0,
         modelSnapshots: [],

src/shared/models.ts

@@ -21,6 +21,7 @@ export type OpenAIModelFamily =
   | "gpt4"
   | "gpt4-32k"
   | "gpt4-turbo"
+  | "gpt4o"
   | "dall-e";
 export type AnthropicModelFamily = "claude" | "claude-opus";
 export type GoogleAIModelFamily = "gemini-pro";
@@ -46,6 +47,7 @@ export const MODEL_FAMILIES = (<A extends readonly ModelFamily[]>(
   "gpt4",
   "gpt4-32k",
   "gpt4-turbo",
+  "gpt4o",
   "dall-e",
   "claude",
   "claude-opus",
@@ -60,6 +62,7 @@ export const MODEL_FAMILIES = (<A extends readonly ModelFamily[]>(
   "azure-gpt4",
   "azure-gpt4-32k",
   "azure-gpt4-turbo",
+  "azure-gpt4o",
   "azure-dall-e",
 ] as const);
 
@@ -75,7 +78,7 @@ export const LLM_SERVICES = (<A extends readonly LLMService[]>(
 ] as const);
 
 export const OPENAI_MODEL_FAMILY_MAP: { [regex: string]: OpenAIModelFamily } = {
-  "^gpt-4o": "gpt4-turbo", //todo: separate model family
+  "^gpt-4o": "gpt4o",
   "^gpt-4-turbo(-\\d{4}-\\d{2}-\\d{2})?$": "gpt4-turbo",
   "^gpt-4-turbo(-preview)?$": "gpt4-turbo",
   "^gpt-4-(0125|1106)(-preview)?$": "gpt4-turbo",
@@ -96,6 +99,7 @@ export const MODEL_FAMILY_SERVICE: {
   gpt4: "openai",
   "gpt4-turbo": "openai",
   "gpt4-32k": "openai",
+  "gpt4o": "openai",
   "dall-e": "openai",
   claude: "anthropic",
   "claude-opus": "anthropic",
@@ -105,6 +109,7 @@ export const MODEL_FAMILY_SERVICE: {
   "azure-gpt4": "azure",
   "azure-gpt4-32k": "azure",
   "azure-gpt4-turbo": "azure",
+  "azure-gpt4o": "azure",
   "azure-dall-e": "azure",
   "gemini-pro": "google-ai",
   "mistral-tiny": "mistral-ai",

src/shared/stats.ts

@@ -6,10 +6,10 @@ import { ModelFamily } from "./models";
 export function getTokenCostUsd(model: ModelFamily, tokens: number) {
   let cost = 0;
   switch (model) {
-    // case "gpt4o":
-    // case "azure-gpt4o":
-    //   cost = 0.000005;
-    //   break;
+    case "gpt4o":
+    case "azure-gpt4o":
+      cost = 0.000005;
+      break;
     case "azure-gpt4-turbo":
     case "gpt4-turbo":
       cost = 0.00001;