mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-19 09:50:15 +01:00
🤖 feat: Model Specs & Save Tools per Convo/Preset (#2578)
* WIP: first pass ModelSpecs * refactor(onSelectEndpoint): use `getConvoSwitchLogic` * feat: introduce iconURL, greeting, frontend fields for conversations/presets/messages * feat: conversation.iconURL & greeting in Landing * feat: conversation.iconURL & greeting in New Chat button * feat: message.iconURL * refactor: ConversationIcon -> ConvoIconURL * WIP: add spec as a conversation field * refactor: useAppStartup, set spec on initial load for new chat, allow undefined spec, add localStorage keys enum, additional type fields for spec * feat: handle `showIconInMenu`, `showIconInHeader`, undefined `iconURL` and no specs on initial load * chore: handle undefined or empty modelSpecs * WIP: first pass, modelSpec schema for custom config * refactor: move default filtered tools definition to ToolService * feat: pass modelSpecs from backend via startupConfig * refactor: modelSpecs config, return and define list * fix: react error and include iconURL in responseMessage * refactor: add iconURL to responseMessage only * refactor: getIconEndpoint * refactor: pass TSpecsConfig * fix(assistants): differentiate compactAssistantSchema, correctly resets shared conversation state with other endpoints * refactor: assistant id prefix localStorage key * refactor: add more LocalStorageKeys and replace hardcoded values * feat: prioritize spec on new chat behavior: last selected modelSpec behavior (localStorage) * feat: first pass, interface config * chore: WIP, todo: add warnings based on config.modelSpecs settings. * feat: enforce modelSpecs if configured * feat: show config file yaml errors * chore: delete unused legacy Plugins component * refactor: set tools to localStorage from recoil store * chore: add stable recoil setter to useEffect deps * refactor: save tools to conversation documents * style(MultiSelectPop): dynamic height, remove unused import * refactor(react-query): use localstorage keys and pass config to useAvailablePluginsQuery * feat(utils): add mapPlugins * refactor(Convo): use conversation.tools if defined, lastSelectedTools if not * refactor: remove unused legacy code using `useSetOptions`, remove conditional flag `isMultiChat` for using legacy settings * refactor(PluginStoreDialog): add exhaustive-deps which are stable react state setters * fix(HeaderOptions): pass `popover` as true * refactor(useSetStorage): use project enums * refactor: use LocalStorageKeys enum * fix: prevent setConversation from setting falsy values in lastSelectedTools * refactor: use map for availableTools state and available Plugins query * refactor(updateLastSelectedModel): organize logic better and add note on purpose * fix(setAgentOption): prevent reseting last model to secondary model for gptPlugins * refactor(buildDefaultConvo): use enum * refactor: remove `useSetStorage` and consolidate areas where conversation state is saved to localStorage * fix: conversations retain tools on refresh * fix(gptPlugins): prevent nullish tools from being saved * chore: delete useServerStream * refactor: move initial plugins logic to useAppStartup * refactor(MultiSelectDropDown): add more pass-in className props * feat: use tools in presets * chore: delete unused usePresetOptions * refactor: new agentOptions default handling * chore: note * feat: add label and custom instructions to agents * chore: remove 'disabled with tools' message * style: move plugins to 2nd column in parameters * fix: TPreset type for agentOptions * fix: interface controls * refactor: add interfaceConfig, use Separator within Switcher * refactor: hide Assistants panel if interface.parameters are disabled * fix(Header): only modelSpecs if list is greater than 0 * refactor: separate MessageIcon logic from useMessageHelpers for better react rule-following * fix(AppService): don't use reserved keyword 'interface' * feat: set existing Icon for custom endpoints through iconURL * fix(ci): tests passing for App Service * docs: refactor custom_config.md for readability and better organization, also include missing values * docs: interface section and re-organize docs * docs: update modelSpecs info * chore: remove unused files * chore: remove unused files * chore: move useSetIndexOptions * chore: remove unused file * chore: move useConversation(s) * chore: move useDefaultConvo * chore: move useNavigateToConvo * refactor: use plugin install hook so it can be used elsewhere * chore: import order * update docs * refactor(OpenAI/Plugins): allow modelLabel as an initial value for chatGptLabel * chore: remove unused EndpointOptionsPopover and hide 'Save as Preset' button if preset UI visibility disabled * feat(loadDefaultInterface): issue warnings based on values * feat: changelog for custom config file * docs: add additional changelog note * fix: prevent unavailable tool selection from preset and update availableTools on Plugin installations * feat: add `filteredTools` option in custom config * chore: changelog * fix(MessageIcon): always overwrite conversation.iconURL in messageSettings * fix(ModelSpecsMenu): icon edge cases * fix(NewChat): dynamic icon * fix(PluginsClient): always include endpoint in responseMessage * fix: always include endpoint and iconURL in responseMessage across different response methods * feat: interchangeable keys for modelSpec enforcing
This commit is contained in:
Danny Avila
GitHub
parent
a5cac03fa4
commit
0e50c07e3f
130 changed files with 3934 additions and 2973 deletions
|
|
@ -3,6 +3,7 @@ import { z } from 'zod';
|
|||
import type { ZodError } from 'zod';
|
||||
import { EModelEndpoint, eModelEndpointSchema } from './schemas';
|
||||
import { fileConfigSchema } from './file-config';
|
||||
import { specsConfigSchema } from './models';
|
||||
import { FileSources } from './types/files';
|
||||
import { TModelsConfig } from './types';
|
||||
|
||||
|
|
@ -27,6 +28,39 @@ export enum SettingsViews {
|
|||
|
||||
export const fileSourceSchema = z.nativeEnum(FileSources);
|
||||
|
||||
// Helper type to extract the shape of the Zod object schema
|
||||
type SchemaShape<T> = T extends z.ZodObject<infer U> ? U : never;
|
||||
|
||||
// Helper type to determine the default value or undefined based on whether the field has a default
|
||||
type DefaultValue<T> = T extends z.ZodDefault<z.ZodTypeAny>
|
||||
? ReturnType<T['_def']['defaultValue']>
|
||||
: undefined;
|
||||
|
||||
// Extract default values or undefined from the schema shape
|
||||
type ExtractDefaults<T> = {
|
||||
[P in keyof T]: DefaultValue<T[P]>;
|
||||
};
|
||||
|
||||
export type SchemaDefaults<T> = ExtractDefaults<SchemaShape<T>>;
|
||||
|
||||
export type TConfigDefaults = SchemaDefaults<typeof configSchema>;
|
||||
|
||||
export function getSchemaDefaults<Schema extends z.AnyZodObject>(
|
||||
schema: Schema,
|
||||
): ExtractDefaults<SchemaShape<Schema>> {
|
||||
const shape = schema.shape;
|
||||
const entries = Object.entries(shape).map(([key, value]) => {
|
||||
if (value instanceof z.ZodDefault) {
|
||||
// Extract default value if it exists
|
||||
return [key, value._def.defaultValue()];
|
||||
}
|
||||
return [key, undefined];
|
||||
});
|
||||
|
||||
// Create the object with the right types
|
||||
return Object.fromEntries(entries) as ExtractDefaults<SchemaShape<Schema>>;
|
||||
}
|
||||
|
||||
export const modelConfigSchema = z
|
||||
.object({
|
||||
deploymentName: z.string().optional(),
|
||||
|
|
@ -200,9 +234,10 @@ export enum EImageOutputType {
|
|||
|
||||
export const configSchema = z.object({
|
||||
version: z.string(),
|
||||
cache: z.boolean().optional().default(true),
|
||||
cache: z.boolean().default(true),
|
||||
secureImageLinks: z.boolean().optional(),
|
||||
imageOutputType: z.nativeEnum(EImageOutputType).optional().default(EImageOutputType.PNG),
|
||||
imageOutputType: z.nativeEnum(EImageOutputType).default(EImageOutputType.PNG),
|
||||
filteredTools: z.array(z.string()).optional(),
|
||||
interface: z
|
||||
.object({
|
||||
privacyPolicy: z
|
||||
|
|
@ -217,17 +252,29 @@ export const configSchema = z.object({
|
|||
openNewTab: z.boolean().optional(),
|
||||
})
|
||||
.optional(),
|
||||
endpointsMenu: z.boolean().optional(),
|
||||
modelSelect: z.boolean().optional(),
|
||||
parameters: z.boolean().optional(),
|
||||
sidePanel: z.boolean().optional(),
|
||||
presets: z.boolean().optional(),
|
||||
})
|
||||
.optional(),
|
||||
fileStrategy: fileSourceSchema.optional(),
|
||||
.default({
|
||||
endpointsMenu: true,
|
||||
modelSelect: true,
|
||||
parameters: true,
|
||||
sidePanel: true,
|
||||
presets: true,
|
||||
}),
|
||||
fileStrategy: fileSourceSchema.default(FileSources.local),
|
||||
registration: z
|
||||
.object({
|
||||
socialLogins: z.array(z.string()).optional(),
|
||||
allowedDomains: z.array(z.string()).optional(),
|
||||
})
|
||||
.optional(),
|
||||
.default({ socialLogins: defaultSocialLogins }),
|
||||
rateLimits: rateLimitSchema.optional(),
|
||||
fileConfig: fileConfigSchema.optional(),
|
||||
modelSpecs: specsConfigSchema.optional(),
|
||||
endpoints: z
|
||||
.object({
|
||||
[EModelEndpoint.azureOpenAI]: azureEndpointSchema.optional(),
|
||||
|
|
@ -241,6 +288,8 @@ export const configSchema = z.object({
|
|||
.optional(),
|
||||
});
|
||||
|
||||
export const getConfigDefaults = () => getSchemaDefaults(configSchema);
|
||||
|
||||
export type TCustomConfig = z.infer<typeof configSchema>;
|
||||
|
||||
export enum KnownEndpoints {
|
||||
|
|
@ -605,32 +654,39 @@ export enum SettingsTabValues {
|
|||
ACCOUNT = 'account',
|
||||
}
|
||||
|
||||
/**
|
||||
* Enum for app-wide constants
|
||||
*/
|
||||
/** Enum for app-wide constants */
|
||||
export enum Constants {
|
||||
/**
|
||||
* Key for the app's version.
|
||||
*/
|
||||
/** Key for the app's version. */
|
||||
VERSION = 'v0.7.1',
|
||||
/**
|
||||
* Key for the Custom Config's version (librechat.yaml).
|
||||
*/
|
||||
CONFIG_VERSION = '1.0.7',
|
||||
/**
|
||||
* Standard value for the first message's `parentMessageId` value, to indicate no parent exists.
|
||||
*/
|
||||
/** Key for the Custom Config's version (librechat.yaml). */
|
||||
CONFIG_VERSION = '1.0.8',
|
||||
/** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */
|
||||
NO_PARENT = '00000000-0000-0000-0000-000000000000',
|
||||
/**
|
||||
* Fixed, encoded domain length for Azure OpenAI Assistants Function name parsing.
|
||||
*/
|
||||
/** Fixed, encoded domain length for Azure OpenAI Assistants Function name parsing. */
|
||||
ENCODED_DOMAIN_LENGTH = 10,
|
||||
/**
|
||||
* Identifier for using current_model in multi-model requests.
|
||||
*/
|
||||
/** Identifier for using current_model in multi-model requests. */
|
||||
CURRENT_MODEL = 'current_model',
|
||||
}
|
||||
|
||||
export enum LocalStorageKeys {
|
||||
/** Key for the admin defined App Title */
|
||||
APP_TITLE = 'appTitle',
|
||||
/** Key for the last conversation setup. */
|
||||
LAST_CONVO_SETUP = 'lastConversationSetup',
|
||||
/** Key for the last BingAI Settings */
|
||||
LAST_BING = 'lastBingSettings',
|
||||
/** Key for the last selected model. */
|
||||
LAST_MODEL = 'lastSelectedModel',
|
||||
/** Key for the last selected tools. */
|
||||
LAST_TOOLS = 'lastSelectedTools',
|
||||
/** Key for the last selected spec by name*/
|
||||
LAST_SPEC = 'lastSelectedSpec',
|
||||
/** Key for temporary files to delete */
|
||||
FILES_TO_DELETE = 'filesToDelete',
|
||||
/** Prefix key for the last selected assistant ID by index */
|
||||
ASST_ID_PREFIX = 'assistant_id__',
|
||||
}
|
||||
|
||||
/**
|
||||
* Enum for Cohere related constants
|
||||
*/
|
||||
|
|
@ -656,37 +712,3 @@ export enum CohereConstants {
|
|||
*/
|
||||
TITLE_MESSAGE = 'TITLE:',
|
||||
}
|
||||
|
||||
export const defaultOrderQuery: {
|
||||
order: 'desc';
|
||||
limit: 100;
|
||||
} = {
|
||||
order: 'desc',
|
||||
limit: 100,
|
||||
};
|
||||
|
||||
export enum AssistantStreamEvents {
|
||||
ThreadCreated = 'thread.created',
|
||||
ThreadRunCreated = 'thread.run.created',
|
||||
ThreadRunQueued = 'thread.run.queued',
|
||||
ThreadRunInProgress = 'thread.run.in_progress',
|
||||
ThreadRunRequiresAction = 'thread.run.requires_action',
|
||||
ThreadRunCompleted = 'thread.run.completed',
|
||||
ThreadRunFailed = 'thread.run.failed',
|
||||
ThreadRunCancelling = 'thread.run.cancelling',
|
||||
ThreadRunCancelled = 'thread.run.cancelled',
|
||||
ThreadRunExpired = 'thread.run.expired',
|
||||
ThreadRunStepCreated = 'thread.run.step.created',
|
||||
ThreadRunStepInProgress = 'thread.run.step.in_progress',
|
||||
ThreadRunStepCompleted = 'thread.run.step.completed',
|
||||
ThreadRunStepFailed = 'thread.run.step.failed',
|
||||
ThreadRunStepCancelled = 'thread.run.step.cancelled',
|
||||
ThreadRunStepExpired = 'thread.run.step.expired',
|
||||
ThreadRunStepDelta = 'thread.run.step.delta',
|
||||
ThreadMessageCreated = 'thread.message.created',
|
||||
ThreadMessageInProgress = 'thread.message.in_progress',
|
||||
ThreadMessageCompleted = 'thread.message.completed',
|
||||
ThreadMessageIncomplete = 'thread.message.incomplete',
|
||||
ThreadMessageDelta = 'thread.message.delta',
|
||||
ErrorEvent = 'error',
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue