@librechat/agents 2.4.41 → 2.4.42

package/src/specs/openai.simple.test.ts

@@ -4,10 +4,18 @@
 import { config } from 'dotenv';
 config();
 import { Calculator } from '@langchain/community/tools/calculator';
-import { HumanMessage, BaseMessage, UsageMetadata } from '@langchain/core/messages';
+import {
+  HumanMessage,
+  BaseMessage,
+  UsageMetadata,
+} from '@langchain/core/messages';
 import type { StandardGraph } from '@/graphs';
 import type * as t from '@/types';
-import { ToolEndHandler, ModelEndHandler, createMetadataAggregator } from '@/events';
+import {
+  ToolEndHandler,
+  ModelEndHandler,
+  createMetadataAggregator,
+} from '@/events';
 import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
 import { ContentTypes, GraphEvents, Providers } from '@/common';
 import { capitalizeFirstLetter } from './spec.utils';
@@ -36,7 +44,8 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
   beforeEach(async () => {
     conversationHistory = [];
     collectedUsage = [];
-    const { contentParts: cp, aggregateContent: ac } = createContentAggregator();
+    const { contentParts: cp, aggregateContent: ac } =
+      createContentAggregator();
     contentParts = cp as t.MessageContentComplex[];
     aggregateContent = ac;
   });
@@ -49,36 +58,62 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
     onRunStepSpy.mockReset();
   });
 
-  const setupCustomHandlers = (): Record<string | GraphEvents, t.EventHandler> => ({
+  const setupCustomHandlers = (): Record<
+    string | GraphEvents,
+    t.EventHandler
+  > => ({
     [GraphEvents.TOOL_END]: new ToolEndHandler(),
     [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(collectedUsage),
     [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
     [GraphEvents.ON_RUN_STEP_COMPLETED]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_COMPLETED, data: t.StreamEventData): void => {
-        aggregateContent({ event, data: data as unknown as { result: t.ToolEndEvent; } });
-      }
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_COMPLETED,
+        data: t.StreamEventData
+      ): void => {
+        aggregateContent({
+          event,
+          data: data as unknown as { result: t.ToolEndEvent },
+        });
+      },
     },
     [GraphEvents.ON_RUN_STEP]: {
-      handle: (event: GraphEvents.ON_RUN_STEP, data: t.StreamEventData, metadata, graph): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP,
+        data: t.StreamEventData,
+        metadata,
+        graph
+      ): void => {
         onRunStepSpy(event, data, metadata, graph);
         aggregateContent({ event, data: data as t.RunStep });
-      }
+      },
     },
     [GraphEvents.ON_RUN_STEP_DELTA]: {
-      handle: (event: GraphEvents.ON_RUN_STEP_DELTA, data: t.StreamEventData): void => {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_DELTA,
+        data: t.StreamEventData
+      ): void => {
         aggregateContent({ event, data: data as t.RunStepDeltaEvent });
-      }
+      },
     },
     [GraphEvents.ON_MESSAGE_DELTA]: {
-      handle: (event: GraphEvents.ON_MESSAGE_DELTA, data: t.StreamEventData, metadata, graph): void => {
+      handle: (
+        event: GraphEvents.ON_MESSAGE_DELTA,
+        data: t.StreamEventData,
+        metadata,
+        graph
+      ): void => {
         onMessageDeltaSpy(event, data, metadata, graph);
         aggregateContent({ event, data: data as t.MessageDeltaEvent });
-      }
+      },
     },
     [GraphEvents.TOOL_START]: {
-      handle: (_event: string, _data: t.StreamEventData, _metadata?: Record<string, unknown>): void => {
+      handle: (
+        _event: string,
+        _data: t.StreamEventData,
+        _metadata?: Record<string, unknown>
+      ): void => {
         // Handle tool start
-      }
+      },
     },
   });
 
@@ -93,7 +128,8 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
         type: 'standard',
         llmConfig,
         tools: [new Calculator()],
-        instructions: 'You are a friendly AI assistant. Always address the user by their name.',
+        instructions:
+          'You are a friendly AI assistant. Always address the user by their name.',
         additional_instructions: `The user's name is ${userName} and they are located in ${location}.`,
       },
       returnContent: true,
@@ -109,7 +145,9 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
 
     const finalContentParts = await run.processStream(inputs, config);
     expect(finalContentParts).toBeDefined();
-    const allTextParts = finalContentParts?.every((part) => part.type === ContentTypes.TEXT);
+    const allTextParts = finalContentParts?.every(
+      (part) => part.type === ContentTypes.TEXT
+    );
     expect(allTextParts).toBe(true);
     expect(collectedUsage.length).toBeGreaterThan(0);
     expect(collectedUsage[0].input_tokens).toBeGreaterThan(0);
@@ -117,26 +155,33 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
 
     const finalMessages = run.getRunMessages();
     expect(finalMessages).toBeDefined();
-    conversationHistory.push(...finalMessages ?? []);
+    conversationHistory.push(...(finalMessages ?? []));
     expect(conversationHistory.length).toBeGreaterThan(1);
     runningHistory = conversationHistory.slice();
 
     expect(onMessageDeltaSpy).toHaveBeenCalled();
     expect(onMessageDeltaSpy.mock.calls.length).toBeGreaterThan(1);
-    expect((onMessageDeltaSpy.mock.calls[0][3] as StandardGraph).provider).toBeDefined();
+    expect(
+      (onMessageDeltaSpy.mock.calls[0][3] as StandardGraph).provider
+    ).toBeDefined();
 
     expect(onRunStepSpy).toHaveBeenCalled();
     expect(onRunStepSpy.mock.calls.length).toBeGreaterThan(0);
-    expect((onRunStepSpy.mock.calls[0][3] as StandardGraph).provider).toBeDefined();
+    expect(
+      (onRunStepSpy.mock.calls[0][3] as StandardGraph).provider
+    ).toBeDefined();
 
     const { handleLLMEnd, collected } = createMetadataAggregator();
     const titleResult = await run.generateTitle({
+      provider,
       inputText: userMessage,
       contentParts,
       chainOptions: {
-        callbacks: [{
-          handleLLMEnd,
-        }],
+        callbacks: [
+          {
+            handleLLMEnd,
+          },
+        ],
       },
     });
 
@@ -148,7 +193,10 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
 
   test(`${capitalizeFirstLetter(provider)}: should follow-up`, async () => {
     console.log('Previous conversation length:', runningHistory.length);
-    console.log('Last message:', runningHistory[runningHistory.length - 1].content);
+    console.log(
+      'Last message:',
+      runningHistory[runningHistory.length - 1].content
+    );
     const { userName, location } = await getArgs();
     const llmConfig = getLLMConfig(provider);
     const customHandlers = setupCustomHandlers();
@@ -159,7 +207,8 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
         type: 'standard',
         llmConfig,
         tools: [new Calculator()],
-        instructions: 'You are a friendly AI assistant. Always address the user by their name.',
+        instructions:
+          'You are a friendly AI assistant. Always address the user by their name.',
         additional_instructions: `The user's name is ${userName} and they are located in ${location}.`,
       },
       returnContent: true,
@@ -175,7 +224,9 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
 
     const finalContentParts = await run.processStream(inputs, config);
     expect(finalContentParts).toBeDefined();
-    const allTextParts = finalContentParts?.every((part) => part.type === ContentTypes.TEXT);
+    const allTextParts = finalContentParts?.every(
+      (part) => part.type === ContentTypes.TEXT
+    );
     expect(allTextParts).toBe(true);
     expect(collectedUsage.length).toBeGreaterThan(0);
     expect(collectedUsage[0].input_tokens).toBeGreaterThan(0);
@@ -184,7 +235,10 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
     const finalMessages = run.getRunMessages();
     expect(finalMessages).toBeDefined();
     expect(finalMessages?.length).toBeGreaterThan(0);
-    console.log(`${capitalizeFirstLetter(provider)} follow-up message:`, finalMessages?.[finalMessages.length - 1]?.content);
+    console.log(
+      `${capitalizeFirstLetter(provider)} follow-up message:`,
+      finalMessages?.[finalMessages.length - 1]?.content
+    );
 
     expect(onMessageDeltaSpy).toHaveBeenCalled();
     expect(onMessageDeltaSpy.mock.calls.length).toBeGreaterThan(1);
@@ -196,9 +250,12 @@ describe(`${capitalizeFirstLetter(provider)} Streaming Tests`, () => {
   test('should handle errors appropriately', async () => {
     // Test error scenarios
     await expect(async () => {
-      await run.processStream({
-        messages: [],
-      }, {} as any);
+      await run.processStream(
+        {
+          messages: [],
+        },
+        {} as any
+      );
     }).rejects.toThrow();
   });
-});
+});

package/src/types/run.ts

@@ -26,6 +26,7 @@ export type StandardGraphConfig = BaseGraphConfig &
 
 export type RunTitleOptions = {
   inputText: string;
+  provider: e.Providers;
   contentParts: (s.MessageContentComplex | undefined)[];
   titlePrompt?: string;
   skipLanguage?: boolean;

package/src/utils/title.ts

@@ -4,48 +4,65 @@ import { RunnableLambda } from '@langchain/core/runnables';
 import type { Runnable } from '@langchain/core/runnables';
 import * as t from '@/types';
 
-const defaultTitlePrompt = `Write a concise title for this conversation in the detected language. Title in 5 Words or Less. No Punctuation or Quotation.
-{convo}`;
-
-const languageInstructions = 'Detect the language used in the following text. Note: words may be misspelled or cut off; use context clues to identify the language:\n{text}';
+const defaultTitlePrompt = `Analyze this conversation and provide:
+1. The detected language of the conversation
+2. A concise title in the detected language (5 words or less, no punctuation or quotation)
 
-const languagePrompt = ChatPromptTemplate.fromTemplate(languageInstructions);
+{convo}`;
 
-const languageSchema = z.object({
-  language: z.string().describe('The detected language of the conversation')
+const titleSchema = z.object({
+  title: z
+    .string()
+    .describe(
+      'A concise title for the conversation in 5 words or less, without punctuation or quotation'
+    ),
 });
 
-const titleSchema = z.object({
-  title: z.string().describe('A concise title for the conversation in 5 words or less, without punctuation or quotation'),
+const combinedSchema = z.object({
+  language: z.string().describe('The detected language of the conversation'),
+  title: z
+    .string()
+    .describe(
+      'A concise title for the conversation in 5 words or less, without punctuation or quotation'
+    ),
 });
 
-export const createTitleRunnable = async (model: t.ChatModelInstance, _titlePrompt?: string): Promise<Runnable> => {
+export const createTitleRunnable = async (
+  model: t.ChatModelInstance,
+  _titlePrompt?: string
+): Promise<Runnable> => {
   // Disabled since this works fine
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   /* @ts-ignore */
-  const languageLLM = model.withStructuredOutput(languageSchema);
+  const titleLLM = model.withStructuredOutput(titleSchema);
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   /* @ts-ignore */
-  const titleLLM = model.withStructuredOutput(titleSchema);
-
-  const languageChain = languagePrompt.pipe(languageLLM);
+  const combinedLLM = model.withStructuredOutput(combinedSchema);
 
-  const titlePrompt = ChatPromptTemplate.fromTemplate(_titlePrompt ?? defaultTitlePrompt);
+  const titlePrompt = ChatPromptTemplate.fromTemplate(
+    _titlePrompt ?? defaultTitlePrompt
+  );
 
   return new RunnableLambda({
-    func: async (input: { convo: string, inputText: string, skipLanguage: boolean }): Promise<{ language: string; title: string } | { title: string }> => {
+    func: async (input: {
+      convo: string;
+      inputText: string;
+      skipLanguage: boolean;
+    }): Promise<{ language: string; title: string } | { title: string }> => {
       if (input.skipLanguage) {
-        return await titlePrompt.pipe(titleLLM).invoke({
-          convo: input.convo
-        }) as { title: string };
+        return (await titlePrompt.pipe(titleLLM).invoke({
+          convo: input.convo,
+        })) as { title: string };
       }
-      const languageResult = await languageChain.invoke({ text: input.inputText }) as { language: string } | undefined;
-      const language = languageResult?.language ?? 'English';
-      const titleResult = await titlePrompt.pipe(titleLLM).invoke({
-        language,
-        convo: input.convo
-      }) as { title: string } | undefined;
-      return { language, title: titleResult?.title ?? '' };
+
+      const result = (await titlePrompt.pipe(combinedLLM).invoke({
+        convo: input.convo,
+      })) as { language: string; title: string } | undefined;
+
+      return {
+        language: result?.language ?? 'English',
+        title: result?.title ?? '',
+      };
     },
   });
-};
+};