mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 08:50:15 +01:00
* feat: init @librechat/client * feat: Add common types and interfaces for accessibility, agents, artifacts, assistants, and tools * feat: Add jotai as a peer dependency * fix build client package * feat: cleanup unused types from common/index.ts - Remove 104 unused type exports from packages/client/src/common/index.ts - Keep only 7 actually used exports (93% reduction) - Add cleanup script with enhanced import pattern detection - Support both named imports and namespace imports (* as t) - Create automatic backups and comprehensive documentation - Maintain type safety with build verification - No breaking changes to existing code Kept exports: - TShowToast, Option, OptionWithIcon, DropdownValueSetter - MentionOption, NotificationSeverity, MenuItemProps Scripts: cleanup-common-types-safe.js, README-CLEANUP.md * fix: cleanup * fix: package; refactor: tsconfig * feat: add back `recoil` * fix: move dependencies to peerDependencies in client package * feat: add @librechat/client as a dependency in package.json and package-lock.json * feat: update client package configuration and dependencies - Added new dependencies for Rollup plugins and updated existing ones in package.json and package-lock.json. - Introduced a new Rollup configuration file for building the client package. - Refactored build scripts to include a dedicated build command for the client. - Updated TypeScript configuration for improved module resolution and type declaration output. - Integrated a Toast component from the client package into the main App component. * feat: enhance Rollup configuration for client package - Updated terser plugin settings to preserve directives like 'use client'. - Added custom warning handler to ignore "use client" directive warnings during the build process. * chore: rename package/client build script command * feat: update client package dependencies and Rollup configuration - Added rollup-plugin-postcss to package.json and updated package-lock.json. - Enhanced Rollup configuration to include postcss plugin for CSS handling. - Updated index.ts to export all components from the components directory for better modularity. * feat: add client package directory to update configuration - Included the 'client' package directory in the update.js configuration to ensure it is recognized during updates. * feat: export Toast component in client package - Added export for the Toast component in index.ts to enhance modularity and accessibility of components. * feat: /client transition to @librechat/client * chore: fixed formatting issues * fix: update peer dependencies in @librechat/client to prevent bundling them * fix: correct useSprings implementation in SplitText component * fix: circular dependencies in DataTable * fix: add remaining peer dependencies and match actual versions previously used in `client/package.json` * fix: correct frontend:ci script to include client package build * chore: enhance unused package detection for @librechat/client and improve dependency extraction * fix: add missing peer dependency for @radix-ui/react-collapsible * chore: include "packages/client" in unused i18next keys detection * test: update AgentFooter tests to use document.querySelector for spinner checks test: mock window.matchMedia in setupTests.js for consistent test environment * feat: add react-hook-form dependency and update FormInput component to use its types * chore: linting * refactor: remove unused defaultSelectedValues prop from MCPSelect and MultiSelect components * chore: linting * feat: update GitHub Actions workflow to publish @librechat/client * chore: update GitHub Actions workflow to install and build data-provider and client dependencies * chore: add missing @testing-library/react dependency to client package * chore: update tsconfig.json to exclude additional test files * chore: fix build issues, resolve latest LC changes * chore: move MCP components outside of `~/components/ui` * feat: implement dynamic theme system with environment variable support and Tailwind CSS integration * chore: remove unnecessary logging of sttExternal and ttsExternal in Speech component * chore: squashed cleanup commits chore: move @tanstack/react-virtual to dependencies and remove recoil from package.json chore: move dependencies to peerDependencies in package.json feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration refactor: reorganize exports in index.ts for improved clarity refactor: remove unused types and interfaces from common files refactor: update peer dependencies and improve component typings - Removed duplicate peer dependencies from package.json and organized them. - Updated rollup.config.js to disable TypeScript checking during the build process. - Modified AnimatedTabs component to use React.ReactNode for label and content types, and added TypeScript workarounds for compatibility. - Enhanced Label and Separator components to accept an optional className prop and improved prop spreading. - Updated Slider component to include an optional className prop and refined prop handling for better type safety. refactor: clean up client workflow and update package dependencies refactor: update package dependencies and improve PostCSS and Rollup configurations chore: bump version to 0.1.2 in package.json chore: bump client version to 0.1.2 in package-lock.json chore: bump client version to 0.1.3 and update dependencies chore: bump client version to 0.1.4 and update @react-spring dependencies chore: update package version to 0.1.5 and adjust peer dependencies - Bump version in package.json from 0.1.4 to 0.1.5. - Update peer dependency for @tanstack/react-query to allow version 5.0.0. - Add @tanstack/react-table and @tanstack/react-virtual as dependencies. - Update various dependencies to their latest compatible versions. - Simplify postcss.config.js by removing unnecessary options. - Clean up rollup.config.js by removing ignored PostCSS warnings. - Update CheckboxButton component to cast icon as React JSX element. - Adjust Combobox component's class names for better styling. - Change DropdownPopup component to use React's namespace import. - Modify InputOTP component to use 'any' type for OTPInputContext. - Ensure displayLabel and value in ModelParameters are converted to strings. - Update MultiSearch component's placeholder to ensure it's a string. - Cast selectIcon in MultiSelect as React JSX element for consistency. - Update OGDialogTemplate to cast selectText as React JSX element. - Initialize animationRef in PixelCard with undefined for clarity. - Add TypeScript ignore comments in Select and SelectDropDown components for Radix UI type conflicts. - Ensure title in SelectDropDown is a string and adjust rendering of options. - Update useLocalize hook to cast options as any for compatibility. refactor: code structure; chore: translations cleanup chore: remove unused imports and clean up code in NewChat component refactor: enhance Menu component to support custom render functions for menu items style: update itemClassName in ToolsDropdown for improved UI consistency fix: merge conflicts chore: update @radix-ui/react-accordion to version 1.2.11 * refactor: remove unnecessary TypeScript type assertions in AnimatedTabs, Label, Separator, and Slider components * feat: enhance theme system with localStorage persistence and new theme atoms * chore: bump version of @librechat/client to 0.1.7 * chore: fix ci/cd warnings/errors related to linting and unused localization keys * chore: update dependencies for class-variance-authority, clsx, and match-sorter * chore: bump @librechat/client to v0.1.8 * feat: add utility colors for theme customization and remove unused tailwindConfig * v0.1.9 --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
216 lines
7 KiB
TypeScript
216 lines
7 KiB
TypeScript
import React, { useState } from 'react';
|
|
import { useForm, FormProvider } from 'react-hook-form';
|
|
import { OGDialogTemplate, OGDialog, Dropdown, useToastContext } from '@librechat/client';
|
|
import { EModelEndpoint, alternateName, isAssistantsEndpoint } from 'librechat-data-provider';
|
|
import type { TDialogProps } from '~/common';
|
|
import { useGetEndpointsQuery } from '~/data-provider';
|
|
import { RevokeKeysButton } from '~/components/Nav';
|
|
import { useUserKey, useLocalize } from '~/hooks';
|
|
import CustomConfig from './CustomEndpoint';
|
|
import GoogleConfig from './GoogleConfig';
|
|
import OpenAIConfig from './OpenAIConfig';
|
|
import OtherConfig from './OtherConfig';
|
|
import HelpText from './HelpText';
|
|
|
|
const endpointComponents = {
|
|
[EModelEndpoint.google]: GoogleConfig,
|
|
[EModelEndpoint.openAI]: OpenAIConfig,
|
|
[EModelEndpoint.custom]: CustomConfig,
|
|
[EModelEndpoint.azureOpenAI]: OpenAIConfig,
|
|
[EModelEndpoint.gptPlugins]: OpenAIConfig,
|
|
[EModelEndpoint.assistants]: OpenAIConfig,
|
|
[EModelEndpoint.azureAssistants]: OpenAIConfig,
|
|
default: OtherConfig,
|
|
};
|
|
|
|
const formSet: Set<string> = new Set([
|
|
EModelEndpoint.openAI,
|
|
EModelEndpoint.custom,
|
|
EModelEndpoint.azureOpenAI,
|
|
EModelEndpoint.gptPlugins,
|
|
EModelEndpoint.assistants,
|
|
EModelEndpoint.azureAssistants,
|
|
]);
|
|
|
|
const EXPIRY = {
|
|
THIRTY_MINUTES: { label: 'in 30 minutes', value: 30 * 60 * 1000 },
|
|
TWO_HOURS: { label: 'in 2 hours', value: 2 * 60 * 60 * 1000 },
|
|
TWELVE_HOURS: { label: 'in 12 hours', value: 12 * 60 * 60 * 1000 },
|
|
ONE_DAY: { label: 'in 1 day', value: 24 * 60 * 60 * 1000 },
|
|
ONE_WEEK: { label: 'in 7 days', value: 7 * 24 * 60 * 60 * 1000 },
|
|
ONE_MONTH: { label: 'in 30 days', value: 30 * 24 * 60 * 60 * 1000 },
|
|
NEVER: { label: 'never', value: 0 },
|
|
};
|
|
|
|
const SetKeyDialog = ({
|
|
open,
|
|
onOpenChange,
|
|
endpoint,
|
|
endpointType,
|
|
userProvideURL,
|
|
}: Pick<TDialogProps, 'open' | 'onOpenChange'> & {
|
|
endpoint: EModelEndpoint | string;
|
|
endpointType?: EModelEndpoint;
|
|
userProvideURL?: boolean | null;
|
|
}) => {
|
|
const methods = useForm({
|
|
defaultValues: {
|
|
apiKey: '',
|
|
baseURL: '',
|
|
azureOpenAIApiKey: '',
|
|
azureOpenAIApiInstanceName: '',
|
|
azureOpenAIApiDeploymentName: '',
|
|
azureOpenAIApiVersion: '',
|
|
// TODO: allow endpoint definitions from user
|
|
// name: '',
|
|
// TODO: add custom endpoint models defined by user
|
|
// models: '',
|
|
},
|
|
});
|
|
|
|
const [userKey, setUserKey] = useState('');
|
|
const { data: endpointsConfig } = useGetEndpointsQuery();
|
|
const [expiresAtLabel, setExpiresAtLabel] = useState(EXPIRY.TWELVE_HOURS.label);
|
|
const { getExpiry, saveUserKey } = useUserKey(endpoint);
|
|
const { showToast } = useToastContext();
|
|
const localize = useLocalize();
|
|
|
|
const expirationOptions = Object.values(EXPIRY);
|
|
|
|
const handleExpirationChange = (label: string) => {
|
|
setExpiresAtLabel(label);
|
|
};
|
|
|
|
const submit = () => {
|
|
const selectedOption = expirationOptions.find((option) => option.label === expiresAtLabel);
|
|
let expiresAt;
|
|
|
|
if (selectedOption?.value === 0) {
|
|
expiresAt = null;
|
|
} else {
|
|
expiresAt = Date.now() + (selectedOption ? selectedOption.value : 0);
|
|
}
|
|
|
|
const saveKey = (key: string) => {
|
|
saveUserKey(key, expiresAt);
|
|
onOpenChange(false);
|
|
};
|
|
|
|
if (formSet.has(endpoint) || formSet.has(endpointType ?? '')) {
|
|
// TODO: handle other user provided options besides baseURL and apiKey
|
|
methods.handleSubmit((data) => {
|
|
const isAzure = endpoint === EModelEndpoint.azureOpenAI;
|
|
const isOpenAIBase =
|
|
isAzure ||
|
|
endpoint === EModelEndpoint.openAI ||
|
|
endpoint === EModelEndpoint.gptPlugins ||
|
|
isAssistantsEndpoint(endpoint);
|
|
if (isAzure) {
|
|
data.apiKey = 'n/a';
|
|
}
|
|
|
|
const emptyValues = Object.keys(data).filter((key) => {
|
|
if (!isAzure && key.startsWith('azure')) {
|
|
return false;
|
|
}
|
|
if (isOpenAIBase && key === 'baseURL') {
|
|
return false;
|
|
}
|
|
if (key === 'baseURL' && !(userProvideURL ?? false)) {
|
|
return false;
|
|
}
|
|
return data[key] === '';
|
|
});
|
|
|
|
if (emptyValues.length > 0) {
|
|
showToast({
|
|
message: 'The following fields are required: ' + emptyValues.join(', '),
|
|
status: 'error',
|
|
});
|
|
onOpenChange(true);
|
|
return;
|
|
}
|
|
|
|
const { apiKey, baseURL, ...azureOptions } = data;
|
|
const userProvidedData = { apiKey, baseURL };
|
|
if (isAzure) {
|
|
userProvidedData.apiKey = JSON.stringify({
|
|
azureOpenAIApiKey: azureOptions.azureOpenAIApiKey,
|
|
azureOpenAIApiInstanceName: azureOptions.azureOpenAIApiInstanceName,
|
|
azureOpenAIApiDeploymentName: azureOptions.azureOpenAIApiDeploymentName,
|
|
azureOpenAIApiVersion: azureOptions.azureOpenAIApiVersion,
|
|
});
|
|
}
|
|
|
|
saveKey(JSON.stringify(userProvidedData));
|
|
methods.reset();
|
|
})();
|
|
return;
|
|
}
|
|
|
|
saveKey(userKey);
|
|
setUserKey('');
|
|
};
|
|
|
|
const EndpointComponent =
|
|
endpointComponents[endpointType ?? endpoint] ?? endpointComponents['default'];
|
|
const expiryTime = getExpiry();
|
|
const config = endpointsConfig?.[endpoint];
|
|
|
|
return (
|
|
<OGDialog open={open} onOpenChange={onOpenChange}>
|
|
<OGDialogTemplate
|
|
title={`${localize('com_endpoint_config_key_for')} ${alternateName[endpoint] ?? endpoint}`}
|
|
className="w-11/12 max-w-2xl"
|
|
showCancelButton={false}
|
|
main={
|
|
<div className="grid w-full items-center gap-2">
|
|
<small className="text-red-600">
|
|
{expiryTime === 'never'
|
|
? localize('com_endpoint_config_key_never_expires')
|
|
: `${localize('com_endpoint_config_key_encryption')} ${new Date(
|
|
expiryTime ?? 0,
|
|
).toLocaleString()}`}
|
|
</small>
|
|
<Dropdown
|
|
label="Expires "
|
|
value={expiresAtLabel}
|
|
onChange={handleExpirationChange}
|
|
options={expirationOptions.map((option) => option.label)}
|
|
sizeClasses="w-[185px]"
|
|
portal={false}
|
|
/>
|
|
<div className="mt-2" />
|
|
<FormProvider {...methods}>
|
|
<EndpointComponent
|
|
userKey={userKey}
|
|
setUserKey={setUserKey}
|
|
endpoint={
|
|
endpoint === EModelEndpoint.gptPlugins && (config?.azure ?? false)
|
|
? EModelEndpoint.azureOpenAI
|
|
: endpoint
|
|
}
|
|
userProvideURL={userProvideURL}
|
|
/>
|
|
</FormProvider>
|
|
<HelpText endpoint={endpoint} />
|
|
</div>
|
|
}
|
|
selection={{
|
|
selectHandler: submit,
|
|
selectClasses: 'btn btn-primary',
|
|
selectText: localize('com_ui_submit'),
|
|
}}
|
|
leftButtons={
|
|
<RevokeKeysButton
|
|
endpoint={endpoint}
|
|
disabled={!(expiryTime ?? '')}
|
|
setDialogOpen={onOpenChange}
|
|
/>
|
|
}
|
|
/>
|
|
</OGDialog>
|
|
);
|
|
};
|
|
|
|
export default SetKeyDialog;
|