diff options
| -rw-r--r-- | continuedev/src/continuedev/core/context.py | 72 | ||||
| -rw-r--r-- | extension/react-app/src/components/ComboBox.tsx | 10 |
2 files changed, 44 insertions, 38 deletions
diff --git a/continuedev/src/continuedev/core/context.py b/continuedev/src/continuedev/core/context.py index db1c770a..41f68f90 100644 --- a/continuedev/src/continuedev/core/context.py +++ b/continuedev/src/continuedev/core/context.py @@ -169,39 +169,45 @@ class ContextManager: create_async_task(start_meilisearch(context_providers)) async def load_index(self, workspace_dir: str): - for _, provider in self.context_providers.items(): - ti = time.time() - - context_items = await provider.provide_context_items(workspace_dir) - documents = [ - { - "id": item.description.id.to_string(), - "name": item.description.name, - "description": item.description.description, - "content": item.content, - "workspace_dir": workspace_dir, - } - for item in context_items - ] - if len(documents) > 0: - try: - async with Client('http://localhost:7700') as search_client: - # First, create the index if it doesn't exist - await search_client.create_index(SEARCH_INDEX_NAME) - # The index is currently shared by all workspaces - globalSearchIndex = await search_client.get_index(SEARCH_INDEX_NAME) - await asyncio.wait_for(asyncio.gather( - # Ensure that the index has the correct filterable attributes - globalSearchIndex.update_filterable_attributes( - ["workspace_dir"]), - globalSearchIndex.add_documents(documents) - ), timeout=5) - except Exception as e: - logger.debug(f"Error loading meilisearch index: {e}") - - tf = time.time() - logger.debug( - f"Loaded {len(documents)} documents into meilisearch in {tf - ti} seconds for context provider {provider.title}") + try: + async with Client('http://localhost:7700') as search_client: + # First, create the index if it doesn't exist + # The index is currently shared by all workspaces + await search_client.create_index(SEARCH_INDEX_NAME) + globalSearchIndex = await search_client.get_index(SEARCH_INDEX_NAME) + await globalSearchIndex.update_ranking_rules([ + "attribute", + "words", + "typo", + "proximity", + "sort", + "exactness" + ]) + await globalSearchIndex.update_filterable_attributes( + ["workspace_dir"]) + + for _, provider in self.context_providers.items(): + ti = time.time() + + context_items = await provider.provide_context_items(workspace_dir) + documents = [ + { + "id": item.description.id.to_string(), + "name": item.description.name, + "description": item.description.description, + "content": item.content, + "workspace_dir": workspace_dir, + } + for item in context_items + ] + if len(documents) > 0: + await asyncio.wait_for(globalSearchIndex.add_documents(documents), timeout=5) + + tf = time.time() + logger.debug( + f"Loaded {len(documents)} documents into meilisearch in {tf - ti} seconds for context provider {provider.title}") + except Exception as e: + logger.debug(f"Error loading meilisearch index: {e}") async def select_context_item(self, id: str, query: str): """ diff --git a/extension/react-app/src/components/ComboBox.tsx b/extension/react-app/src/components/ComboBox.tsx index b189e442..651d6227 100644 --- a/extension/react-app/src/components/ComboBox.tsx +++ b/extension/react-app/src/components/ComboBox.tsx @@ -431,6 +431,11 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { event.preventDefault(); } else if (event.key === "Tab") { (event.nativeEvent as any).preventDownshiftDefault = true; + } else if ( + (event.key === "ArrowUp" || event.key === "ArrowDown") && + items.length > 0 + ) { + return; } else if (event.key === "ArrowUp") { // Only go back in history if selectionStart is 0 // (i.e. the cursor is at the beginning of the input) @@ -438,11 +443,6 @@ const ComboBox = React.forwardRef((props: ComboBoxProps, ref) => { positionInHistory == 0 || event.currentTarget.selectionStart !== 0 ) { - console.log( - "returning", - positionInHistory, - event.currentTarget.selectionStart - ); (event.nativeEvent as any).preventDownshiftDefault = true; return; } else if ( |