From 9d986f38be2e15fb69d6efd6bf03036f4e3572ec Mon Sep 17 00:00:00 2001
From: Anajrim <itroublve99@gmail.com>
Date: Sun, 13 Oct 2024 02:19:30 +0200
Subject: [PATCH 1/4] feat(models): add new models via Groq

---
 src/lib/ChatInput.svelte            |  6 +-
 src/lib/Modals/SettingsModal.svelte | 17 +++---
 src/misc/openai.ts                  | 95 ++++++++++++++++++++++++++++-
 src/misc/shared.ts                  |  4 +-
 src/routes/[slug]/+page.svelte      |  2 +-
 5 files changed, 108 insertions(+), 16 deletions(-)

diff --git a/src/lib/ChatInput.svelte b/src/lib/ChatInput.svelte
index cbdb204..11333e5 100644
--- a/src/lib/ChatInput.svelte
+++ b/src/lib/ChatInput.svelte
@@ -170,7 +170,11 @@
 					url = PUBLIC_MISTRAL_API_URL;
 					break;
 				case AiProvider.Meta:
-					token = $settingsStore.metaApiKey!;
+					token = $settingsStore.groqApiKey!;
+					url = PUBLIC_GROQ_API_URL;
+					break;
+				case AiProvider.Google:
+					token = $settingsStore.groqApiKey!;
 					url = PUBLIC_GROQ_API_URL;
 					break;
 				default:
diff --git a/src/lib/Modals/SettingsModal.svelte b/src/lib/Modals/SettingsModal.svelte
index 34e3073..45955c8 100644
--- a/src/lib/Modals/SettingsModal.svelte
+++ b/src/lib/Modals/SettingsModal.svelte
@@ -8,7 +8,6 @@
 	} from '@skeletonlabs/skeleton';
 	import { chatStore, settingsStore, isPro } from '$misc/stores';
 	import {
-		AiModel,
 		AiProvider,
 		getDefaultModelForProvider,
 		getProviderForModel,
@@ -116,7 +115,7 @@
 							on:blur={() => (editApiKey = false)}
 						/>
 					</label>
-				{:else if currentProvider === AiProvider.Meta && (!$settingsStore.metaApiKey || editApiKey)}
+				{:else if (currentProvider === AiProvider.Meta || currentProvider === AiProvider.Google) && (!$settingsStore.groqApiKey || editApiKey)}
 					<label class="label">
 						<div class="flex justify-between space-x-12">
 							<span>Groq API key</span>
@@ -132,9 +131,9 @@
 						<input
 							required
 							class="input"
-							class:input-error={!$settingsStore.metaApiKey}
+							class:input-error={!$settingsStore.groqApiKey}
 							type="text"
-							bind:value={$settingsStore.metaApiKey}
+							bind:value={$settingsStore.groqApiKey}
 							on:blur={() => (editApiKey = false)}
 						/>
 					</label>
@@ -165,8 +164,8 @@
 						<span class="label"
 							>{currentProvider === AiProvider.Mistral
 								? 'Mistral'
-								: currentProvider === AiProvider.Meta
-									? 'Meta'
+								: currentProvider === AiProvider.Meta || AiProvider.Google
+									? 'Groq'
 									: 'OpenAI'} API key</span
 						>
 
@@ -174,8 +173,8 @@
 							<span>
 								{#if currentProvider === AiProvider.Mistral}
 									{maskString($settingsStore.mistralApiKey)}
-								{:else if currentProvider === AiProvider.Meta}
-									{maskString($settingsStore.metaApiKey)}
+								{:else if currentProvider === AiProvider.Meta || currentProvider === AiProvider.Google}
+									{maskString($settingsStore.groqApiKey)}
 								{:else}
 									{maskString($settingsStore.openAiApiKey)}
 								{/if}
@@ -193,7 +192,7 @@
 			{/if}
 
 			<!-- Model -->
-			{#if $isPro || (currentProvider === AiProvider.OpenAi && $settingsStore.openAiApiKey) || (currentProvider === AiProvider.Meta && $settingsStore.metaApiKey) || (currentProvider === AiProvider.Mistral && $settingsStore.mistralApiKey)}
+			{#if $isPro || (currentProvider === AiProvider.OpenAi && $settingsStore.openAiApiKey) || ((currentProvider === AiProvider.Meta || currentProvider === AiProvider.Google) && $settingsStore.groqApiKey) || (currentProvider === AiProvider.Mistral && $settingsStore.mistralApiKey)}
 				<div class="flex flex-col space-y-2">
 					<label class="label">
 						<div class="flex justify-between space-x-12">
diff --git a/src/misc/openai.ts b/src/misc/openai.ts
index 13fafe2..0abac35 100644
--- a/src/misc/openai.ts
+++ b/src/misc/openai.ts
@@ -8,7 +8,8 @@ const tokenizer = encodingForModel('gpt-4-turbo');
 export enum AiProvider {
 	OpenAi = 'OpenAI',
 	Mistral = 'Mistral',
-	Meta = 'Meta'
+	Meta = 'Meta',
+	Google = 'Google'
 }
 
 export enum AiModel {
@@ -22,7 +23,18 @@ export enum AiModel {
 	Gpt4TurboPreview = 'gpt-4-turbo-preview',
 	MistralLarge = 'mistral-large-latest',
 	Llama38b = 'llama3-8b-8192',
-	Llama370b = 'llama3-70b-8192'
+	Llama370b = 'llama3-70b-8192',
+	Llama31_70b = 'llama-3.1-70b-versatile',
+	Gemma2_9b = 'gemma2-9b-it',
+	Llama32_11b_TextPreview = 'llama-3.2-11b-text-preview',
+	Gemma7b = 'gemma-7b-it',
+	Llama31_8b_Instant = 'llama-3.1-8b-instant',
+	Llama32_3b_Preview = 'llama-3.2-3b-preview',
+	LlamaGuard38b = 'llama-guard-3-8b',
+	Llama32_90b_TextPreview = 'llama-3.2-90b-text-preview',
+	Llama32_1b_Preview = 'llama-3.2-1b-preview',
+	Llama32_11b_VisionPreview = 'llama-3.2-11b-vision-preview',
+	Mixtral_8x7b = 'mixtral-8x7b-32768'
 }
 
 export interface AiSettings {
@@ -105,6 +117,83 @@ export const models: Record<AiModel, AiModelStats> = {
 		costOutput: 0.79,
 		middlewareDeploymentName: 'llama3-70b'
 	},
+	[AiModel.Llama31_70b]: {
+		provider: AiProvider.Meta,
+		maxTokens: 131072,
+		contextWindow: 131072,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Gemma2_9b]: {
+		provider: AiProvider.Google,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama32_11b_TextPreview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Gemma7b]: {
+		provider: AiProvider.Google,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama31_8b_Instant]: {
+		provider: AiProvider.Meta,
+		maxTokens: 131072,
+		contextWindow: 131072,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama32_3b_Preview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.LlamaGuard38b]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama32_90b_TextPreview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama32_1b_Preview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Llama32_11b_VisionPreview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
+	[AiModel.Mixtral_8x7b]: {
+		provider: AiProvider.Mistral,
+		maxTokens: 32768,
+		contextWindow: 32768,
+		costInput: 0.59,
+		costOutput: 0.79
+	},
 	// deprecated, only here for backwards compatibility
 	[AiModel.Gpt4TurboPreview]: {
 		provider: AiProvider.OpenAi,
@@ -140,7 +229,7 @@ export const models: Record<AiModel, AiModelStats> = {
 	}
 };
 
-export const providers: AiProvider[] = [AiProvider.OpenAi, AiProvider.Mistral, AiProvider.Meta];
+export const providers: AiProvider[] = [AiProvider.OpenAi, AiProvider.Mistral, AiProvider.Meta, AiProvider.Google];
 
 /**
  * see https://platform.openai.com/docs/guides/chat/introduction > Deep Dive Expander
diff --git a/src/misc/shared.ts b/src/misc/shared.ts
index 693bc95..f9e53c9 100644
--- a/src/misc/shared.ts
+++ b/src/misc/shared.ts
@@ -61,7 +61,7 @@ export interface Chat {
 export interface ClientSettings {
 	openAiApiKey?: string;
 	mistralApiKey?: string;
-	metaApiKey?: string;
+	groqApiKey?: string;
 	hideLanguageHint?: boolean;
 	useTitleSuggestions?: boolean;
 	defaultModel?: AiModel;
@@ -179,7 +179,7 @@ export async function suggestChatTitle(chat: Chat): Promise<string> {
 				url = PUBLIC_MISTRAL_API_URL;
 				break;
 			case AiProvider.Meta:
-				token = settings.metaApiKey!;
+				token = settings.groqApiKey!;
 				url = PUBLIC_GROQ_API_URL;
 				break;
 			default:
diff --git a/src/routes/[slug]/+page.svelte b/src/routes/[slug]/+page.svelte
index a874fa9..bc6747f 100644
--- a/src/routes/[slug]/+page.svelte
+++ b/src/routes/[slug]/+page.svelte
@@ -66,7 +66,7 @@
 	$: isMissingApiKey =
 		(provider === 'OpenAI' && !$settingsStore.openAiApiKey) ||
 		(provider === 'Mistral' && !$settingsStore.mistralApiKey) ||
-		(provider === 'Meta' && !$settingsStore.metaApiKey);
+		(provider === 'Meta' && !$settingsStore.groqApiKey);
 	let chatInput: ChatInput;
 
 	onMount(async () => {

From 644b1d560608cf287c5146e87b8e1f522ca8e3f6 Mon Sep 17 00:00:00 2001
From: Anajrim <itroublve99@gmail.com>
Date: Sun, 13 Oct 2024 17:50:12 +0200
Subject: [PATCH 2/4] fix costs and update modal

---
 package-lock.json               |  6 ++--
 src/lib/Modals/UserModal.svelte | 19 +++++++++++--
 src/misc/openai.ts              | 49 ++++++++++++++-------------------
 3 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2ce0ef..e526922 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2512,9 +2512,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001612",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz",
-			"integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==",
+			"version": "1.0.30001668",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
+			"integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
 			"dev": true,
 			"funding": [
 				{
diff --git a/src/lib/Modals/UserModal.svelte b/src/lib/Modals/UserModal.svelte
index 143832f..ea59ba0 100644
--- a/src/lib/Modals/UserModal.svelte
+++ b/src/lib/Modals/UserModal.svelte
@@ -61,6 +61,11 @@
 				free: 'your OpenAI API key',
 				pro: true
 			},
+			{
+				name: 'mistral-large-latest',
+				free: 'your Mistral API key',
+				pro: 'soon'
+			},
 			{
 				name: 'llama3-8b',
 				free: 'free with your Groq API key',
@@ -72,8 +77,18 @@
 				pro: 'soon'
 			},
 			{
-				name: 'mistral-large-latest',
-				free: 'your Mistral API key',
+				name: 'llama-3.1-70b-versatile',
+				free: 'free with your Groq API key',
+				pro: 'soon'
+			},
+			{
+				name: 'gemma2-9b-it',
+				free: 'free with your Groq API key',
+				pro: 'soon'
+			},
+			{
+				name: 'gemma-7b-it',
+				free: 'free with your Groq API key',
 				pro: 'soon'
 			}
 		],
diff --git a/src/misc/openai.ts b/src/misc/openai.ts
index 0abac35..2c3c97d 100644
--- a/src/misc/openai.ts
+++ b/src/misc/openai.ts
@@ -33,8 +33,7 @@ export enum AiModel {
 	LlamaGuard38b = 'llama-guard-3-8b',
 	Llama32_90b_TextPreview = 'llama-3.2-90b-text-preview',
 	Llama32_1b_Preview = 'llama-3.2-1b-preview',
-	Llama32_11b_VisionPreview = 'llama-3.2-11b-vision-preview',
-	Mixtral_8x7b = 'mixtral-8x7b-32768'
+	Llama32_11b_VisionPreview = 'llama-3.2-11b-vision-preview'
 }
 
 export interface AiSettings {
@@ -121,45 +120,46 @@ export const models: Record<AiModel, AiModelStats> = {
 		provider: AiProvider.Meta,
 		maxTokens: 131072,
 		contextWindow: 131072,
-		costInput: 0.59,
-		costOutput: 0.79
+		costInput: 0.52,
+		costOutput: 0.75
 	},
 	[AiModel.Gemma2_9b]: {
 		provider: AiProvider.Google,
 		maxTokens: 8192,
 		contextWindow: 8192,
-		costInput: 0.59,
-		costOutput: 0.79
-	},
-	[AiModel.Llama32_11b_TextPreview]: {
-		provider: AiProvider.Meta,
-		maxTokens: 8192,
-		contextWindow: 8192,
-		costInput: 0.59,
-		costOutput: 0.79
+		costInput: 0,
+		costOutput: 0
 	},
 	[AiModel.Gemma7b]: {
 		provider: AiProvider.Google,
 		maxTokens: 8192,
 		contextWindow: 8192,
-		costInput: 0.59,
-		costOutput: 0.79
+		costInput: 0.1,
+		costOutput: 0.1
 	},
 	[AiModel.Llama31_8b_Instant]: {
 		provider: AiProvider.Meta,
 		maxTokens: 131072,
 		contextWindow: 131072,
-		costInput: 0.59,
-		costOutput: 0.79
+		costInput: 0.09,
+		costOutput: 0.09
 	},
-	[AiModel.Llama32_3b_Preview]: {
+
+	[AiModel.LlamaGuard38b]: {
 		provider: AiProvider.Meta,
 		maxTokens: 8192,
 		contextWindow: 8192,
 		costInput: 0.59,
 		costOutput: 0.79
 	},
-	[AiModel.LlamaGuard38b]: {
+	[AiModel.Llama32_11b_TextPreview]: {
+		provider: AiProvider.Meta,
+		maxTokens: 8192,
+		contextWindow: 8192,
+		costInput: 0.19,
+		costOutput: 0.19
+	},
+	[AiModel.Llama32_3b_Preview]: {
 		provider: AiProvider.Meta,
 		maxTokens: 8192,
 		contextWindow: 8192,
@@ -184,15 +184,8 @@ export const models: Record<AiModel, AiModelStats> = {
 		provider: AiProvider.Meta,
 		maxTokens: 8192,
 		contextWindow: 8192,
-		costInput: 0.59,
-		costOutput: 0.79
-	},
-	[AiModel.Mixtral_8x7b]: {
-		provider: AiProvider.Mistral,
-		maxTokens: 32768,
-		contextWindow: 32768,
-		costInput: 0.59,
-		costOutput: 0.79
+		costInput: 0.19,
+		costOutput: 0.19 
 	},
 	// deprecated, only here for backwards compatibility
 	[AiModel.Gpt4TurboPreview]: {

From ec005da2d01edec7322b597a5ba4d58dfb9ca5ff Mon Sep 17 00:00:00 2001
From: Anajrim <itroublve99@gmail.com>
Date: Sun, 13 Oct 2024 17:58:30 +0200
Subject: [PATCH 3/4] fix incorrect provider check

---
 src/lib/Modals/SettingsModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Modals/SettingsModal.svelte b/src/lib/Modals/SettingsModal.svelte
index 45955c8..f0155e4 100644
--- a/src/lib/Modals/SettingsModal.svelte
+++ b/src/lib/Modals/SettingsModal.svelte
@@ -164,7 +164,7 @@
 						<span class="label"
 							>{currentProvider === AiProvider.Mistral
 								? 'Mistral'
-								: currentProvider === AiProvider.Meta || AiProvider.Google
+								: currentProvider === AiProvider.Meta || currentProvider === AiProvider.Google
 									? 'Groq'
 									: 'OpenAI'} API key</span
 						>

From f5dc89a7592b879f1d38cd00552c2c3375d4c5a7 Mon Sep 17 00:00:00 2001
From: Itroublve <115026399+Anajrim01@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:24:20 +0200
Subject: [PATCH 4/4] fix incorrect max tokens and contextWindow (llama)

---
 src/misc/openai.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/misc/openai.ts b/src/misc/openai.ts
index 2c3c97d..b686d6a 100644
--- a/src/misc/openai.ts
+++ b/src/misc/openai.ts
@@ -118,8 +118,8 @@ export const models: Record<AiModel, AiModelStats> = {
 	},
 	[AiModel.Llama31_70b]: {
 		provider: AiProvider.Meta,
-		maxTokens: 131072,
-		contextWindow: 131072,
+		maxTokens: 8192,
+		contextWindow: 128000,
 		costInput: 0.52,
 		costOutput: 0.75
 	},
@@ -139,8 +139,8 @@ export const models: Record<AiModel, AiModelStats> = {
 	},
 	[AiModel.Llama31_8b_Instant]: {
 		provider: AiProvider.Meta,
-		maxTokens: 131072,
-		contextWindow: 131072,
+		maxTokens: 8192,
+		contextWindow: 128000,
 		costInput: 0.09,
 		costOutput: 0.09
 	},
@@ -336,4 +336,4 @@ export function getProviderForModel(model: AiModel): AiProvider {
 
 export function getDefaultModelForProvider(provider: AiProvider): AiModel {
 	return (Object.keys(models) as AiModel[]).find(key => models[key].provider === provider)!;
-}
\ No newline at end of file
+}