Fix isIndexLoaded async issue in ChatControls

logancyang · Nov 16, 2024 · c1bdc6a · c1bdc6a
1 parent 7a8b39e
commit c1bdc6a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/src/components/Chat.tsx b/src/components/Chat.tsx
@@ -574,7 +574,7 @@ ${chatContent}`;
           debug={debug}
           addMessage={addMessage}
           vault={app.vault}
-          isIndexLoaded={plugin.vectorStoreManager.getIsIndexLoaded()}
+          vectorStoreManager={plugin.vectorStoreManager}
         />
       </div>
     </div>

diff --git a/src/components/ChatComponents/ChatControls.tsx b/src/components/ChatComponents/ChatControls.tsx
@@ -9,6 +9,7 @@ import React, { useEffect, useState } from "react";
 import { ChainType } from "@/chainFactory";
 import { TooltipActionButton } from "@/components/ChatComponents/TooltipActionButton";
 import { stringToChainType } from "@/utils";
+import VectorStoreManager from "@/VectorStoreManager";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { ChevronDown, Download, Puzzle, RefreshCw } from "lucide-react";
 
@@ -20,8 +21,8 @@ interface ChatControlsProps {
   onRefreshVaultContext: () => void;
   settings: CopilotSettings;
   vault_qa_strategy: string;
+  vectorStoreManager: VectorStoreManager;
   debug?: boolean;
-  isIndexLoaded: boolean;
 }
 
 const ChatControls: React.FC<ChatControlsProps> = ({
@@ -32,10 +33,11 @@ const ChatControls: React.FC<ChatControlsProps> = ({
   onRefreshVaultContext,
   settings,
   vault_qa_strategy,
+  vectorStoreManager,
   debug,
-  isIndexLoaded,
 }) => {
   const [selectedChain, setSelectedChain] = useState<ChainType>(currentChain);
+  const [localIndexLoaded, setLocalIndexLoaded] = useState<boolean>(false);
 
   const handleChainChange = async ({ value }: { value: string }) => {
     const newChain = stringToChainType(value);
@@ -85,6 +87,12 @@ const ChatControls: React.FC<ChatControlsProps> = ({
     setSelectedChain(settings.defaultChainType);
   }, [settings.defaultChainType]);
 
+  useEffect(() => {
+    vectorStoreManager.waitForInitialization().then(() => {
+      setLocalIndexLoaded(true);
+    });
+  }, [vectorStoreManager]);
+
   // const handleFindSimilarNotes = async () => {
   //   const activeFile = app.workspace.getActiveFile();
   //   if (!activeFile) {
@@ -135,17 +143,17 @@ const ChatControls: React.FC<ChatControlsProps> = ({
               </DropdownMenu.Item>
               <DropdownMenu.Item
                 onSelect={() => handleChainChange({ value: "vault_qa" })}
-                disabled={!isIndexLoaded}
-                className={!isIndexLoaded ? "disabled-menu-item" : ""}
+                disabled={!localIndexLoaded}
+                className={!localIndexLoaded ? "disabled-menu-item" : ""}
               >
-                vault QA (basic) {!isIndexLoaded && "(index not loaded)"}
+                vault QA (basic) {!localIndexLoaded && "(index not loaded)"}
               </DropdownMenu.Item>
               <DropdownMenu.Item
                 onSelect={() => handleChainChange({ value: "copilot_plus" })}
-                disabled={!isIndexLoaded}
-                className={!isIndexLoaded ? "disabled-menu-item" : ""}
+                disabled={!localIndexLoaded}
+                className={!localIndexLoaded ? "disabled-menu-item" : ""}
               >
-                copilot plus (alpha) {!isIndexLoaded && "(index not loaded)"}
+                copilot plus (alpha) {!localIndexLoaded && "(index not loaded)"}
               </DropdownMenu.Item>
             </DropdownMenu.Content>
           </DropdownMenu.Portal>

diff --git a/src/components/ChatComponents/ChatInput.tsx b/src/components/ChatComponents/ChatInput.tsx
@@ -5,6 +5,7 @@ import { NoteTitleModal } from "@/components/NoteTitleModal";
 import { CustomPromptProcessor } from "@/customPromptProcessor";
 import { CopilotSettings } from "@/settings/SettingsPage";
 import { ChatMessage } from "@/sharedState";
+import VectorStoreManager from "@/VectorStoreManager";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { ChevronUp, Command, CornerDownLeft, StopCircle } from "lucide-react";
 import { App, Platform, TFile, Vault } from "obsidian";
@@ -31,7 +32,7 @@ interface ChatInputProps {
   addMessage: (message: ChatMessage) => void;
   vault: Vault;
   vault_qa_strategy: string;
-  isIndexLoaded: boolean;
+  vectorStoreManager: VectorStoreManager;
   debug?: boolean;
 }
 
@@ -57,7 +58,7 @@ const ChatInput: React.FC<ChatInputProps> = ({
   addMessage,
   vault,
   vault_qa_strategy,
-  isIndexLoaded,
+  vectorStoreManager,
   debug,
 }) => {
   const [shouldFocus, setShouldFocus] = useState(false);
@@ -206,7 +207,7 @@ const ChatInput: React.FC<ChatInputProps> = ({
         onRefreshVaultContext={onRefreshVaultContext}
         settings={settings}
         vault_qa_strategy={vault_qa_strategy}
-        isIndexLoaded={isIndexLoaded}
+        vectorStoreManager={vectorStoreManager}
         debug={debug}
       />
 

diff --git a/src/constants.ts b/src/constants.ts
@@ -243,7 +243,7 @@ export const DEFAULT_SETTINGS: CopilotSettings = {
   activeModels: BUILTIN_CHAT_MODELS,
   activeEmbeddingModels: BUILTIN_EMBEDDING_MODELS,
   embeddingRequestsPerSecond: 10,
-  disableIndexOnMobile: false,
+  disableIndexOnMobile: true,
   enabledCommands: {
     [COMMAND_IDS.FIX_GRAMMAR]: {
       enabled: true,

diff --git a/src/settings/components/QASettings.tsx b/src/settings/components/QASettings.tsx
@@ -151,7 +151,7 @@ const QASettings: React.FC<QASettingsProps> = ({
       />
       <ToggleComponent
         name="Disable index loading on mobile"
-        description="When enabled, vector store index won't be loaded on mobile devices to save resources. Only chat mode will be available. Any existing index from desktop sync will be preserved."
+        description="When enabled, vector store index won't be loaded on mobile devices to save resources. Only chat mode will be available. Any existing index from desktop sync will be preserved. Uncheck to enable QA modes on mobile."
         value={disableIndexOnMobile}
         onChange={setDisableIndexOnMobile}
       />