From 1cc51d9cbc5cf22eebd6bff3e501584390ef3f2c Mon Sep 17 00:00:00 2001
From: Eric Amodio <eamodio@gmail.com>
Date: Wed, 15 May 2024 14:47:03 -0400
Subject: [PATCH] Adds gpt-4o and gemini flash

---
 package.json             | 4 ++++
 src/ai/geminiProvider.ts | 8 +++++++-
 src/ai/openaiProvider.ts | 9 ++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index b88e8135a8769..6f56472d7d76b 100644
--- a/package.json
+++ b/package.json
@@ -3512,6 +3512,7 @@
 						],
 						"default": null,
 						"enum": [
+							"gpt-4o",
 							"gpt-4-turbo",
 							"gpt-4-turbo-preview",
 							"gpt-4",
@@ -3520,6 +3521,7 @@
 							"gpt-3.5-turbo-16k"
 						],
 						"enumDescriptions": [
+							"GPT-4 Omni",
 							"GPT-4 Turbo with Vision",
 							"GPT-4 Turbo Preview",
 							"GPT-4",
@@ -3575,10 +3577,12 @@
 						"default": null,
 						"enum": [
 							"gemini-1.5-pro-latest",
+							"gemini-1.5-flash-latest",
 							"gemini-1.0-pro"
 						],
 						"enumDescriptions": [
 							"Gemini 1.5 Pro (Latest)",
+							"Gemini 1.5 Flash",
 							"Gemini 1.0 Pro"
 						],
 						"markdownDescription": "Specifies the Google Gemini model to use for GitLens' experimental AI features",
diff --git a/src/ai/geminiProvider.ts b/src/ai/geminiProvider.ts
index 6d0c36b85aa39..d2c920a766bcd 100644
--- a/src/ai/geminiProvider.ts
+++ b/src/ai/geminiProvider.ts
@@ -11,7 +11,7 @@ import { getApiKey as getApiKeyCore, getMaxCharacters } from './aiProviderServic
 
 const provider = { id: 'gemini', name: 'Google' } as const;
 
-export type GeminiModels = 'gemini-1.0-pro' | 'gemini-1.5-pro-latest';
+export type GeminiModels = 'gemini-1.0-pro' | 'gemini-1.5-pro-latest' | 'gemini-1.5-flash-latest';
 type GeminiModel = AIModel<typeof provider.id>;
 const models: GeminiModel[] = [
 	{
@@ -21,6 +21,12 @@ const models: GeminiModel[] = [
 		provider: provider,
 		default: true,
 	},
+	{
+		id: 'gemini-1.5-flash-latest',
+		name: 'Gemini 1.5 Flash',
+		maxTokens: 1048576,
+		provider: provider,
+	},
 	{
 		id: 'gemini-1.0-pro',
 		name: 'Gemini 1.0 Pro',
diff --git a/src/ai/openaiProvider.ts b/src/ai/openaiProvider.ts
index 8ace49e51c90e..97b6cc1b9dd4e 100644
--- a/src/ai/openaiProvider.ts
+++ b/src/ai/openaiProvider.ts
@@ -12,6 +12,7 @@ import { getApiKey as getApiKeyCore, getMaxCharacters } from './aiProviderServic
 const provider = { id: 'openai', name: 'OpenAI' } as const;
 
 export type OpenAIModels =
+	| 'gpt-4o'
 	| 'gpt-4-turbo'
 	| 'gpt-4-turbo-2024-04-09'
 	| 'gpt-4-turbo-preview'
@@ -28,6 +29,13 @@ export type OpenAIModels =
 
 type OpenAIModel = AIModel<typeof provider.id>;
 const models: OpenAIModel[] = [
+	{
+		id: 'gpt-4o',
+		name: 'GPT-4 Omni',
+		maxTokens: 128000,
+		provider: provider,
+		default: true,
+	},
 	{
 		id: 'gpt-4-turbo',
 		name: 'GPT-4 Turbo with Vision',
@@ -46,7 +54,6 @@ const models: OpenAIModel[] = [
 		name: 'GPT-4 Turbo Preview',
 		maxTokens: 128000,
 		provider: provider,
-		default: true,
 	},
 	{
 		id: 'gpt-4-0125-preview',