Merge branch 'feat/deep-research' into master-deep-research

src/components/ChatWindow.tsx

@@ -363,7 +363,6 @@ const ChatWindow = ({ id }: { id?: string }) => {
 
       if (data.type === 'sources') {
         sources = data.data;
-        if (!added) {
         setMessages((prevMessages) => [
           ...prevMessages,
           {
@@ -376,7 +375,6 @@ const ChatWindow = ({ id }: { id?: string }) => {
           },
         ]);
         added = true;
-        }
         setMessageAppeared(true);
       }
 
@@ -394,8 +392,8 @@ const ChatWindow = ({ id }: { id?: string }) => {
             },
           ]);
           added = true;
-        }
+          setMessageAppeared(true);
-
+        } else {
           setMessages((prev) =>
             prev.map((message) => {
               if (message.messageId === data.messageId) {
@@ -405,9 +403,9 @@ const ChatWindow = ({ id }: { id?: string }) => {
               return message;
             }),
           );
+        }
 
         recievedMessage += data.data;
-        setMessageAppeared(true);
       }
 
       if (data.type === 'messageEnd') {

src/lib/search/metaSearchAgent.ts

@@ -6,11 +6,6 @@ import {
   MessagesPlaceholder,
   PromptTemplate,
 } from '@langchain/core/prompts';
-import {
-  RunnableLambda,
-  RunnableMap,
-  RunnableSequence,
-} from '@langchain/core/runnables';
 import { BaseMessage } from '@langchain/core/messages';
 import { StringOutputParser } from '@langchain/core/output_parsers';
 import LineListOutputParser from '../outputParsers/listLineOutputParser';
@@ -24,6 +19,7 @@ import computeSimilarity from '../utils/computeSimilarity';
 import formatChatHistoryAsString from '../utils/formatHistory';
 import eventEmitter from 'events';
 import { StreamEvent } from '@langchain/core/tracers/log_stream';
+import { EventEmitter } from 'node:stream';
 
 export interface MetaSearchAgentType {
   searchAndAnswer: (
@@ -47,7 +43,7 @@ interface Config {
   activeEngines: string[];
 }
 
-type BasicChainInput = {
+type SearchInput = {
   chat_history: BaseMessage[];
   query: string;
 };
@@ -60,14 +56,25 @@ class MetaSearchAgent implements MetaSearchAgentType {
     this.config = config;
   }
 
-  private async createSearchRetrieverChain(llm: BaseChatModel) {
+  private async searchSources(
+    llm: BaseChatModel,
+    input: SearchInput,
+    emitter: EventEmitter,
+  ) {
     (llm as unknown as ChatOpenAI).temperature = 0;
 
-    return RunnableSequence.from([
+    const chatPrompt = PromptTemplate.fromTemplate(
-      PromptTemplate.fromTemplate(this.config.queryGeneratorPrompt),
+      this.config.queryGeneratorPrompt,
-      llm,
+    );
-      this.strParser,
+
-      RunnableLambda.from(async (input: string) => {
+    const processedChatPrompt = await chatPrompt.invoke({
+      chat_history: formatChatHistoryAsString(input.chat_history),
+      query: input.query,
+    });
+
+    const llmRes = await llm.invoke(processedChatPrompt);
+    const messageStr = await this.strParser.invoke(llmRes);
+
     const linksOutputParser = new LineListOutputParser({
       key: 'links',
     });
@@ -76,10 +83,10 @@ class MetaSearchAgent implements MetaSearchAgentType {
       key: 'question',
     });
 
-        const links = await linksOutputParser.parse(input);
+    const links = await linksOutputParser.parse(messageStr);
     let question = this.config.summarizer
-          ? await questionOutputParser.parse(input)
+      ? await questionOutputParser.parse(messageStr)
-          : input;
+      : messageStr;
 
     if (question === 'not_needed') {
       return { query: '', docs: [] };
@@ -99,8 +106,7 @@ class MetaSearchAgent implements MetaSearchAgentType {
       linkDocs.map((doc) => {
         const URLDocExists = docGroups.find(
           (d) =>
-                d.metadata.url === doc.metadata.url &&
+            d.metadata.url === doc.metadata.url && d.metadata.totalDocs < 10,
-                d.metadata.totalDocs < 10,
         );
 
         if (!URLDocExists) {
@@ -115,8 +121,7 @@ class MetaSearchAgent implements MetaSearchAgentType {
 
         const docIndex = docGroups.findIndex(
           (d) =>
-                d.metadata.url === doc.metadata.url &&
+            d.metadata.url === doc.metadata.url && d.metadata.totalDocs < 10,
-                d.metadata.totalDocs < 10,
         );
 
         if (docIndex !== -1) {
@@ -228,42 +233,31 @@ class MetaSearchAgent implements MetaSearchAgentType {
 
       return { query: question, docs: documents };
     }
-      }),
-    ]);
   }
 
-  private async createAnsweringChain(
+  private async streamAnswer(
     llm: BaseChatModel,
     fileIds: string[],
     embeddings: Embeddings,
     optimizationMode: 'speed' | 'balanced' | 'quality',
     systemInstructions: string,
+    input: SearchInput,
+    emitter: EventEmitter,
   ) {
-    return RunnableSequence.from([
+    const chatPrompt = ChatPromptTemplate.fromMessages([
-      RunnableMap.from({
+      ['system', this.config.responsePrompt],
-        systemInstructions: () => systemInstructions,
+      new MessagesPlaceholder('chat_history'),
-        query: (input: BasicChainInput) => input.query,
+      ['user', '{query}'],
-        chat_history: (input: BasicChainInput) => input.chat_history,
+    ]);
-        date: () => new Date().toISOString(),
-        context: RunnableLambda.from(async (input: BasicChainInput) => {
-          const processedHistory = formatChatHistoryAsString(
-            input.chat_history,
-          );
 
     let docs: Document[] | null = null;
     let query = input.query;
 
     if (this.config.searchWeb) {
-            const searchRetrieverChain =
+      const searchResults = await this.searchSources(llm, input, emitter);
-              await this.createSearchRetrieverChain(llm);
 
-            const searchRetrieverResult = await searchRetrieverChain.invoke({
+      query = searchResults.query;
-              chat_history: processedHistory,
+      docs = searchResults.docs;
-              query,
-            });
-
-            query = searchRetrieverResult.query;
-            docs = searchRetrieverResult.docs;
     }
 
     const sortedDocs = await this.rerankDocs(
@@ -274,23 +268,30 @@ class MetaSearchAgent implements MetaSearchAgentType {
       optimizationMode,
     );
 
-          return sortedDocs;
+    emitter.emit('data', JSON.stringify({ type: 'sources', data: sortedDocs }));
-        })
+
-          .withConfig({
+    const context = this.processDocs(sortedDocs);
-            runName: 'FinalSourceRetriever',
+
-          })
+    const formattedChatPrompt = await chatPrompt.invoke({
-          .pipe(this.processDocs),
+      query: input.query,
-      }),
+      chat_history: input.chat_history,
-      ChatPromptTemplate.fromMessages([
+      date: new Date().toISOString(),
-        ['system', this.config.responsePrompt],
+      context: context,
-        new MessagesPlaceholder('chat_history'),
+      systemInstructions: systemInstructions,
-        ['user', '{query}'],
-      ]),
-      llm,
-      this.strParser,
-    ]).withConfig({
-      runName: 'FinalResponseGenerator',
     });
+
+    const llmRes = await llm.stream(formattedChatPrompt);
+
+    for await (const data of llmRes) {
+      const messageStr = await this.strParser.invoke(data);
+
+      emitter.emit(
+        'data',
+        JSON.stringify({ type: 'response', data: messageStr }),
+      );
+    }
+
+    emitter.emit('end');
   }
 
   private async rerankDocs(
@@ -431,39 +432,6 @@ class MetaSearchAgent implements MetaSearchAgentType {
       .join('\n');
   }
 
-  private async handleStream(
-    stream: AsyncGenerator<StreamEvent, any, any>,
-    emitter: eventEmitter,
-  ) {
-    for await (const event of stream) {
-      if (
-        event.event === 'on_chain_end' &&
-        event.name === 'FinalSourceRetriever'
-      ) {
-        ``;
-        emitter.emit(
-          'data',
-          JSON.stringify({ type: 'sources', data: event.data.output }),
-        );
-      }
-      if (
-        event.event === 'on_chain_stream' &&
-        event.name === 'FinalResponseGenerator'
-      ) {
-        emitter.emit(
-          'data',
-          JSON.stringify({ type: 'response', data: event.data.chunk }),
-        );
-      }
-      if (
-        event.event === 'on_chain_end' &&
-        event.name === 'FinalResponseGenerator'
-      ) {
-        emitter.emit('end');
-      }
-    }
-  }
-
   async searchAndAnswer(
     message: string,
     history: BaseMessage[],
@@ -475,26 +443,19 @@ class MetaSearchAgent implements MetaSearchAgentType {
   ) {
     const emitter = new eventEmitter();
 
-    const answeringChain = await this.createAnsweringChain(
+    this.streamAnswer(
       llm,
       fileIds,
       embeddings,
       optimizationMode,
       systemInstructions,
-    );
-
-    const stream = answeringChain.streamEvents(
       {
         chat_history: history,
         query: message,
       },
-      {
+      emitter,
-        version: 'v1',
-      },
     );
 
-    this.handleStream(stream, emitter);
-
     return emitter;
   }
 }