feat(metaSearchAgent): eliminate runnables

feat(app): fix build errors

.github/workflows/docker-build.yaml

@@ -8,15 +8,12 @@ on:
     types: [published]
 
 jobs:
-  build-and-push:
+  build-amd64:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
@@ -33,28 +30,104 @@ jobs:
         id: version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-      - name: Build and push Docker image
+      - name: Build and push AMD64 Docker image
         if: github.ref == 'refs/heads/master' && github.event_name == 'push'
         run: |
-          docker buildx create --use
+          DOCKERFILE=app.dockerfile
-          DOCKERFILE=app.dockerfile; \
+          IMAGE_NAME=perplexica
-          IMAGE_NAME=perplexica; \
+          docker buildx build --platform linux/amd64 \
-          docker buildx build --platform linux/amd64,linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:amd64 \
-            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:main \
             --cache-to=type=inline \
+            --provenance false \
             -f $DOCKERFILE \
-            -t itzcrazykns1337/${IMAGE_NAME}:main \
+            -t itzcrazykns1337/${IMAGE_NAME}:amd64 \
             --push .
 
-      - name: Build and push release Docker image
+      - name: Build and push AMD64 release Docker image
         if: github.event_name == 'release'
         run: |
-          docker buildx create --use
+          DOCKERFILE=app.dockerfile
-          DOCKERFILE=app.dockerfile; \
+          IMAGE_NAME=perplexica
-          IMAGE_NAME=perplexica; \
+          docker buildx build --platform linux/amd64 \
-          docker buildx build --platform linux/amd64,linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
-            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
             --cache-to=type=inline \
+            --provenance false \
             -f $DOCKERFILE \
-            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
+            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
             --push .
+
+  build-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract version from release tag
+        if: github.event_name == 'release'
+        id: version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Build and push ARM64 Docker image
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        run: |
+          DOCKERFILE=app.dockerfile
+          IMAGE_NAME=perplexica
+          docker buildx build --platform linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:arm64 \
+            --cache-to=type=inline \
+            --provenance false \
+            -f $DOCKERFILE \
+            -t itzcrazykns1337/${IMAGE_NAME}:arm64 \
+            --push .
+
+      - name: Build and push ARM64 release Docker image
+        if: github.event_name == 'release'
+        run: |
+          DOCKERFILE=app.dockerfile
+          IMAGE_NAME=perplexica
+          docker buildx build --platform linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64 \
+            --cache-to=type=inline \
+            --provenance false \
+            -f $DOCKERFILE \
+            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64 \
+            --push .
+
+  manifest:
+    needs: [build-amd64, build-arm64]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log in to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Create and push multi-arch manifest for main
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        run: |
+          IMAGE_NAME=perplexica
+          docker manifest create itzcrazykns1337/${IMAGE_NAME}:main \
+            --amend itzcrazykns1337/${IMAGE_NAME}:amd64 \
+            --amend itzcrazykns1337/${IMAGE_NAME}:arm64
+          docker manifest push itzcrazykns1337/${IMAGE_NAME}:main
+
+      - name: Create and push multi-arch manifest for releases
+        if: github.event_name == 'release'
+        run: |
+          IMAGE_NAME=perplexica
+          docker manifest create itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
+            --amend itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
+            --amend itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64
+          docker manifest push itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}

README.md

@@ -153,7 +153,7 @@ For more details, check out the full documentation [here](https://github.com/Itz
 
 ## Expose Perplexica to network
 
-You can access Perplexica over your home network by following our networking guide [here](https://github.com/ItzCrazyKns/Perplexica/blob/master/docs/installation/NETWORKING.md).
+Perplexica runs on Next.js and handles all API requests. It works right away on the same network and stays accessible even with port forwarding.
 
 ## One-Click Deployment
 

app.dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.18.0-alpine AS builder
+FROM node:20.18.0-slim AS builder
 
 WORKDIR /home/perplexica
 
@@ -12,7 +12,7 @@ COPY public ./public
 RUN mkdir -p /home/perplexica/data
 RUN yarn build
 
-FROM node:20.18.0-alpine
+FROM node:20.18.0-slim
 
 WORKDIR /home/perplexica
 

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: (
@@ -46,7 +42,7 @@ interface Config {
   activeEngines: string[];
 }
 
-type BasicChainInput = {
+type SearchInput = {
   chat_history: BaseMessage[];
   query: string;
 };
@@ -59,14 +55,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',
     });
@@ -75,10 +82,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: [] };
@@ -98,8 +105,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) {
@@ -114,8 +120,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) {
@@ -227,40 +232,30 @@ 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',
+    input: SearchInput,
+    emitter: EventEmitter,
   ) {
-    return RunnableSequence.from([
+    const chatPrompt = ChatPromptTemplate.fromMessages([
-      RunnableMap.from({
+      ['system', this.config.responsePrompt],
-        query: (input: BasicChainInput) => input.query,
+      new MessagesPlaceholder('chat_history'),
-        chat_history: (input: BasicChainInput) => input.chat_history,
+      ['user', '{query}'],
-        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(
@@ -271,23 +266,29 @@ 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'),
-        ['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(
@@ -428,39 +429,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[],
@@ -471,25 +439,18 @@ class MetaSearchAgent implements MetaSearchAgentType {
   ) {
     const emitter = new eventEmitter();
 
-    const answeringChain = await this.createAnsweringChain(
+    this.streamAnswer(
       llm,
       fileIds,
       embeddings,
       optimizationMode,
-    );
-
-    const stream = answeringChain.streamEvents(
       {
         chat_history: history,
         query: message,
       },
-      {
+      emitter,
-        version: 'v1',
-      },
     );
 
-    this.handleStream(stream, emitter);
-
     return emitter;
   }
 }