don't mapping if model name start with 'gemini'

zuisong · Sep 2, 2024 · 56b6927 · 56b6927
1 parent 2617bb0
commit 56b6927
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 5 deletions.
diff --git a/dist/main_bun.mjs b/dist/main_bun.mjs
@@ -84,7 +84,13 @@ function openAiMessageToGeminiMessage(messages) {
   return result;
 }
 function genModel(req) {
-  const model = ModelMapping[req.model] ?? "gemini-1.0-pro-latest";
+  const defaultModel = (m) => {
+    if (m.startsWith("gemini")) {
+      return m;
+    }
+    return "gemini-1.5-flash-latest";
+  };
+  const model = ModelMapping[req.model] ?? defaultModel(req.model);
   let functions = req.tools?.filter((it) => it.type === "function")?.map((it) => it.function) ?? [];
   functions = functions.concat(req.functions ?? []);
   const responseMimeType = req.response_format?.type === "json_object" ? "application/json" : "text/plain";

diff --git a/dist/main_cloudflare-workers.mjs b/dist/main_cloudflare-workers.mjs
@@ -84,7 +84,13 @@ function openAiMessageToGeminiMessage(messages) {
   return result;
 }
 function genModel(req) {
-  const model = ModelMapping[req.model] ?? "gemini-1.0-pro-latest";
+  const defaultModel = (m) => {
+    if (m.startsWith("gemini")) {
+      return m;
+    }
+    return "gemini-1.5-flash-latest";
+  };
+  const model = ModelMapping[req.model] ?? defaultModel(req.model);
   let functions = req.tools?.filter((it) => it.type === "function")?.map((it) => it.function) ?? [];
   functions = functions.concat(req.functions ?? []);
   const responseMimeType = req.response_format?.type === "json_object" ? "application/json" : "text/plain";

diff --git a/dist/main_deno.mjs b/dist/main_deno.mjs
@@ -84,7 +84,13 @@ function openAiMessageToGeminiMessage(messages) {
   return result;
 }
 function genModel(req) {
-  const model = ModelMapping[req.model] ?? "gemini-1.0-pro-latest";
+  const defaultModel = (m) => {
+    if (m.startsWith("gemini")) {
+      return m;
+    }
+    return "gemini-1.5-flash-latest";
+  };
+  const model = ModelMapping[req.model] ?? defaultModel(req.model);
   let functions = req.tools?.filter((it) => it.type === "function")?.map((it) => it.function) ?? [];
   functions = functions.concat(req.functions ?? []);
   const responseMimeType = req.response_format?.type === "json_object" ? "application/json" : "text/plain";

diff --git a/dist/main_node.mjs b/dist/main_node.mjs
@@ -524,7 +524,13 @@ function openAiMessageToGeminiMessage(messages) {
   return result;
 }
 function genModel(req) {
-  const model = ModelMapping[req.model] ?? "gemini-1.0-pro-latest";
+  const defaultModel = (m) => {
+    if (m.startsWith("gemini")) {
+      return m;
+    }
+    return "gemini-1.5-flash-latest";
+  };
+  const model = ModelMapping[req.model] ?? defaultModel(req.model);
   let functions = req.tools?.filter((it) => it.type === "function")?.map((it) => it.function) ?? [];
   functions = functions.concat(req.functions ?? []);
   const responseMimeType = req.response_format?.type === "json_object" ? "application/json" : "text/plain";

diff --git a/src/utils.ts b/src/utils.ts
@@ -74,7 +74,14 @@ export function openAiMessageToGeminiMessage(messages: OpenAI.Chat.ChatCompletio
 }
 
 export function genModel(req: OpenAI.Chat.ChatCompletionCreateParams): [GeminiModel, GenerateContentRequest] {
-  const model: GeminiModel = ModelMapping[req.model] ?? "gemini-1.0-pro-latest"
+  const defaultModel = (m: string): GeminiModel => {
+    if (m.startsWith("gemini")) {
+      return m as GeminiModel
+    }
+    return "gemini-1.5-flash-latest"
+  }
+
+  const model: GeminiModel = ModelMapping[req.model] ?? defaultModel(req.model)
 
   let functions: OpenAI.Chat.FunctionObject[] =
     req.tools?.filter((it) => it.type === "function")?.map((it) => it.function) ?? []