mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 18:00:15 +01:00
feat: Google Gemini ❇️ (#1355)
* refactor: add gemini-pro to google Models list; use defaultModels for central model listing * refactor(SetKeyDialog): create useMultipleKeys hook to use for Azure, export `isJson` from utils, use EModelEndpoint * refactor(useUserKey): change variable names to make keyName setting more clear * refactor(FileUpload): allow passing container className string * feat(GoogleClient): Gemini support * refactor(GoogleClient): alternate stream speed for Gemini models * feat(Gemini): styling/settings configuration for Gemini * refactor(GoogleClient): substract max response tokens from max context tokens if context is above 32k (I/O max is combined between the two) * refactor(tokens): correct google max token counts and subtract max response tokens when input/output count are combined towards max context count * feat(google/initializeClient): handle both local and user_provided credentials and write tests * fix(GoogleClient): catch if credentials are undefined, handle if serviceKey is string or object correctly, handle no examples passed, throw error if not a Generative Language model and no service account JSON key is provided, throw error if it is a Generative m odel, but not google API key was provided * refactor(loadAsyncEndpoints/google): activate Google endpoint if either the service key JSON file is provided in /api/data, or a GOOGLE_KEY is defined. * docs: updated Google configuration * fix(ci): Mock import of Service Account Key JSON file (auth.json) * Update apis_and_tokens.md * feat: increase max output tokens slider for gemini pro * refactor(GoogleSettings): handle max and default maxOutputTokens on model change * chore: add sensitive redact regex * docs: add warning about data privacy * Update apis_and_tokens.md
This commit is contained in:
parent
d259431316
commit
561ce8e86a
37 changed files with 702 additions and 219 deletions
|
|
@ -2,3 +2,4 @@ export { default as useUserKey } from './useUserKey';
|
|||
export { default as useDebounce } from './useDebounce';
|
||||
export { default as useTextarea } from './useTextarea';
|
||||
export { default as useRequiresKey } from './useRequiresKey';
|
||||
export { default as useMultipleKeys } from './useMultipleKeys';
|
||||
|
|
|
|||
24
client/src/hooks/Input/useMultipleKeys.ts
Normal file
24
client/src/hooks/Input/useMultipleKeys.ts
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
import { isJson } from '~/utils/json';
|
||||
|
||||
export default function useMultipleKeys(setUserKey: React.Dispatch<React.SetStateAction<string>>) {
|
||||
function getMultiKey(name: string, userKey: string) {
|
||||
if (isJson(userKey)) {
|
||||
const newKey = JSON.parse(userKey);
|
||||
return newKey[name];
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
function setMultiKey(name: string, value: number | string | boolean, userKey: string) {
|
||||
let newKey = {};
|
||||
if (isJson(userKey)) {
|
||||
newKey = JSON.parse(userKey);
|
||||
}
|
||||
newKey[name] = value;
|
||||
|
||||
setUserKey(JSON.stringify(newKey));
|
||||
}
|
||||
|
||||
return { getMultiKey, setMultiKey };
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import { useMemo, useCallback } from 'react';
|
||||
import { EModelEndpoint } from 'librechat-data-provider';
|
||||
import {
|
||||
useUserKeyQuery,
|
||||
useGetEndpointsQuery,
|
||||
|
|
@ -10,16 +11,16 @@ const useUserKey = (endpoint: string) => {
|
|||
const config = endpointsConfig?.[endpoint];
|
||||
|
||||
const { azure } = config ?? {};
|
||||
let keyEndpoint = endpoint;
|
||||
let keyName = endpoint;
|
||||
|
||||
if (azure) {
|
||||
keyEndpoint = 'azureOpenAI';
|
||||
} else if (keyEndpoint === 'gptPlugins') {
|
||||
keyEndpoint = 'openAI';
|
||||
keyName = EModelEndpoint.azureOpenAI;
|
||||
} else if (keyName === EModelEndpoint.gptPlugins) {
|
||||
keyName = EModelEndpoint.openAI;
|
||||
}
|
||||
|
||||
const updateKey = useUpdateUserKeysMutation();
|
||||
const checkUserKey = useUserKeyQuery(keyEndpoint);
|
||||
const checkUserKey = useUserKeyQuery(keyName);
|
||||
const getExpiry = useCallback(() => {
|
||||
if (checkUserKey.data) {
|
||||
return checkUserKey.data.expiresAt;
|
||||
|
|
@ -40,15 +41,15 @@ const useUserKey = (endpoint: string) => {
|
|||
}, [getExpiry]);
|
||||
|
||||
const saveUserKey = useCallback(
|
||||
(value: string, expiresAt: number) => {
|
||||
(userKey: string, expiresAt: number) => {
|
||||
const dateStr = new Date(expiresAt).toISOString();
|
||||
updateKey.mutate({
|
||||
name: keyEndpoint,
|
||||
value,
|
||||
name: keyName,
|
||||
value: userKey,
|
||||
expiresAt: dateStr,
|
||||
});
|
||||
},
|
||||
[updateKey, keyEndpoint],
|
||||
[updateKey, keyName],
|
||||
);
|
||||
|
||||
return useMemo(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue