From 228a36391415fb77a68eadb3a9a67809c0141a3c Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Fri, 29 Mar 2024 16:07:49 +0700
Subject: [PATCH] fix: image model does not work when retrieval tool is enabled
 (#2538)

---
 extensions/assistant-extension/src/tools/retrieval.ts | 6 ++++--
 web/containers/AutoLink/index.tsx                     | 2 +-
 web/screens/Chat/ErrorMessage/index.tsx               | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/extensions/assistant-extension/src/tools/retrieval.ts b/extensions/assistant-extension/src/tools/retrieval.ts
index 09ab6c2e23..e58305c601 100644
--- a/extensions/assistant-extension/src/tools/retrieval.ts
+++ b/extensions/assistant-extension/src/tools/retrieval.ts
@@ -18,7 +18,7 @@ export class RetrievalTool extends InferenceTool {
     tool?: AssistantTool
   ): Promise<MessageRequest> {
     if (!data.model || !data.messages) {
-      return Promise.resolve(this.normalize(data))
+      return Promise.resolve(data)
     }
 
     const latestMessage = data.messages[data.messages.length - 1]
@@ -38,6 +38,8 @@ export class RetrievalTool extends InferenceTool {
           docFile,
           data.model?.engine
         )
+      } else {
+        return Promise.resolve(data)
       }
     } else if (
       // Check whether we need to ingest document or not
@@ -48,7 +50,7 @@ export class RetrievalTool extends InferenceTool {
     ) {
       // No document ingested, reroute the result to inference engine
 
-      return Promise.resolve(this.normalize(data))
+      return Promise.resolve(data)
     }
     // 2. Load agent on thread changed
     if (this.retrievalThreadId !== data.threadId) {
diff --git a/web/containers/AutoLink/index.tsx b/web/containers/AutoLink/index.tsx
index 549b05daaa..3bfe47aa49 100644
--- a/web/containers/AutoLink/index.tsx
+++ b/web/containers/AutoLink/index.tsx
@@ -19,7 +19,7 @@ const AutoLink: React.FC<Props> = ({ text }) => {
               key={url}
               target="blank"
               href={url.startsWith('http') ? url : `http://${url}`}
-              className="text-blue-400"
+              className="text-primary dark:text-blue-400"
             >
               {url}
             </a>
diff --git a/web/screens/Chat/ErrorMessage/index.tsx b/web/screens/Chat/ErrorMessage/index.tsx
index f5be762292..da2b1c0be2 100644
--- a/web/screens/Chat/ErrorMessage/index.tsx
+++ b/web/screens/Chat/ErrorMessage/index.tsx
@@ -86,7 +86,7 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
                 Model is currently unavailable. Please switch to a different
                 model or install the{' '}
                 <button
-                  className="font-medium text-blue-500"
+                  className="font-medium text-primary dark:text-blue-400"
                   onClick={() => setMainState(MainViewState.Settings)}
                 >
                   {loadModelError.split('::')[1] ?? ''}