post cherry-pick validation

onyx-dot-app · Jan 21, 2025 · 578bdca · 578bdca
1 parent 259a293
commit 578bdca
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 31 deletions.
diff --git a/backend/danswer/llm/utils.py b/backend/danswer/llm/utils.py
@@ -106,14 +106,17 @@ def litellm_exception_to_error_msg(
 
 def translate_danswer_msg_to_langchain(
     msg: Union[ChatMessage, "PreviousMessage"],
+    exclude_images: bool = False,
 ) -> BaseMessage:
     files: list[InMemoryChatFile] = []
 
     # If the message is a `ChatMessage`, it doesn't have the downloaded files
     # attached. Just ignore them for now.
     if not isinstance(msg, ChatMessage):
         files = msg.files
-    content = build_content_with_imgs(msg.message, files, message_type=msg.message_type)
+    content = build_content_with_imgs(
+        msg.message, files, message_type=msg.message_type, exclude_images=exclude_images
+    )
 
     if msg.message_type == MessageType.SYSTEM:
         raise ValueError("System messages are not currently part of history")
@@ -126,10 +129,10 @@ def translate_danswer_msg_to_langchain(
 
 
 def translate_history_to_basemessages(
-    history: list[ChatMessage] | list["PreviousMessage"],
+    history: list[ChatMessage] | list["PreviousMessage"], exclude_images: bool = False
 ) -> tuple[list[BaseMessage], list[int]]:
     history_basemessages = [
-        translate_danswer_msg_to_langchain(msg)
+        translate_danswer_msg_to_langchain(msg, exclude_images)
         for msg in history
         if msg.token_count != 0
     ]

diff --git a/web/src/app/chat/ChatPage.tsx b/web/src/app/chat/ChatPage.tsx
@@ -1737,7 +1737,18 @@ export function ChatPage({
     end: 0,
     mostVisibleMessageId: null,
   };
-
+  useEffect(() => {
+    if (
+      imageFileInMessageHistory &&
+      !checkLLMSupportsImageInput(llmOverrideManager.llmOverride.modelName)
+    ) {
+      setPopup({
+        message:
+          "This LLM will not be able to process all files (i.e. image files) in your chat history",
+        type: "error",
+      });
+    }
+  }, [llmOverrideManager.llmOverride, imageFileInMessageHistory]);
   useEffect(() => {
     if (noAssistants) {
       return;

diff --git a/web/src/app/chat/modal/configuration/LlmTab.tsx b/web/src/app/chat/modal/configuration/LlmTab.tsx
@@ -8,7 +8,6 @@ import { destructureValue } from "@/lib/llm/utils";
 import { updateModelOverrideForChatSession } from "../../lib";
 import { GearIcon } from "@/components/icons/icons";
 import { LlmList } from "@/components/llm/LLMList";
-import { checkPersonaRequiresImageGeneration } from "@/app/admin/assistants/lib";
 
 interface LlmTabProps {
   llmOverrideManager: LlmOverrideManager;
@@ -31,9 +30,6 @@ export const LlmTab = forwardRef<HTMLDivElement, LlmTabProps>(
     },
     ref
   ) => {
-    const requiresImageGeneration =
-      checkPersonaRequiresImageGeneration(currentAssistant);
-
     const { llmProviders } = useChatContext();
     const { updateLLMOverride, temperature, updateTemperature } =
       llmOverrideManager;
@@ -70,7 +66,6 @@ export const LlmTab = forwardRef<HTMLDivElement, LlmTabProps>(
           </button>
         </div>
         <LlmList
-          requiresImageGeneration={requiresImageGeneration}
           llmProviders={llmProviders}
           currentLlm={currentLlm}
           onSelect={(value: string | null) => {

diff --git a/web/src/components/llm/LLMList.tsx b/web/src/components/llm/LLMList.tsx
@@ -13,7 +13,6 @@ interface LlmListProps {
   userDefault?: string | null;
   scrollable?: boolean;
   hideProviderIcon?: boolean;
-  requiresImageGeneration?: boolean;
 }
 
 export const LlmList: React.FC<LlmListProps> = ({
@@ -22,7 +21,6 @@ export const LlmList: React.FC<LlmListProps> = ({
   onSelect,
   userDefault,
   scrollable,
-  requiresImageGeneration,
 }) => {
   const llmOptionsByProvider: {
     [provider: string]: {
@@ -62,7 +60,9 @@ export const LlmList: React.FC<LlmListProps> = ({
 
   return (
     <div
-      className={`${scrollable ? "max-h-[200px] include-scrollbar" : "max-h-[300px]"} bg-background-175 flex flex-col gap-y-1 overflow-y-scroll`}
+      className={`${
+        scrollable ? "max-h-[200px] include-scrollbar" : "max-h-[300px]"
+      } bg-background-175 flex flex-col gap-y-1 overflow-y-scroll`}
     >
       {userDefault && (
         <button
@@ -79,25 +79,21 @@ export const LlmList: React.FC<LlmListProps> = ({
         </button>
       )}
 
-      {llmOptions.map(({ name, icon, value }, index) => {
-        if (!requiresImageGeneration || checkLLMSupportsImageInput(name)) {
-          return (
-            <button
-              type="button"
-              key={index}
-              className={`w-full py-1.5 flex  gap-x-2 px-2 text-sm ${
-                currentLlm == name
-                  ? "bg-background-200"
-                  : "bg-background hover:bg-background-100"
-              } text-left rounded`}
-              onClick={() => onSelect(value)}
-            >
-              {icon({ size: 16 })}
-              {getDisplayNameForModel(name)}
-            </button>
-          );
-        }
-      })}
+      {llmOptions.map(({ name, icon, value }, index) => (
+        <button
+          type="button"
+          key={index}
+          className={`w-full py-1.5 flex  gap-x-2 px-2 text-sm ${
+            currentLlm == name
+              ? "bg-background-200"
+              : "bg-background hover:bg-background-100"
+          } text-left rounded`}
+          onClick={() => onSelect(value)}
+        >
+          {icon({ size: 16 })}
+          {getDisplayNameForModel(name)}
+        </button>
+      ))}
     </div>
   );
 };