diff options
author | Nate Sesti <sestinj@gmail.com> | 2023-08-07 16:33:22 -0700 |
---|---|---|
committer | Nate Sesti <sestinj@gmail.com> | 2023-08-07 16:33:22 -0700 |
commit | 99db0da9d68c64d0b5adcab21e07c2db438c2404 (patch) | |
tree | 9b46802feb4e8bee3756074b92934f1df22e45d0 /continuedev/src | |
parent | 6467759012a139e76dcf022a681355f7d310a30d (diff) | |
download | sncontinue-99db0da9d68c64d0b5adcab21e07c2db438c2404.tar.gz sncontinue-99db0da9d68c64d0b5adcab21e07c2db438c2404.tar.bz2 sncontinue-99db0da9d68c64d0b5adcab21e07c2db438c2404.zip |
feat: :sparkles: diff context provider
Diffstat (limited to 'continuedev/src')
4 files changed, 51 insertions, 6 deletions
diff --git a/continuedev/src/continuedev/libs/constants/default_config.py b/continuedev/src/continuedev/libs/constants/default_config.py index f3b19f89..dbd2c8eb 100644 --- a/continuedev/src/continuedev/libs/constants/default_config.py +++ b/continuedev/src/continuedev/libs/constants/default_config.py @@ -22,7 +22,7 @@ from continuedev.src.continuedev.plugins.steps.feedback import FeedbackStep from continuedev.src.continuedev.plugins.steps.comment_code import CommentCodeStep from continuedev.src.continuedev.plugins.steps.main import EditHighlightedCodeStep from continuedev.src.continuedev.plugins.context_providers.search import SearchContextProvider - +from continuedev.src.continuedev.plugins.context_providers.diff import DiffContextProvider class CommitMessageStep(Step): \"\"\" @@ -123,7 +123,8 @@ config = ContinueConfig( # GoogleContextProvider( # serper_api_key="<your serper.dev api key>" # ) - SearchContextProvider() + SearchContextProvider(), + DiffContextProvider() ], # Policies hold the main logic that decides which Step to take next diff --git a/continuedev/src/continuedev/plugins/context_providers/diff.py b/continuedev/src/continuedev/plugins/context_providers/diff.py new file mode 100644 index 00000000..7a53e87a --- /dev/null +++ b/continuedev/src/continuedev/plugins/context_providers/diff.py @@ -0,0 +1,43 @@ +import subprocess +from typing import List + +from .util import remove_meilisearch_disallowed_chars +from ...core.main import ContextItem, ContextItemDescription, ContextItemId +from ...core.context import ContextProvider + + +class DiffContextProvider(ContextProvider): + title = "diff" + + DIFF_CONTEXT_ITEM_ID = "diff" + + workspace_dir: str = None + + @property + def BASE_CONTEXT_ITEM(self): + return ContextItem( + content="", + description=ContextItemDescription( + name="Diff", + description="Reference the output of 'git diff' for the current workspace", + id=ContextItemId( + provider_title=self.title, + item_id=self.DIFF_CONTEXT_ITEM_ID + ) + ) + ) + + async def provide_context_items(self, workspace_dir: str) -> List[ContextItem]: + self.workspace_dir = workspace_dir + return [self.BASE_CONTEXT_ITEM] + + async def get_item(self, id: ContextItemId, query: str) -> ContextItem: + if not id.item_id == self.DIFF_CONTEXT_ITEM_ID: + raise Exception("Invalid item id") + + diff = subprocess.check_output( + ["git", "diff"], cwd=self.workspace_dir).decode("utf-8") + + ctx_item = self.BASE_CONTEXT_ITEM.copy() + ctx_item.content = diff + return ctx_item diff --git a/continuedev/src/continuedev/plugins/context_providers/search.py b/continuedev/src/continuedev/plugins/context_providers/search.py index 17f2660c..da991a78 100644 --- a/continuedev/src/continuedev/plugins/context_providers/search.py +++ b/continuedev/src/continuedev/plugins/context_providers/search.py @@ -33,7 +33,7 @@ class SearchContextProvider(ContextProvider): rg_path = f"C:\\Users\\{os.getlogin()}\\AppData\\Local\\Programs\\Microsoft VS Code\\resources\\app\\node_modules.asar.unpacked\\vscode-ripgrep\\bin\\rg.exe" elif os.name == 'posix': if 'darwin' in os.sys.platform: - rg_path = "/Applications/Visual Studio Code.app/Contents/Resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" + rg_path = "/Applications/Visual Studio Code.app/Contents/Resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg" else: rg_path = "/usr/share/code/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" else: diff --git a/continuedev/src/continuedev/plugins/context_providers/url.py b/continuedev/src/continuedev/plugins/context_providers/url.py index d6a74d95..9274d84a 100644 --- a/continuedev/src/continuedev/plugins/context_providers/url.py +++ b/continuedev/src/continuedev/plugins/context_providers/url.py @@ -25,13 +25,14 @@ class URLContextProvider(ContextProvider): ) def _get_url_text_contents(self, url: str): + from bs4 import BeautifulSoup import requests response = requests.get(url) - return response.text + soup = BeautifulSoup(response.text, 'html.parser') + return soup.get_text() async def provide_context_items(self, workspace_dir: str) -> List[ContextItem]: - self.workspace_dir = workspace_dir return [self.BASE_CONTEXT_ITEM] async def get_item(self, id: ContextItemId, query: str) -> ContextItem: @@ -40,7 +41,7 @@ class URLContextProvider(ContextProvider): query = query.lstrip("url ") url = query.strip() - content = await self._get_url_text_contents(url) + content = self._get_url_text_contents(url) ctx_item = self.BASE_CONTEXT_ITEM.copy() ctx_item.content = content |