Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion src/lib/ChatInput.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
17 changes: 8 additions & 9 deletions src/lib/Modals/SettingsModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
} from '@skeletonlabs/skeleton';
import { chatStore, settingsStore, isPro } from '$misc/stores';
import {
AiModel,
AiProvider,
getDefaultModelForProvider,
getProviderForModel,
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -165,17 +164,17 @@
<span class="label"
>{currentProvider === AiProvider.Mistral
? 'Mistral'
: currentProvider === AiProvider.Meta
? 'Meta'
: currentProvider === AiProvider.Meta || currentProvider === AiProvider.Google
? 'Groq'
: 'OpenAI'} API key</span
>

<div class="flex justify-between items-center space-x-4">
<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}
Expand All @@ -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">
Expand Down
19 changes: 17 additions & 2 deletions src/lib/Modals/UserModal.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'
}
],
Expand Down
90 changes: 86 additions & 4 deletions src/misc/openai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -22,7 +23,17 @@ 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'
}

export interface AiSettings {
Expand Down Expand Up @@ -105,6 +116,77 @@ export const models: Record<AiModel, AiModelStats> = {
costOutput: 0.79,
middlewareDeploymentName: 'llama3-70b'
},
[AiModel.Llama31_70b]: {
provider: AiProvider.Meta,
maxTokens: 8192,
contextWindow: 128000,
costInput: 0.52,
costOutput: 0.75
},
[AiModel.Gemma2_9b]: {
provider: AiProvider.Google,
maxTokens: 8192,
contextWindow: 8192,
costInput: 0,
costOutput: 0
},
[AiModel.Gemma7b]: {
provider: AiProvider.Google,
maxTokens: 8192,
contextWindow: 8192,
costInput: 0.1,
costOutput: 0.1
},
[AiModel.Llama31_8b_Instant]: {
provider: AiProvider.Meta,
maxTokens: 8192,
contextWindow: 128000,
costInput: 0.09,
costOutput: 0.09
},

[AiModel.LlamaGuard38b]: {
provider: AiProvider.Meta,
maxTokens: 8192,
contextWindow: 8192,
costInput: 0.59,
costOutput: 0.79
},
[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,
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.19,
costOutput: 0.19
},
// deprecated, only here for backwards compatibility
[AiModel.Gpt4TurboPreview]: {
provider: AiProvider.OpenAi,
Expand Down Expand Up @@ -140,7 +222,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
Expand Down Expand Up @@ -254,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)!;
}
}
4 changes: 2 additions & 2 deletions src/misc/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export interface Chat {
export interface ClientSettings {
openAiApiKey?: string;
mistralApiKey?: string;
metaApiKey?: string;
groqApiKey?: string;
hideLanguageHint?: boolean;
useTitleSuggestions?: boolean;
defaultModel?: AiModel;
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/routes/[slug]/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down