librechat-data-provider 0.7.41 → 0.7.52

package/src/bedrock.ts

@@ -0,0 +1,147 @@
+import { z } from 'zod';
+import * as s from './schemas';
+
+export const bedrockInputSchema = s.tConversationSchema
+  .pick({
+    /* LibreChat params; optionType: 'conversation' */
+    modelLabel: true,
+    promptPrefix: true,
+    resendFiles: true,
+    iconURL: true,
+    greeting: true,
+    spec: true,
+    maxOutputTokens: true,
+    maxContextTokens: true,
+    artifacts: true,
+    /* Bedrock params; optionType: 'model' */
+    region: true,
+    system: true,
+    model: true,
+    maxTokens: true,
+    temperature: true,
+    topP: true,
+    stop: true,
+    /* Catch-all fields */
+    topK: true,
+    additionalModelRequestFields: true,
+  })
+  .transform(s.removeNullishValues)
+  .catch(() => ({}));
+
+export type BedrockConverseInput = z.infer<typeof bedrockInputSchema>;
+
+export const bedrockInputParser = s.tConversationSchema
+  .pick({
+    /* LibreChat params; optionType: 'conversation' */
+    modelLabel: true,
+    promptPrefix: true,
+    resendFiles: true,
+    iconURL: true,
+    greeting: true,
+    spec: true,
+    artifacts: true,
+    maxOutputTokens: true,
+    maxContextTokens: true,
+    /* Bedrock params; optionType: 'model' */
+    region: true,
+    model: true,
+    maxTokens: true,
+    temperature: true,
+    topP: true,
+    stop: true,
+    /* Catch-all fields */
+    topK: true,
+    additionalModelRequestFields: true,
+  })
+  .catchall(z.any())
+  .transform((data) => {
+    const knownKeys = [
+      'modelLabel',
+      'promptPrefix',
+      'resendFiles',
+      'iconURL',
+      'greeting',
+      'spec',
+      'maxOutputTokens',
+      'artifacts',
+      'additionalModelRequestFields',
+      'region',
+      'model',
+      'maxTokens',
+      'temperature',
+      'topP',
+      'stop',
+    ];
+
+    const additionalFields: Record<string, unknown> = {};
+    const typedData = data as Record<string, unknown>;
+
+    Object.entries(typedData).forEach(([key, value]) => {
+      if (!knownKeys.includes(key)) {
+        if (key === 'topK') {
+          additionalFields['top_k'] = value;
+        } else {
+          additionalFields[key] = value;
+        }
+        delete typedData[key];
+      }
+    });
+
+    if (Object.keys(additionalFields).length > 0) {
+      typedData.additionalModelRequestFields = {
+        ...((typedData.additionalModelRequestFields as Record<string, unknown> | undefined) || {}),
+        ...additionalFields,
+      };
+    }
+
+    if (typedData.maxOutputTokens !== undefined) {
+      typedData.maxTokens = typedData.maxOutputTokens;
+    } else if (typedData.maxTokens !== undefined) {
+      typedData.maxOutputTokens = typedData.maxTokens;
+    }
+
+    return s.removeNullishValues(typedData) as BedrockConverseInput;
+  })
+  .catch(() => ({}));
+
+export const bedrockOutputParser = (data: Record<string, unknown>) => {
+  const knownKeys = [...Object.keys(s.tConversationSchema.shape), 'topK', 'top_k'];
+  const result: Record<string, unknown> = {};
+
+  // Extract known fields from the root level
+  Object.entries(data).forEach(([key, value]) => {
+    if (knownKeys.includes(key)) {
+      result[key] = value;
+    }
+  });
+
+  // Extract known fields from additionalModelRequestFields
+  if (
+    typeof data.additionalModelRequestFields === 'object' &&
+    data.additionalModelRequestFields !== null
+  ) {
+    Object.entries(data.additionalModelRequestFields as Record<string, unknown>).forEach(
+      ([key, value]) => {
+        if (knownKeys.includes(key)) {
+          if (key === 'top_k') {
+            result['topK'] = value;
+          } else {
+            result[key] = value;
+          }
+        }
+      },
+    );
+  }
+
+  // Handle maxTokens and maxOutputTokens
+  if (result.maxTokens !== undefined && result.maxOutputTokens === undefined) {
+    result.maxOutputTokens = result.maxTokens;
+  } else if (result.maxOutputTokens !== undefined && result.maxTokens === undefined) {
+    result.maxTokens = result.maxOutputTokens;
+  }
+
+  // Remove additionalModelRequestFields from the result
+  delete result.additionalModelRequestFields;
+
+  return result;
+};

package/src/config.ts

@@ -11,6 +11,11 @@ export const defaultSocialLogins = ['google', 'facebook', 'openid', 'github', 'd
 
 export const defaultRetrievalModels = [
   'gpt-4o',
+  'o1-preview-2024-09-12',
+  'o1-preview',
+  'o1-mini-2024-09-12',
+  'o1-mini',
+  'chatgpt-4o-latest',
   'gpt-4o-2024-05-13',
   'gpt-4o-2024-08-06',
   'gpt-4o-mini',
@@ -134,6 +139,13 @@ export enum Capabilities {
   tools = 'tools',
 }
 
+export enum AgentCapabilities {
+  execute_code = 'execute_code',
+  file_search = 'file_search',
+  actions = 'actions',
+  tools = 'tools',
+}
+
 export const defaultAssistantsVersion = {
   [EModelEndpoint.assistants]: 2,
   [EModelEndpoint.azureAssistants]: 1,
@@ -141,10 +153,19 @@ export const defaultAssistantsVersion = {
 
 export const baseEndpointSchema = z.object({
   streamRate: z.number().optional(),
+  baseURL: z.string().optional(),
+  titlePrompt: z.string().optional(),
+  titleModel: z.string().optional(),
 });
 
 export type TBaseEndpoint = z.infer<typeof baseEndpointSchema>;
 
+export const bedrockEndpointSchema = baseEndpointSchema.merge(
+  z.object({
+    availableRegions: z.array(z.string()).optional(),
+  }),
+);
+
 export const assistantEndpointSchema = baseEndpointSchema.merge(
   z.object({
     /* assistants specific */
@@ -168,7 +189,6 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(
       ]),
     /* general */
     apiKey: z.string().optional(),
-    baseURL: z.string().optional(),
     models: z
       .object({
         default: z.array(z.string()).min(1),
@@ -178,13 +198,50 @@ export const assistantEndpointSchema = baseEndpointSchema.merge(
       .optional(),
     titleConvo: z.boolean().optional(),
     titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
-    titleModel: z.string().optional(),
     headers: z.record(z.any()).optional(),
   }),
 );
 
 export type TAssistantEndpoint = z.infer<typeof assistantEndpointSchema>;
 
+export const agentsEndpointSChema = baseEndpointSchema.merge(
+  z.object({
+    /* assistants specific */
+    disableBuilder: z.boolean().optional(),
+    pollIntervalMs: z.number().optional(),
+    timeoutMs: z.number().optional(),
+    version: z.union([z.string(), z.number()]).default(2),
+    supportedIds: z.array(z.string()).min(1).optional(),
+    excludedIds: z.array(z.string()).min(1).optional(),
+    privateAssistants: z.boolean().optional(),
+    retrievalModels: z.array(z.string()).min(1).optional().default(defaultRetrievalModels),
+    capabilities: z
+      .array(z.nativeEnum(Capabilities))
+      .optional()
+      .default([
+        Capabilities.code_interpreter,
+        Capabilities.image_vision,
+        Capabilities.retrieval,
+        Capabilities.actions,
+        Capabilities.tools,
+      ]),
+    /* general */
+    apiKey: z.string().optional(),
+    models: z
+      .object({
+        default: z.array(z.string()).min(1),
+        fetch: z.boolean().optional(),
+        userIdQuery: z.boolean().optional(),
+      })
+      .optional(),
+    titleConvo: z.boolean().optional(),
+    titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
+    headers: z.record(z.any()).optional(),
+  }),
+);
+
+export type TAgentsEndpoint = z.infer<typeof agentsEndpointSChema>;
+
 export const endpointSchema = baseEndpointSchema.merge(
   z.object({
     name: z.string().refine((value) => !eModelEndpointSchema.safeParse(value).success, {
@@ -201,7 +258,6 @@ export const endpointSchema = baseEndpointSchema.merge(
     }),
     titleConvo: z.boolean().optional(),
     titleMethod: z.union([z.literal('completion'), z.literal('functions')]).optional(),
-    titleModel: z.string().optional(),
     summarize: z.boolean().optional(),
     summaryModel: z.string().optional(),
     forcePrompt: z.boolean().optional(),
@@ -406,13 +462,19 @@ export const configSchema = z.object({
         .object({
           externalUrl: z.string().optional(),
           openNewTab: z.boolean().optional(),
+          modalAcceptance: z.boolean().optional(),
+          modalTitle: z.string().optional(),
+          modalContent: z.string().or(z.array(z.string())).optional(),
         })
         .optional(),
       endpointsMenu: z.boolean().optional(),
       modelSelect: z.boolean().optional(),
       parameters: z.boolean().optional(),
       sidePanel: z.boolean().optional(),
+      multiConvo: z.boolean().optional(),
+      bookmarks: z.boolean().optional(),
       presets: z.boolean().optional(),
+      prompts: z.boolean().optional(),
     })
     .default({
       endpointsMenu: true,
@@ -420,6 +482,9 @@ export const configSchema = z.object({
       parameters: true,
       sidePanel: true,
       presets: true,
+      multiConvo: true,
+      bookmarks: true,
+      prompts: true,
     }),
   fileStrategy: fileSourceSchema.default(FileSources.local),
   registration: z
@@ -448,7 +513,9 @@ export const configSchema = z.object({
       [EModelEndpoint.azureOpenAI]: azureEndpointSchema.optional(),
       [EModelEndpoint.azureAssistants]: assistantEndpointSchema.optional(),
       [EModelEndpoint.assistants]: assistantEndpointSchema.optional(),
+      [EModelEndpoint.agents]: agentsEndpointSChema.optional(),
       [EModelEndpoint.custom]: z.array(endpointSchema.partial()).optional(),
+      [EModelEndpoint.bedrock]: baseEndpointSchema.optional(),
     })
     .strict()
     .refine((data) => Object.keys(data).length > 0, {
@@ -472,6 +539,7 @@ export enum KnownEndpoints {
   apipie = 'apipie',
   cohere = 'cohere',
   fireworks = 'fireworks',
+  deepseek = 'deepseek',
   groq = 'groq',
   huggingface = 'huggingface',
   mistral = 'mistral',
@@ -481,6 +549,7 @@ export enum KnownEndpoints {
   perplexity = 'perplexity',
   shuttleai = 'shuttleai',
   'together.ai' = 'together.ai',
+  unify = 'unify',
 }
 
 export enum FetchTokenConfig {
@@ -492,17 +561,20 @@ export const defaultEndpoints: EModelEndpoint[] = [
   EModelEndpoint.assistants,
   EModelEndpoint.azureAssistants,
   EModelEndpoint.azureOpenAI,
+  EModelEndpoint.agents,
   EModelEndpoint.bingAI,
   EModelEndpoint.chatGPTBrowser,
   EModelEndpoint.gptPlugins,
   EModelEndpoint.google,
   EModelEndpoint.anthropic,
   EModelEndpoint.custom,
+  EModelEndpoint.bedrock,
 ];
 
 export const alternateName = {
   [EModelEndpoint.openAI]: 'OpenAI',
   [EModelEndpoint.assistants]: 'Assistants',
+  [EModelEndpoint.agents]: 'Agents',
   [EModelEndpoint.azureAssistants]: 'Azure Assistants',
   [EModelEndpoint.azureOpenAI]: 'Azure OpenAI',
   [EModelEndpoint.bingAI]: 'Bing',
@@ -511,9 +583,13 @@ export const alternateName = {
   [EModelEndpoint.google]: 'Google',
   [EModelEndpoint.anthropic]: 'Anthropic',
   [EModelEndpoint.custom]: 'Custom',
+  [EModelEndpoint.bedrock]: 'AWS Bedrock',
+  ollama: 'Ollama',
 };
 
 const sharedOpenAIModels = [
+  'gpt-4o-mini',
+  'gpt-4o',
   'gpt-3.5-turbo',
   'gpt-3.5-turbo-0125',
   'gpt-4-turbo',
@@ -531,9 +607,59 @@ const sharedOpenAIModels = [
   'gpt-3.5-turbo-0613',
 ];
 
+const sharedAnthropicModels = [
+  'claude-3-5-sonnet-20241022',
+  'claude-3-5-sonnet-20240620',
+  'claude-3-5-sonnet-latest',
+  'claude-3-opus-20240229',
+  'claude-3-sonnet-20240229',
+  'claude-3-haiku-20240307',
+  'claude-2.1',
+  'claude-2',
+  'claude-1.2',
+  'claude-1',
+  'claude-1-100k',
+  'claude-instant-1',
+  'claude-instant-1-100k',
+];
+
+export const bedrockModels = [
+  'anthropic.claude-3-5-sonnet-20241022-v2:0',
+  'anthropic.claude-3-5-sonnet-20240620-v1:0',
+  'anthropic.claude-3-haiku-20240307-v1:0',
+  'anthropic.claude-3-opus-20240229-v1:0',
+  'anthropic.claude-3-sonnet-20240229-v1:0',
+  'anthropic.claude-v2',
+  'anthropic.claude-v2:1',
+  'anthropic.claude-instant-v1',
+  // 'cohere.command-text-v14', // no conversation history
+  // 'cohere.command-light-text-v14', // no conversation history
+  'cohere.command-r-v1:0',
+  'cohere.command-r-plus-v1:0',
+  'meta.llama2-13b-chat-v1',
+  'meta.llama2-70b-chat-v1',
+  'meta.llama3-8b-instruct-v1:0',
+  'meta.llama3-70b-instruct-v1:0',
+  'meta.llama3-1-8b-instruct-v1:0',
+  'meta.llama3-1-70b-instruct-v1:0',
+  'meta.llama3-1-405b-instruct-v1:0',
+  'mistral.mistral-7b-instruct-v0:2',
+  'mistral.mixtral-8x7b-instruct-v0:1',
+  'mistral.mistral-large-2402-v1:0',
+  'mistral.mistral-large-2407-v1:0',
+  'mistral.mistral-small-2402-v1:0',
+  'ai21.jamba-instruct-v1:0',
+  // 'ai21.j2-mid-v1', // no streaming
+  // 'ai21.j2-ultra-v1', no conversation history
+  'amazon.titan-text-lite-v1',
+  'amazon.titan-text-express-v1',
+  'amazon.titan-text-premier-v1:0',
+];
+
 export const defaultModels = {
   [EModelEndpoint.azureAssistants]: sharedOpenAIModels,
-  [EModelEndpoint.assistants]: ['gpt-4o-mini', 'gpt-4o', ...sharedOpenAIModels],
+  [EModelEndpoint.assistants]: ['chatgpt-4o-latest', ...sharedOpenAIModels],
+  [EModelEndpoint.agents]: sharedOpenAIModels, // TODO: Add agent models (agentsModels)
   [EModelEndpoint.google]: [
     'gemini-pro',
     'gemini-pro-vision',
@@ -548,27 +674,15 @@ export const defaultModels = {
     'code-bison',
     'code-bison-32k',
   ],
-  [EModelEndpoint.anthropic]: [
-    'claude-3-5-sonnet-20240620',
-    'claude-3-opus-20240229',
-    'claude-3-sonnet-20240229',
-    'claude-3-haiku-20240307',
-    'claude-2.1',
-    'claude-2',
-    'claude-1.2',
-    'claude-1',
-    'claude-1-100k',
-    'claude-instant-1',
-    'claude-instant-1-100k',
-  ],
+  [EModelEndpoint.anthropic]: sharedAnthropicModels,
   [EModelEndpoint.openAI]: [
-    'gpt-4o-mini',
-    'gpt-4o',
+    'chatgpt-4o-latest',
     ...sharedOpenAIModels,
     'gpt-4-vision-preview',
     'gpt-3.5-turbo-instruct-0914',
     'gpt-3.5-turbo-instruct',
   ],
+  [EModelEndpoint.bedrock]: bedrockModels,
 };
 
 const fitlerAssistantModels = (str: string) => {
@@ -581,12 +695,14 @@ export const initialModelsConfig: TModelsConfig = {
   initial: [],
   [EModelEndpoint.openAI]: openAIModels,
   [EModelEndpoint.assistants]: openAIModels.filter(fitlerAssistantModels),
+  [EModelEndpoint.agents]: openAIModels, // TODO: Add agent models (agentsModels)
   [EModelEndpoint.gptPlugins]: openAIModels,
   [EModelEndpoint.azureOpenAI]: openAIModels,
   [EModelEndpoint.bingAI]: ['BingAI', 'Sydney'],
   [EModelEndpoint.chatGPTBrowser]: ['text-davinci-002-render-sha'],
   [EModelEndpoint.google]: defaultModels[EModelEndpoint.google],
   [EModelEndpoint.anthropic]: defaultModels[EModelEndpoint.anthropic],
+  [EModelEndpoint.bedrock]: defaultModels[EModelEndpoint.bedrock],
 };
 
 export const EndpointURLs: { [key in EModelEndpoint]: string } = {
@@ -600,6 +716,8 @@ export const EndpointURLs: { [key in EModelEndpoint]: string } = {
   [EModelEndpoint.chatGPTBrowser]: `/api/ask/${EModelEndpoint.chatGPTBrowser}`,
   [EModelEndpoint.azureAssistants]: '/api/assistants/v1/chat',
   [EModelEndpoint.assistants]: '/api/assistants/v2/chat',
+  [EModelEndpoint.agents]: `/api/${EModelEndpoint.agents}/chat`,
+  [EModelEndpoint.bedrock]: `/api/${EModelEndpoint.bedrock}/chat`,
 };
 
 export const modularEndpoints = new Set<EModelEndpoint | string>([
@@ -609,6 +727,8 @@ export const modularEndpoints = new Set<EModelEndpoint | string>([
   EModelEndpoint.openAI,
   EModelEndpoint.azureOpenAI,
   EModelEndpoint.custom,
+  EModelEndpoint.agents,
+  EModelEndpoint.bedrock,
 ]);
 
 export const supportsBalanceCheck = {
@@ -617,8 +737,10 @@ export const supportsBalanceCheck = {
   [EModelEndpoint.anthropic]: true,
   [EModelEndpoint.gptPlugins]: true,
   [EModelEndpoint.assistants]: true,
+  [EModelEndpoint.agents]: true,
   [EModelEndpoint.azureAssistants]: true,
   [EModelEndpoint.azureOpenAI]: true,
+  [EModelEndpoint.bedrock]: true,
 };
 
 export const visionModels = [
@@ -634,6 +756,7 @@ export const visionModels = [
 ];
 export enum VisionModes {
   generative = 'generative',
+  agents = 'agents',
 }
 
 export function validateVisionModel({
@@ -831,6 +954,18 @@ export enum ErrorTypes {
    * Moderation error
    */
   MODERATION = 'moderation',
+  /**
+   * Prompt exceeds max length
+   */
+  INPUT_LENGTH = 'INPUT_LENGTH',
+  /**
+   * Invalid request error, API rejected request
+   */
+  INVALID_REQUEST = 'invalid_request_error',
+  /**
+   * Invalid request error, API rejected request
+   */
+  NO_SYSTEM_MESSAGES = 'no_system_messages',
 }
 
 /**
@@ -940,9 +1075,9 @@ export enum TTSProviders {
 /** Enum for app-wide constants */
 export enum Constants {
   /** Key for the app's version. */
-  VERSION = 'v0.7.4',
+  VERSION = 'v0.7.5',
   /** Key for the Custom Config's version (librechat.yaml). */
-  CONFIG_VERSION = '1.1.5',
+  CONFIG_VERSION = '1.1.7',
   /** Standard value for the first message's `parentMessageId` value, to indicate no parent exists. */
   NO_PARENT = '00000000-0000-0000-0000-000000000000',
   /** Standard value for the initial conversationId before a request is sent */
@@ -959,6 +1094,10 @@ export enum Constants {
   DEFAULT_STREAM_RATE = 1,
   /** Saved Tag */
   SAVED_TAG = 'Saved',
+  /** Max number of Conversation starters for Agents/Assistants */
+  MAX_CONVO_STARTERS = 4,
+  /** Global/instance Project Name */
+  GLOBAL_PROJECT_NAME = 'instance',
 }
 
 export enum LocalStorageKeys {
@@ -978,10 +1117,12 @@ export enum LocalStorageKeys {
   FILES_TO_DELETE = 'filesToDelete',
   /** Prefix key for the last selected assistant ID by index */
   ASST_ID_PREFIX = 'assistant_id__',
+  /** Prefix key for the last selected agent ID by index */
+  AGENT_ID_PREFIX = 'agent_id__',
   /** Key for the last selected fork setting */
   FORK_SETTING = 'forkSetting',
   /** Key for remembering the last selected option, instead of manually selecting */
-  REMEMBER_FORK_OPTION = 'rememberForkOption',
+  REMEMBER_FORK_OPTION = 'rememberDefaultFork',
   /** Key for remembering the split at target fork option modifier */
   FORK_SPLIT_AT_TARGET = 'splitAtTarget',
   /** Key for saving text drafts */
@@ -990,6 +1131,10 @@ export enum LocalStorageKeys {
   FILES_DRAFT = 'filesDraft_',
   /** Key for last Selected Prompt Category */
   LAST_PROMPT_CATEGORY = 'lastPromptCategory',
+  /** Key for rendering User Messages as Markdown */
+  ENABLE_USER_MSG_MARKDOWN = 'enableUserMsgMarkdown',
+  /** Key for displaying analysis tool code input */
+  SHOW_ANALYSIS_CODE = 'showAnalysisCode',
 }
 
 export enum ForkOptions {
@@ -1033,3 +1178,10 @@ export enum SystemCategories {
   NO_CATEGORY = 'sys__no__category__sys',
   SHARED_PROMPTS = 'sys__shared__prompts__sys',
 }
+
+export const providerEndpointMap = {
+  [EModelEndpoint.openAI]: EModelEndpoint.openAI,
+  [EModelEndpoint.bedrock]: EModelEndpoint.bedrock,
+  [EModelEndpoint.azureOpenAI]: EModelEndpoint.openAI,
+  [EModelEndpoint.anthropic]: EModelEndpoint.anthropic,
+};