Handle models without a provider

frontend/src/components/modals/settings/ModelSelector.test.tsx

@@ -6,6 +6,10 @@ import { ModelSelector } from "./ModelSelector";
 
 describe("ModelSelector", () => {
   const models = {
+    openai: {
+      separator: "/",
+      models: ["gpt-4o", "gpt-3.5-turbo"],
+    },
     azure: {
       separator: "/",
       models: ["ada", "gpt-35-turbo"],

frontend/src/utils/extractModelAndProvider.test.ts

@@ -1,55 +1,62 @@
+import { describe, it, expect } from "vitest";
 import { extractModelAndProvider } from "./extractModelAndProvider";
 
-test("extractModelAndProvider", () => {
-  expect(extractModelAndProvider("azure/ada")).toEqual({
-    provider: "azure",
-    model: "ada",
-    separator: "/",
-  });
-
-  expect(
-    extractModelAndProvider("azure/standard/1024-x-1024/dall-e-2"),
-  ).toEqual({
-    provider: "azure",
-    model: "standard/1024-x-1024/dall-e-2",
-    separator: "/",
-  });
-
-  expect(extractModelAndProvider("vertex_ai_beta/chat-bison")).toEqual({
-    provider: "vertex_ai_beta",
-    model: "chat-bison",
-    separator: "/",
-  });
-
-  expect(extractModelAndProvider("cohere.command-r-v1:0")).toEqual({
-    provider: "cohere",
-    model: "command-r-v1:0",
-    separator: ".",
-  });
-
-  expect(
-    extractModelAndProvider("cloudflare/@cf/mistral/mistral-7b-instruct-v0.1"),
-  ).toEqual({
-    provider: "cloudflare",
-    model: "@cf/mistral/mistral-7b-instruct-v0.1",
-    separator: "/",
-  });
-
-  expect(extractModelAndProvider("gpt-4o")).toEqual({
-    provider: "",
-    model: "gpt-4o",
-    separator: "",
-  });
-
-  expect(extractModelAndProvider("together-ai-21.1b-41b")).toEqual({
-    provider: "",
-    model: "together-ai-21.1b-41b",
-    separator: "",
-  });
-
-  expect(extractModelAndProvider("gpt-3.5-turbo")).toEqual({
-    provider: "",
-    model: "gpt-3.5-turbo",
-    separator: "",
+describe("extractModelAndProvider", () => {
+  it("should work", () => {
+    expect(extractModelAndProvider("azure/ada")).toEqual({
+      provider: "azure",
+      model: "ada",
+      separator: "/",
+    });
+
+    expect(
+      extractModelAndProvider("azure/standard/1024-x-1024/dall-e-2"),
+    ).toEqual({
+      provider: "azure",
+      model: "standard/1024-x-1024/dall-e-2",
+      separator: "/",
+    });
+
+    expect(extractModelAndProvider("vertex_ai_beta/chat-bison")).toEqual({
+      provider: "vertex_ai_beta",
+      model: "chat-bison",
+      separator: "/",
+    });
+
+    expect(extractModelAndProvider("cohere.command-r-v1:0")).toEqual({
+      provider: "cohere",
+      model: "command-r-v1:0",
+      separator: ".",
+    });
+
+    expect(
+      extractModelAndProvider(
+        "cloudflare/@cf/mistral/mistral-7b-instruct-v0.1",
+      ),
+    ).toEqual({
+      provider: "cloudflare",
+      model: "@cf/mistral/mistral-7b-instruct-v0.1",
+      separator: "/",
+    });
+
+    expect(extractModelAndProvider("together-ai-21.1b-41b")).toEqual({
+      provider: "",
+      model: "together-ai-21.1b-41b",
+      separator: "",
+    });
+  });
+
+  it("should add provider for popular models", () => {
+    expect(extractModelAndProvider("gpt-3.5-turbo")).toEqual({
+      provider: "openai",
+      model: "gpt-3.5-turbo",
+      separator: "/",
+    });
+
+    expect(extractModelAndProvider("gpt-4o")).toEqual({
+      provider: "openai",
+      model: "gpt-4o",
+      separator: "/",
+    });
   });
 });

frontend/src/utils/extractModelAndProvider.ts

@@ -1,4 +1,5 @@
 import { isNumber } from "./isNumber";
+import { VERIFIED_OPENAI_MODELS } from "./verified-models";
 
 /**
  * Checks if the split array is actually a version number.
@@ -36,7 +37,11 @@ export const extractModelAndProvider = (model: string) => {
     }
   }
   if (split.length === 1) {
-    // no "/" or "." separator found, return as model only
+    // no "/" or "." separator found
+    if (VERIFIED_OPENAI_MODELS.includes(split[0])) {
+      return { provider: "openai", model: split[0], separator: "/" };
+    }
+    // return as model only
     return { provider: "", model, separator: "" };
   }
   const [provider, ...modelId] = split;

frontend/src/utils/mapProvider.ts

@@ -1,4 +1,5 @@
 const MAP_PROVIDER = {
+  openai: "OpenAI",
   azure: "Azure",
   azure_ai: "Azure AI Studio",
   vertex_ai: "VertexAI",

frontend/src/utils/organizeModelsAndProviders.test.ts

@@ -39,9 +39,13 @@ test("organizeModelsAndProviders", () => {
       separator: "/",
       models: ["@cf/mistral/mistral-7b-instruct-v0.1"],
     },
+    openai: {
+      separator: "/",
+      models: ["gpt-4o", "gpt-3.5-turbo"],
+    },
     other: {
       separator: "",
-      models: ["gpt-4o", "together-ai-21.1b-41b", "gpt-3.5-turbo"],
+      models: ["together-ai-21.1b-41b"],
     },
   });
 });

frontend/src/utils/verified-models.ts

@@ -0,0 +1,8 @@
+export const VERIFIED_OPENAI_MODELS = [
+  "gpt-4o",
+  "gpt-4o-mini",
+  "gpt-4-turbo",
+  "gpt-4",
+  "gpt-4-32k",
+  "gpt-3.5-turbo",
+];