From 8b9b4085ead6ede3e4a820a64ecf47e0d60c0482 Mon Sep 17 00:00:00 2001
From: Hristo <53634432+izo0x90@users.noreply.github.com>
Date: Fri, 17 May 2024 14:10:11 -0400
Subject: [PATCH] Fix query appearing twice in chat history

The initial query appears twice in the prompt, this is ignored by OpenAI
models, however it breaks with Gemini models are they fail with an error
stating that AI and User prompts need to alternate.

Tested all search modes with both OpenAI GTP3 turbo and Vertex Gemini
1.0 and this changes appears to now function correctly with both.
---
 src/agents/academicSearchAgent.ts     | 1 -
 src/agents/redditSearchAgent.ts       | 1 -
 src/agents/webSearchAgent.ts          | 1 -
 src/agents/wolframAlphaSearchAgent.ts | 1 -
 src/agents/writingAssistant.ts        | 1 -
 src/agents/youtubeSearchAgent.ts      | 1 -
 6 files changed, 6 deletions(-)

diff --git a/src/agents/academicSearchAgent.ts b/src/agents/academicSearchAgent.ts
index 5c11307..4b48a97 100644
--- a/src/agents/academicSearchAgent.ts
+++ b/src/agents/academicSearchAgent.ts
@@ -209,7 +209,6 @@ const createBasicAcademicSearchAnsweringChain = (
     ChatPromptTemplate.fromMessages([
       ['system', basicAcademicSearchResponsePrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,
diff --git a/src/agents/redditSearchAgent.ts b/src/agents/redditSearchAgent.ts
index 34e9ec2..b6a1233 100644
--- a/src/agents/redditSearchAgent.ts
+++ b/src/agents/redditSearchAgent.ts
@@ -205,7 +205,6 @@ const createBasicRedditSearchAnsweringChain = (
     ChatPromptTemplate.fromMessages([
       ['system', basicRedditSearchResponsePrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,
diff --git a/src/agents/webSearchAgent.ts b/src/agents/webSearchAgent.ts
index 1364742..9a7306c 100644
--- a/src/agents/webSearchAgent.ts
+++ b/src/agents/webSearchAgent.ts
@@ -203,7 +203,6 @@ const createBasicWebSearchAnsweringChain = (
     ChatPromptTemplate.fromMessages([
       ['system', basicWebSearchResponsePrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,
diff --git a/src/agents/wolframAlphaSearchAgent.ts b/src/agents/wolframAlphaSearchAgent.ts
index f810a1e..2c19a80 100644
--- a/src/agents/wolframAlphaSearchAgent.ts
+++ b/src/agents/wolframAlphaSearchAgent.ts
@@ -165,7 +165,6 @@ const createBasicWolframAlphaSearchAnsweringChain = (llm: BaseChatModel) => {
     ChatPromptTemplate.fromMessages([
       ['system', basicWolframAlphaSearchResponsePrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,
diff --git a/src/agents/writingAssistant.ts b/src/agents/writingAssistant.ts
index 7c2cb49..e022053 100644
--- a/src/agents/writingAssistant.ts
+++ b/src/agents/writingAssistant.ts
@@ -46,7 +46,6 @@ const createWritingAssistantChain = (llm: BaseChatModel) => {
     ChatPromptTemplate.fromMessages([
       ['system', writingAssistantPrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,
diff --git a/src/agents/youtubeSearchAgent.ts b/src/agents/youtubeSearchAgent.ts
index 4e82cc7..65a2478 100644
--- a/src/agents/youtubeSearchAgent.ts
+++ b/src/agents/youtubeSearchAgent.ts
@@ -205,7 +205,6 @@ const createBasicYoutubeSearchAnsweringChain = (
     ChatPromptTemplate.fromMessages([
       ['system', basicYoutubeSearchResponsePrompt],
       new MessagesPlaceholder('chat_history'),
-      ['user', '{query}'],
     ]),
     llm,
     strParser,